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, 364 insertions, 428 deletions

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index d327b7e43..21d2d0b5d 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -58,143 +57,122 @@ SOFTWARE.
 #include "privates.h"
 
 typedef struct _PixmapFormat {
-    unsigned char	depth;
-    unsigned char	bitsPerPixel;
-    unsigned char	scanlinePad;
-    } PixmapFormatRec;
-    
+    unsigned char depth;
+    unsigned char bitsPerPixel;
+    unsigned char scanlinePad;
+} PixmapFormatRec;
+
 typedef struct _Visual {
-    VisualID		vid;
-    short		class;
-    short		bitsPerRGBValue;
-    long		ColormapEntries;
-    short		nplanes;/* = log2 (ColormapEntries). This does not
-				 * imply that the screen has this many planes.
-				 * it may have more or fewer */
-    unsigned long	redMask, greenMask, blueMask;
-    int			offsetRed, offsetGreen, offsetBlue;
-  } VisualRec;
+    VisualID vid;
+    short class;
+    short bitsPerRGBValue;
+    long ColormapEntries;
+    short nplanes;              /* = log2 (ColormapEntries). This does not
+                                 * imply that the screen has this many planes.
+                                 * it may have more or fewer */
+    unsigned long redMask, greenMask, blueMask;
+    int offsetRed, offsetGreen, offsetBlue;
+} VisualRec;
 
 typedef struct _Depth {
-    unsigned char	depth;
-    short		numVids;
-    VisualID		*vids;    /* block of visual ids for this depth */
-  } DepthRec;
+    unsigned char depth;
+    short numVids;
+    VisualID *vids;             /* block of visual ids for this depth */
+} DepthRec;
 
 typedef struct _ScreenSaverStuff {
     WindowPtr pWindow;
-    XID       wid;
-    char      blanked;
-    Bool      (*ExternalScreenSaver)(
-	ScreenPtr	/*pScreen*/,
-	int		/*xstate*/,
-	Bool		/*force*/);
+    XID wid;
+    char blanked;
+    Bool (*ExternalScreenSaver) (ScreenPtr /*pScreen */ ,
+                                 int /*xstate */ ,
+                                 Bool /*force */ );
 } ScreenSaverStuffRec;
 
-
 /*
  *  There is a typedef for each screen function pointer so that code that
  *  needs to declare a screen function pointer (e.g. in a screen private
  *  or as a local variable) can easily do so and retain full type checking.
  */
 
-typedef    Bool (* CloseScreenProcPtr)(
-	int /*index*/,
-	ScreenPtr /*pScreen*/);
-
-typedef    void (* QueryBestSizeProcPtr)(
-	int /*class*/,
-	unsigned short * /*pwidth*/,
-	unsigned short * /*pheight*/,
-	ScreenPtr /*pScreen*/);
-
-typedef    Bool (* SaveScreenProcPtr)(
-	 ScreenPtr /*pScreen*/,
-	 int /*on*/);
-
-typedef    void (* GetImageProcPtr)(
-	DrawablePtr /*pDrawable*/,
-	int /*sx*/,
-	int /*sy*/,
-	int /*w*/,
-	int /*h*/,
-	unsigned int /*format*/,
-	unsigned long /*planeMask*/,
-	char * /*pdstLine*/);
-
-typedef    void (* GetSpansProcPtr)(
-	DrawablePtr /*pDrawable*/,
-	int /*wMax*/,
-	DDXPointPtr /*ppt*/,
-	int* /*pwidth*/,
-	int /*nspans*/,
-	char * /*pdstStart*/);
-
-typedef    void (* SourceValidateProcPtr)(
-	DrawablePtr /*pDrawable*/,
-	int /*x*/,
-	int /*y*/,
-	int /*width*/,
-	int /*height*/,
-	unsigned int /*subWindowMode*/);
-
-typedef    Bool (* CreateWindowProcPtr)(
-	WindowPtr /*pWindow*/);
-
-typedef    Bool (* DestroyWindowProcPtr)(
-	WindowPtr /*pWindow*/);
-
-typedef    Bool (* PositionWindowProcPtr)(
-	WindowPtr /*pWindow*/,
-	int /*x*/,
-	int /*y*/);
-
-typedef    Bool (* ChangeWindowAttributesProcPtr)(
-	WindowPtr /*pWindow*/,
-	unsigned long /*mask*/);
-
-typedef    Bool (* RealizeWindowProcPtr)(
-	WindowPtr /*pWindow*/);
-
-typedef    Bool (* UnrealizeWindowProcPtr)(
-	WindowPtr /*pWindow*/);
-
-typedef    void (* RestackWindowProcPtr)(
-	WindowPtr /*pWindow*/,
-	WindowPtr /*pOldNextSib*/);
-
-typedef    int  (* ValidateTreeProcPtr)(
-	WindowPtr /*pParent*/,
-	WindowPtr /*pChild*/,
-	VTKind /*kind*/);
-
-typedef    void (* PostValidateTreeProcPtr)(
-	WindowPtr /*pParent*/,
-	WindowPtr /*pChild*/,
-	VTKind /*kind*/);
-
-typedef    void (* WindowExposuresProcPtr)(
-	WindowPtr /*pWindow*/,
-	RegionPtr /*prgn*/,
-	RegionPtr /*other_exposed*/);
-
-typedef    void (* CopyWindowProcPtr)(
-	WindowPtr /*pWindow*/,
-	DDXPointRec /*ptOldOrg*/,
-	RegionPtr /*prgnSrc*/);
-
-typedef    void (* ClearToBackgroundProcPtr)(
-	WindowPtr /*pWindow*/,
-	int /*x*/,
-	int /*y*/,
-	int /*w*/,
-	int /*h*/,
-	Bool /*generateExposures*/);
-
-typedef    void (* ClipNotifyProcPtr)(
-	WindowPtr /*pWindow*/,
-	int /*dx*/,
-	int /*dy*/);
+typedef Bool (*CloseScreenProcPtr) (int /*index */ ,
+                                    ScreenPtr /*pScreen */ );
+
+typedef void (*QueryBestSizeProcPtr) (int /*class */ ,
+                                      unsigned short * /*pwidth */ ,
+                                      unsigned short * /*pheight */ ,
+                                      ScreenPtr /*pScreen */ );
+
+typedef Bool (*SaveScreenProcPtr) (ScreenPtr /*pScreen */ ,
+                                   int /*on */ );
+
+typedef void (*GetImageProcPtr) (DrawablePtr /*pDrawable */ ,
+                                 int /*sx */ ,
+                                 int /*sy */ ,
+                                 int /*w */ ,
+                                 int /*h */ ,
+                                 unsigned int /*format */ ,
+                                 unsigned long /*planeMask */ ,
+                                 char * /*pdstLine */ );
+
+typedef void (*GetSpansProcPtr) (DrawablePtr /*pDrawable */ ,
+                                 int /*wMax */ ,
+                                 DDXPointPtr /*ppt */ ,
+                                 int * /*pwidth */ ,
+                                 int /*nspans */ ,
+                                 char * /*pdstStart */ );
+
+typedef void (*SourceValidateProcPtr) (DrawablePtr /*pDrawable */ ,
+                                       int /*x */ ,
+                                       int /*y */ ,
+                                       int /*width */ ,
+                                       int /*height */ ,
+                                       unsigned int /*subWindowMode */ );
+
+typedef Bool (*CreateWindowProcPtr) (WindowPtr /*pWindow */ );
+
+typedef Bool (*DestroyWindowProcPtr) (WindowPtr /*pWindow */ );
+
+typedef Bool (*PositionWindowProcPtr) (WindowPtr /*pWindow */ ,
+                                       int /*x */ ,
+                                       int /*y */ );
+
+typedef Bool (*ChangeWindowAttributesProcPtr) (WindowPtr /*pWindow */ ,
+                                               unsigned long /*mask */ );
+
+typedef Bool (*RealizeWindowProcPtr) (WindowPtr /*pWindow */ );
+
+typedef Bool (*UnrealizeWindowProcPtr) (WindowPtr /*pWindow */ );
+
+typedef void (*RestackWindowProcPtr) (WindowPtr /*pWindow */ ,
+                                      WindowPtr /*pOldNextSib */ );
+
+typedef int (*ValidateTreeProcPtr) (WindowPtr /*pParent */ ,
+                                    WindowPtr /*pChild */ ,
+                                    VTKind /*kind */ );
+
+typedef void (*PostValidateTreeProcPtr) (WindowPtr /*pParent */ ,
+                                         WindowPtr /*pChild */ ,
+                                         VTKind /*kind */ );
+
+typedef void (*WindowExposuresProcPtr) (WindowPtr /*pWindow */ ,
+                                        RegionPtr /*prgn */ ,
+                                        RegionPtr /*other_exposed */ );
+
+typedef void (*CopyWindowProcPtr) (WindowPtr /*pWindow */ ,
+                                   DDXPointRec /*ptOldOrg */ ,
+                                   RegionPtr /*prgnSrc */ );
+
+typedef void (*ClearToBackgroundProcPtr) (WindowPtr /*pWindow */ ,
+                                          int /*x */ ,
+                                          int /*y */ ,
+                                          int /*w */ ,
+                                          int /*h */ ,
+                                          Bool /*generateExposures */ );
+
+typedef void (*ClipNotifyProcPtr) (WindowPtr /*pWindow */ ,
+                                   int /*dx */ ,
+                                   int /*dy */ );
 
 /* pixmap will exist only for the duration of the current rendering operation */
 #define CREATE_PIXMAP_USAGE_SCRATCH                     1
@@ -203,379 +181,337 @@ typedef    void (* ClipNotifyProcPtr)(
 /* pixmap will contain a glyph */
 #define CREATE_PIXMAP_USAGE_GLYPH_PICTURE               3
 
-typedef    PixmapPtr (* CreatePixmapProcPtr)(
-	ScreenPtr /*pScreen*/,
-	int /*width*/,
-	int /*height*/,
-	int /*depth*/,
-	unsigned /*usage_hint*/);
-
-typedef    Bool (* DestroyPixmapProcPtr)(
-	PixmapPtr /*pPixmap*/);
-
-typedef    Bool (* RealizeFontProcPtr)(
-	ScreenPtr /*pScreen*/,
-	FontPtr /*pFont*/);
-
-typedef    Bool (* UnrealizeFontProcPtr)(
-	ScreenPtr /*pScreen*/,
-	FontPtr /*pFont*/);
-
-typedef    void (* ConstrainCursorProcPtr)(
-        DeviceIntPtr /*pDev*/,
-	ScreenPtr /*pScreen*/,
-	BoxPtr /*pBox*/);
-
-typedef    void (* CursorLimitsProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	CursorPtr /*pCursor*/,
-	BoxPtr /*pHotBox*/,
-	BoxPtr /*pTopLeftBox*/);
-
-typedef    Bool (* DisplayCursorProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	CursorPtr /*pCursor*/);
-
-typedef    Bool (* RealizeCursorProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	CursorPtr /*pCursor*/);
-
-typedef    Bool (* UnrealizeCursorProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	CursorPtr /*pCursor*/);
-
-typedef    void (* RecolorCursorProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	CursorPtr /*pCursor*/,
-	Bool /*displayed*/);
-
-typedef    Bool (* SetCursorPositionProcPtr)(
-        DeviceIntPtr /* pDev */,
-	ScreenPtr /*pScreen*/,
-	int /*x*/,
-	int /*y*/,
-	Bool /*generateEvent*/);
-
-typedef    Bool (* CreateGCProcPtr)(
-	GCPtr /*pGC*/);
-
-typedef    Bool (* CreateColormapProcPtr)(
-	ColormapPtr /*pColormap*/);
-
-typedef    void (* DestroyColormapProcPtr)(
-	ColormapPtr /*pColormap*/);
-
-typedef    void (* InstallColormapProcPtr)(
-	ColormapPtr /*pColormap*/);
-
-typedef    void (* UninstallColormapProcPtr)(
-	ColormapPtr /*pColormap*/);
-
-typedef    int (* ListInstalledColormapsProcPtr) (
-	ScreenPtr /*pScreen*/,
-	XID* /*pmaps */);
-
-typedef    void (* StoreColorsProcPtr)(
-	ColormapPtr /*pColormap*/,
-	int /*ndef*/,
-	xColorItem * /*pdef*/);
-
-typedef    void (* ResolveColorProcPtr)(
-	unsigned short* /*pred*/,
-	unsigned short* /*pgreen*/,
-	unsigned short* /*pblue*/,
-	VisualPtr /*pVisual*/);
-
-typedef    RegionPtr (* BitmapToRegionProcPtr)(
-	PixmapPtr /*pPix*/);
-
-typedef    void (* SendGraphicsExposeProcPtr)(
-	ClientPtr /*client*/,
-	RegionPtr /*pRgn*/,
-	XID /*drawable*/,
-	int /*major*/,
-	int /*minor*/);
-
-typedef    void (* ScreenBlockHandlerProcPtr)(
-	int /*screenNum*/,
-	pointer /*blockData*/,
-	pointer /*pTimeout*/,
-	pointer /*pReadmask*/);
-
-typedef    void (* ScreenWakeupHandlerProcPtr)(
-	 int /*screenNum*/,
-	 pointer /*wakeupData*/,
-	 unsigned long /*result*/,
-	 pointer /*pReadMask*/);
-
-typedef    Bool (* CreateScreenResourcesProcPtr)(
-	ScreenPtr /*pScreen*/);
-
-typedef    Bool (* ModifyPixmapHeaderProcPtr)(
-	PixmapPtr /*pPixmap*/,
-	int /*width*/,
-	int /*height*/,
-	int /*depth*/,
-	int /*bitsPerPixel*/,
-	int /*devKind*/,
-	pointer /*pPixData*/);
-
-typedef    PixmapPtr (* GetWindowPixmapProcPtr)(
-	WindowPtr /*pWin*/);
-
-typedef    void (* SetWindowPixmapProcPtr)(
-	WindowPtr /*pWin*/,
-	PixmapPtr /*pPix*/);
-
-typedef    PixmapPtr (* GetScreenPixmapProcPtr)(
-	ScreenPtr /*pScreen*/);
-
-typedef    void (* SetScreenPixmapProcPtr)(
-	PixmapPtr /*pPix*/);
-
-typedef    void (* MarkWindowProcPtr)(
-	WindowPtr /*pWin*/);
-
-typedef    Bool (* MarkOverlappedWindowsProcPtr)(
-	WindowPtr /*parent*/,
-	WindowPtr /*firstChild*/,
-	WindowPtr * /*pLayerWin*/);
-
-typedef    int (* ConfigNotifyProcPtr)(
-	WindowPtr /*pWin*/,
-	int /*x*/,
-	int /*y*/,
-	int /*w*/,
-	int /*h*/,
-	int /*bw*/,
-	WindowPtr /*pSib*/);
-
-typedef    void (* MoveWindowProcPtr)(
-	WindowPtr /*pWin*/,
-	int /*x*/,
-	int /*y*/,
-	WindowPtr /*pSib*/,
-	VTKind /*kind*/);
-
-typedef    void (* ResizeWindowProcPtr)(
-    WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/, 
-    unsigned int /*w*/,
-    unsigned int /*h*/,
-    WindowPtr /*pSib*/
-);
-
-typedef    WindowPtr (* GetLayerWindowProcPtr)(
-    WindowPtr /*pWin*/
-);
-
-typedef    void (* HandleExposuresProcPtr)(
-    WindowPtr /*pWin*/);
-
-typedef    void (* ReparentWindowProcPtr)(
-    WindowPtr /*pWin*/,
-    WindowPtr /*pPriorParent*/);
-
-typedef    void (* SetShapeProcPtr)(
-        WindowPtr /*pWin*/,
-        int /* kind */);
-
-typedef    void (* ChangeBorderWidthProcPtr)(
-	WindowPtr /*pWin*/,
-	unsigned int /*width*/);
-
-typedef    void (* MarkUnrealizedWindowProcPtr)(
-	WindowPtr /*pChild*/,
-	WindowPtr /*pWin*/,
-	Bool /*fromConfigure*/);
+typedef PixmapPtr (*CreatePixmapProcPtr) (ScreenPtr /*pScreen */ ,
+                                          int /*width */ ,
+                                          int /*height */ ,
+                                          int /*depth */ ,
+                                          unsigned /*usage_hint */ );
+
+typedef Bool (*DestroyPixmapProcPtr) (PixmapPtr /*pPixmap */ );
+
+typedef Bool (*RealizeFontProcPtr) (ScreenPtr /*pScreen */ ,
+                                    FontPtr /*pFont */ );
+
+typedef Bool (*UnrealizeFontProcPtr) (ScreenPtr /*pScreen */ ,
+                                      FontPtr /*pFont */ );
+
+typedef void (*ConstrainCursorProcPtr) (DeviceIntPtr /*pDev */ ,
+                                        ScreenPtr /*pScreen */ ,
+                                        BoxPtr /*pBox */ );
+
+typedef void (*CursorLimitsProcPtr) (DeviceIntPtr /* pDev */ ,
+                                     ScreenPtr /*pScreen */ ,
+                                     CursorPtr /*pCursor */ ,
+                                     BoxPtr /*pHotBox */ ,
+                                     BoxPtr /*pTopLeftBox */ );
+
+typedef Bool (*DisplayCursorProcPtr) (DeviceIntPtr /* pDev */ ,
+                                      ScreenPtr /*pScreen */ ,
+                                      CursorPtr /*pCursor */ );
+
+typedef Bool (*RealizeCursorProcPtr) (DeviceIntPtr /* pDev */ ,
+                                      ScreenPtr /*pScreen */ ,
+                                      CursorPtr /*pCursor */ );
+
+typedef Bool (*UnrealizeCursorProcPtr) (DeviceIntPtr /* pDev */ ,
+                                        ScreenPtr /*pScreen */ ,
+                                        CursorPtr /*pCursor */ );
+
+typedef void (*RecolorCursorProcPtr) (DeviceIntPtr /* pDev */ ,
+                                      ScreenPtr /*pScreen */ ,
+                                      CursorPtr /*pCursor */ ,
+                                      Bool /*displayed */ );
+
+typedef Bool (*SetCursorPositionProcPtr) (DeviceIntPtr /* pDev */ ,
+                                          ScreenPtr /*pScreen */ ,
+                                          int /*x */ ,
+                                          int /*y */ ,
+                                          Bool /*generateEvent */ );
+
+typedef Bool (*CreateGCProcPtr) (GCPtr /*pGC */ );
+
+typedef Bool (*CreateColormapProcPtr) (ColormapPtr /*pColormap */ );
+
+typedef void (*DestroyColormapProcPtr) (ColormapPtr /*pColormap */ );
+
+typedef void (*InstallColormapProcPtr) (ColormapPtr /*pColormap */ );
+
+typedef void (*UninstallColormapProcPtr) (ColormapPtr /*pColormap */ );
+
+typedef int (*ListInstalledColormapsProcPtr) (ScreenPtr /*pScreen */ ,
+                                              XID * /*pmaps */ );
+
+typedef void (*StoreColorsProcPtr) (ColormapPtr /*pColormap */ ,
+                                    int /*ndef */ ,
+                                    xColorItem * /*pdef */ );
+
+typedef void (*ResolveColorProcPtr) (unsigned short * /*pred */ ,
+                                     unsigned short * /*pgreen */ ,
+                                     unsigned short * /*pblue */ ,
+                                     VisualPtr /*pVisual */ );
+
+typedef RegionPtr (*BitmapToRegionProcPtr) (PixmapPtr /*pPix */ );
+
+typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
+                                           RegionPtr /*pRgn */ ,
+                                           XID /*drawable */ ,
+                                           int /*major */ ,
+                                           int /*minor */ );
+
+typedef void (*ScreenBlockHandlerProcPtr) (int /*screenNum */ ,
+                                           pointer /*blockData */ ,
+                                           pointer /*pTimeout */ ,
+                                           pointer /*pReadmask */ );
+
+typedef void (*ScreenWakeupHandlerProcPtr) (int /*screenNum */ ,
+                                            pointer /*wakeupData */ ,
+                                            unsigned long /*result */ ,
+                                            pointer /*pReadMask */ );
+
+typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ );
+
+typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ ,
+                                           int /*width */ ,
+                                           int /*height */ ,
+                                           int /*depth */ ,
+                                           int /*bitsPerPixel */ ,
+                                           int /*devKind */ ,
+                                           pointer /*pPixData */ );
+
+typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ );
+
+typedef void (*SetWindowPixmapProcPtr) (WindowPtr /*pWin */ ,
+                                        PixmapPtr /*pPix */ );
+
+typedef PixmapPtr (*GetScreenPixmapProcPtr) (ScreenPtr /*pScreen */ );
+
+typedef void (*SetScreenPixmapProcPtr) (PixmapPtr /*pPix */ );
+
+typedef void (*MarkWindowProcPtr) (WindowPtr /*pWin */ );
+
+typedef Bool (*MarkOverlappedWindowsProcPtr) (WindowPtr /*parent */ ,
+                                              WindowPtr /*firstChild */ ,
+                                              WindowPtr * /*pLayerWin */ );
+
+typedef int (*ConfigNotifyProcPtr) (WindowPtr /*pWin */ ,
+                                    int /*x */ ,
+                                    int /*y */ ,
+                                    int /*w */ ,
+                                    int /*h */ ,
+                                    int /*bw */ ,
+                                    WindowPtr /*pSib */ );
+
+typedef void (*MoveWindowProcPtr) (WindowPtr /*pWin */ ,
+                                   int /*x */ ,
+                                   int /*y */ ,
+                                   WindowPtr /*pSib */ ,
+                                   VTKind /*kind */ );
+
+typedef void (*ResizeWindowProcPtr) (WindowPtr /*pWin */ ,
+                                     int /*x */ ,
+                                     int /*y */ ,
+                                     unsigned int /*w */ ,
+                                     unsigned int /*h */ ,
+                                     WindowPtr  /*pSib */
+    );
+
+typedef WindowPtr (*GetLayerWindowProcPtr) (WindowPtr   /*pWin */
+    );
+
+typedef void (*HandleExposuresProcPtr) (WindowPtr /*pWin */ );
+
+typedef void (*ReparentWindowProcPtr) (WindowPtr /*pWin */ ,
+                                       WindowPtr /*pPriorParent */ );
+
+typedef void (*SetShapeProcPtr) (WindowPtr /*pWin */ ,
+                                 int /* kind */ );
+
+typedef void (*ChangeBorderWidthProcPtr) (WindowPtr /*pWin */ ,
+                                          unsigned int /*width */ );
+
+typedef void (*MarkUnrealizedWindowProcPtr) (WindowPtr /*pChild */ ,
+                                             WindowPtr /*pWin */ ,
+                                             Bool /*fromConfigure */ );
 
 #ifdef CreateWindow
 #undef CreateWindow
 #endif
 
-typedef    Bool (* DeviceCursorInitializeProcPtr)(
-        DeviceIntPtr /* pDev */,
-        ScreenPtr    /* pScreen */);
+typedef Bool (*DeviceCursorInitializeProcPtr) (DeviceIntPtr /* pDev */ ,
+                                               ScreenPtr /* pScreen */ );
 
-typedef    void (* DeviceCursorCleanupProcPtr)(
-        DeviceIntPtr /* pDev */,
-        ScreenPtr    /* pScreen */);
+typedef void (*DeviceCursorCleanupProcPtr) (DeviceIntPtr /* pDev */ ,
+                                            ScreenPtr /* pScreen */ );
 
-typedef void (*ConstrainCursorHarderProcPtr)(
-       DeviceIntPtr, ScreenPtr, int, int *, int *);
+typedef void (*ConstrainCursorHarderProcPtr) (DeviceIntPtr, ScreenPtr, int,
+                                              int *, int *);
 
 typedef struct _Screen {
-    int			myNum;	/* index of this instance in Screens[] */
-    ATOM		id;
-    short		x, y, width, height;
-    short		mmWidth, mmHeight;
-    short		numDepths;
-    unsigned char      	rootDepth;
-    DepthPtr       	allowedDepths;
-    unsigned long      	rootVisual;
-    unsigned long	defColormap;
-    short		minInstalledCmaps, maxInstalledCmaps;
-    char                backingStoreSupport, saveUnderSupport;
-    unsigned long	whitePixel, blackPixel;
-    GCPtr		GCperDepth[MAXFORMATS+1];
-			/* next field is a stipple to use as default in
-			   a GC.  we don't build default tiles of all depths
-			   because they are likely to be of a color
-			   different from the default fg pixel, so
-			   we don't win anything by building
-			   a standard one.
-			*/
-    PixmapPtr		PixmapPerDepth[1];
-    pointer		devPrivate;
-    short       	numVisuals;
-    VisualPtr		visuals;
-    WindowPtr		root;
+    int myNum;                  /* index of this instance in Screens[] */
+    ATOM id;
+    short x, y, width, height;
+    short mmWidth, mmHeight;
+    short numDepths;
+    unsigned char rootDepth;
+    DepthPtr allowedDepths;
+    unsigned long rootVisual;
+    unsigned long defColormap;
+    short minInstalledCmaps, maxInstalledCmaps;
+    char backingStoreSupport, saveUnderSupport;
+    unsigned long whitePixel, blackPixel;
+    GCPtr GCperDepth[MAXFORMATS + 1];
+    /* next field is a stipple to use as default in
+       a GC.  we don't build default tiles of all depths
+       because they are likely to be of a color
+       different from the default fg pixel, so
+       we don't win anything by building
+       a standard one.
+     */
+    PixmapPtr PixmapPerDepth[1];
+    pointer devPrivate;
+    short numVisuals;
+    VisualPtr visuals;
+    WindowPtr root;
     ScreenSaverStuffRec screensaver;
 
     /* Random screen procedures */
 
-    CloseScreenProcPtr		CloseScreen;
-    QueryBestSizeProcPtr	QueryBestSize;
-    SaveScreenProcPtr		SaveScreen;
-    GetImageProcPtr		GetImage;
-    GetSpansProcPtr		GetSpans;
-    SourceValidateProcPtr	SourceValidate;
+    CloseScreenProcPtr CloseScreen;
+    QueryBestSizeProcPtr QueryBestSize;
+    SaveScreenProcPtr SaveScreen;
+    GetImageProcPtr GetImage;
+    GetSpansProcPtr GetSpans;
+    SourceValidateProcPtr SourceValidate;
 
     /* Window Procedures */
 
-    CreateWindowProcPtr		CreateWindow;
-    DestroyWindowProcPtr	DestroyWindow;
-    PositionWindowProcPtr	PositionWindow;
+    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;
+    RealizeWindowProcPtr RealizeWindow;
+    UnrealizeWindowProcPtr UnrealizeWindow;
+    ValidateTreeProcPtr ValidateTree;
+    PostValidateTreeProcPtr PostValidateTree;
+    WindowExposuresProcPtr WindowExposures;
+    CopyWindowProcPtr CopyWindow;
+    ClearToBackgroundProcPtr ClearToBackground;
+    ClipNotifyProcPtr ClipNotify;
+    RestackWindowProcPtr RestackWindow;
 
     /* Pixmap procedures */
 
-    CreatePixmapProcPtr		CreatePixmap;
-    DestroyPixmapProcPtr	DestroyPixmap;
+    CreatePixmapProcPtr CreatePixmap;
+    DestroyPixmapProcPtr DestroyPixmap;
 
     /* Font procedures */
 
-    RealizeFontProcPtr		RealizeFont;
-    UnrealizeFontProcPtr	UnrealizeFont;
+    RealizeFontProcPtr RealizeFont;
+    UnrealizeFontProcPtr UnrealizeFont;
 
     /* Cursor Procedures */
 
-    ConstrainCursorProcPtr	ConstrainCursor;
+    ConstrainCursorProcPtr ConstrainCursor;
     ConstrainCursorHarderProcPtr ConstrainCursorHarder;
-    CursorLimitsProcPtr		CursorLimits;
-    DisplayCursorProcPtr	DisplayCursor;
-    RealizeCursorProcPtr	RealizeCursor;
-    UnrealizeCursorProcPtr	UnrealizeCursor;
-    RecolorCursorProcPtr	RecolorCursor;
-    SetCursorPositionProcPtr	SetCursorPosition;
+    CursorLimitsProcPtr CursorLimits;
+    DisplayCursorProcPtr DisplayCursor;
+    RealizeCursorProcPtr RealizeCursor;
+    UnrealizeCursorProcPtr UnrealizeCursor;
+    RecolorCursorProcPtr RecolorCursor;
+    SetCursorPositionProcPtr SetCursorPosition;
 
     /* GC procedures */
 
-    CreateGCProcPtr		CreateGC;
+    CreateGCProcPtr CreateGC;
 
     /* Colormap procedures */
 
-    CreateColormapProcPtr	CreateColormap;
-    DestroyColormapProcPtr	DestroyColormap;
-    InstallColormapProcPtr	InstallColormap;
-    UninstallColormapProcPtr	UninstallColormap;
+    CreateColormapProcPtr CreateColormap;
+    DestroyColormapProcPtr DestroyColormap;
+    InstallColormapProcPtr InstallColormap;
+    UninstallColormapProcPtr UninstallColormap;
     ListInstalledColormapsProcPtr ListInstalledColormaps;
-    StoreColorsProcPtr		StoreColors;
-    ResolveColorProcPtr		ResolveColor;
+    StoreColorsProcPtr StoreColors;
+    ResolveColorProcPtr ResolveColor;
 
     /* Region procedures */
 
-    BitmapToRegionProcPtr	BitmapToRegion;
-    SendGraphicsExposeProcPtr	SendGraphicsExpose;
+    BitmapToRegionProcPtr BitmapToRegion;
+    SendGraphicsExposeProcPtr SendGraphicsExpose;
 
     /* os layer procedures */
 
-    ScreenBlockHandlerProcPtr	BlockHandler;
-    ScreenWakeupHandlerProcPtr	WakeupHandler;
+    ScreenBlockHandlerProcPtr BlockHandler;
+    ScreenWakeupHandlerProcPtr WakeupHandler;
 
     pointer blockData;
     pointer wakeupData;
 
     /* anybody can get a piece of this array */
-    PrivateRec	*devPrivates;
+    PrivateRec *devPrivates;
 
     CreateScreenResourcesProcPtr CreateScreenResources;
-    ModifyPixmapHeaderProcPtr	ModifyPixmapHeader;
+    ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
-    GetWindowPixmapProcPtr	GetWindowPixmap;
-    SetWindowPixmapProcPtr	SetWindowPixmap;
-    GetScreenPixmapProcPtr	GetScreenPixmap;
-    SetScreenPixmapProcPtr	SetScreenPixmap;
+    GetWindowPixmapProcPtr GetWindowPixmap;
+    SetWindowPixmapProcPtr SetWindowPixmap;
+    GetScreenPixmapProcPtr GetScreenPixmap;
+    SetScreenPixmapProcPtr SetScreenPixmap;
 
-    PixmapPtr pScratchPixmap;		/* scratch pixmap "pool" */
+    PixmapPtr pScratchPixmap;   /* scratch pixmap "pool" */
 
-    unsigned int		totalPixmapSize;
+    unsigned int totalPixmapSize;
 
-    MarkWindowProcPtr		MarkWindow;
+    MarkWindowProcPtr MarkWindow;
     MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
-    ConfigNotifyProcPtr		ConfigNotify;
-    MoveWindowProcPtr		MoveWindow;
-    ResizeWindowProcPtr		ResizeWindow;
-    GetLayerWindowProcPtr	GetLayerWindow;
-    HandleExposuresProcPtr	HandleExposures;
-    ReparentWindowProcPtr	ReparentWindow;
+    ConfigNotifyProcPtr ConfigNotify;
+    MoveWindowProcPtr MoveWindow;
+    ResizeWindowProcPtr ResizeWindow;
+    GetLayerWindowProcPtr GetLayerWindow;
+    HandleExposuresProcPtr HandleExposures;
+    ReparentWindowProcPtr ReparentWindow;
 
-    SetShapeProcPtr		SetShape;
+    SetShapeProcPtr SetShape;
 
-    ChangeBorderWidthProcPtr	ChangeBorderWidth;
-    MarkUnrealizedWindowProcPtr	MarkUnrealizedWindow;
+    ChangeBorderWidthProcPtr ChangeBorderWidth;
+    MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
 
     /* Device cursor procedures */
     DeviceCursorInitializeProcPtr DeviceCursorInitialize;
-    DeviceCursorCleanupProcPtr    DeviceCursorCleanup;
+    DeviceCursorCleanupProcPtr DeviceCursorCleanup;
 
     /* set it in driver side if X server can copy the framebuffer content.
      * Meant to be used together with '-background none' option, avoiding
      * malicious users to steal framebuffer's content if that would be the
      * default */
-    Bool		canDoBGNoneRoot;
+    Bool canDoBGNoneRoot;
 } ScreenRec;
 
-static inline RegionPtr BitmapToRegion(ScreenPtr _pScreen, PixmapPtr pPix) {
-    return (*(_pScreen)->BitmapToRegion)(pPix); /* no mi version?! */
+static inline RegionPtr
+BitmapToRegion(ScreenPtr _pScreen, PixmapPtr pPix)
+{
+    return (*(_pScreen)->BitmapToRegion) (pPix);        /* no mi version?! */
 }
 
 typedef struct _ScreenInfo {
-    int		imageByteOrder;
-    int		bitmapScanlineUnit;
-    int		bitmapScanlinePad;
-    int		bitmapBitOrder;
-    int		numPixmapFormats;
-    PixmapFormatRec
-		formats[MAXFORMATS];
-    int		numScreens;
-    ScreenPtr	screens[MAXSCREENS];
-    int         x;      /* origin */
-    int         y;      /* origin */
-    int		width;  /* total width of all screens together */
-    int		height; /* total height of all screens together */
+    int imageByteOrder;
+    int bitmapScanlineUnit;
+    int bitmapScanlinePad;
+    int bitmapBitOrder;
+    int numPixmapFormats;
+     PixmapFormatRec formats[MAXFORMATS];
+    int numScreens;
+    ScreenPtr screens[MAXSCREENS];
+    int x;                      /* origin */
+    int y;                      /* origin */
+    int width;                  /* total width of all screens together */
+    int height;                 /* total height of all screens together */
 } ScreenInfo;
 
 extern _X_EXPORT ScreenInfo screenInfo;
 
-extern _X_EXPORT void InitOutput(
-    ScreenInfo 	* /*pScreenInfo*/,
-    int     	/*argc*/,
-    char    	** /*argv*/);
+extern _X_EXPORT void InitOutput(ScreenInfo * /*pScreenInfo */ ,
+                                 int /*argc */ ,
+                                 char ** /*argv */ );
 
-#endif /* SCREENINTSTRUCT_H */
+#endif                          /* SCREENINTSTRUCT_H */