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, 461 insertions, 520 deletions

diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index aa01d6ed1..8c7df4cac 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -44,21 +44,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
@@ -101,15 +100,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
@@ -147,8 +146,8 @@ typedef int pid_t;
 #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>
@@ -192,7 +191,6 @@ typedef int pid_t;
 #include "winms.h"
 #include "winresource.h"
 
-
 /*
  * Define Windows constants
  */
@@ -201,7 +199,6 @@ typedef int pid_t;
 #define WM_INIT_SYS_MENU	(WM_USER + 1001)
 #define WM_GIVEUP		(WM_USER + 1002)
 
-
 /* Local includes */
 #include "winwindow.h"
 #include "winmsg.h"
@@ -213,7 +210,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)))
 
@@ -232,117 +228,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;
 
 /*
@@ -350,297 +340,296 @@ typedef enum {
  * in the server startup sequence.
  */
 
-typedef struct
-{
-  ScreenPtr		pScreen;
-  
-  /* Did the user specify a height and width? */
-  Bool			fUserGaveHeightAndWidth;
+typedef struct {
+    ScreenPtr pScreen;
+
+    /* Did the user specify a height and width? */
+    Bool fUserGaveHeightAndWidth;
 
-  DWORD			dwScreen;
+    DWORD dwScreen;
 
-  int			iMonitor;
+    int iMonitor;
   HMONITOR              hMonitor;
 
-  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;
+    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			fAnotherWMRunning;
+    Bool fMWExtWM;
+    Bool fAnotherWMRunning;
 #endif
 #ifdef XWIN_MULTIWINDOWINTWM
   Bool			fInternalWM;
 #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;
-  LPDIRECTDRAWSURFACE	pddsPrimary;
-  LPDIRECTDRAW2		pdd2;
+    /* Privates used by shadow fb and primary fb DirectDraw servers */
+    LPDIRECTDRAW pdd;
+    LPDIRECTDRAWSURFACE	pddsPrimary;
+    LPDIRECTDRAW2 pdd2;
 
-  /* Privates used by shadow fb DirectDraw server */
-  LPDIRECTDRAWSURFACE	pddsShadow;
-  LPDDSURFACEDESC	pddsdShadow;
+    /* Privates used by shadow fb DirectDraw server */
+    LPDIRECTDRAWSURFACE	pddsShadow;
+    LPDDSURFACEDESC pddsdShadow;
 
 #ifdef XWIN_PRIMARYFB
-  /* Privates used by primary fb DirectDraw server */
-  LPDIRECTDRAWSURFACE	pddsOffscreen;
-  LPDDSURFACEDESC	pddsdOffscreen;
-  LPDDSURFACEDESC	pddsdPrimary;
+    /* Privates used by primary fb DirectDraw server */
+    LPDIRECTDRAWSURFACE	pddsOffscreen;
+    LPDDSURFACEDESC pddsdOffscreen;
+    LPDDSURFACEDESC pddsdPrimary;
 #endif
 
-  /* 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;
-  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;
+    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
@@ -655,7 +644,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winScreenPriv(pScreen) \
 	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)
 
-
 /*
  * Colormap privates macros
  */
@@ -669,7 +657,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winCmapPriv(pCmap) \
 	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)
 
-
 /*
  * GC privates macros
  */
@@ -683,7 +670,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winGCPriv(pGC) \
 	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)
 
-
 /*
  * Pixmap privates macros
  */
@@ -697,7 +683,6 @@ extern FARPROC			g_fpDirectDrawCreateClipper;
 #define winPixmapPriv(pPixmap) \
 	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)
 
-
 /*
  * Window privates macros
  */
@@ -723,7 +708,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)
 
@@ -731,20 +716,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
@@ -752,21 +735,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
 /*
@@ -774,44 +754,40 @@ winBlockHandler (int nScreen,
  */
 
 RegionPtr
-winPixmapToRegionNativeGDI (PixmapPtr pPix);
+ winPixmapToRegionNativeGDI(PixmapPtr pPix);
 #endif
 
-
 #ifdef XWIN_CLIPBOARD
 /*
  * winclipboardinit.c
  */
 
 Bool
-winInitClipboard (void);
+ winInitClipboard(void);
 
 void
-winFixClipboardChain (int Removed);
+ winFixClipboardChain (int Removed);
 #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
@@ -821,31 +797,29 @@ int
 GetLiveClients (winPrivScreenPtr pScreenPriv);
 
 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
@@ -853,12 +827,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
 /*
@@ -866,14 +839,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
 /*
@@ -881,87 +852,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
@@ -969,42 +932,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
 /*
@@ -1012,43 +974,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
@@ -1057,13 +1018,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
 /*
@@ -1071,32 +1029,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
 /*
@@ -1104,50 +1057,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
@@ -1155,60 +1101,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
 /*
@@ -1216,102 +1159,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, Bool Modify);
+ winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
 
 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
 /*
@@ -1319,55 +1258,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
 /*
@@ -1375,69 +1320,67 @@ 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);
 
 void
-winMWExtWMRestackWindows (ScreenPtr pScreen);
+ winMWExtWMRestackWindows(ScreenPtr pScreen);
 #endif
 #ifdef XWIN_MULTIWINDOWINTWM
 Bool
-winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
+ winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
 #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);
 
 /*
  * windisplay.c
@@ -1450,17 +1393,15 @@ winGetDisplayName(char *szDisplay, unsigned int screen);
  * 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_ */