Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 177 insertions, 180 deletions

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