Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

25 files changed, 1487 insertions, 1496 deletions

diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index 5cd52198f..9715b7cfb 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -1,132 +1,131 @@
-/*

-

-Copyright 1991, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The 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.

-

-*/

-

-

-#ifndef CLOSESTR_H

-#define CLOSESTR_H

-

-#include <X11/Xproto.h>

-#include "closure.h"

-#include "dix.h"

-#include "misc.h"

-#include "gcstruct.h"

-

-/* closure structures */

-

-/* OpenFont */

-

-typedef struct _OFclosure {

-    ClientPtr   client;

-    short       current_fpe;

-    short       num_fpes;

-    FontPathElementPtr *fpe_list;

-    Mask        flags;

-

-/* XXX -- get these from request buffer instead? */

-    char       *origFontName;

-    int		origFontNameLen;

-    XID         fontid;

-    char       *fontname;

-    int         fnamelen;

-    Bool	from_dispatch;

-    FontPtr	non_cachable_font;

-}           OFclosureRec;

-

-/* ListFontsWithInfo */

-

-#define XLFDMAXFONTNAMELEN	256

-typedef struct _LFWIstate {

-    char	pattern[XLFDMAXFONTNAMELEN];

-    int		patlen;

-    int		current_fpe;

-    int		max_names;

-    Bool	list_started;

-    pointer	private;

-} LFWIstateRec, *LFWIstatePtr;

-

-typedef struct _LFWIclosure {

-    ClientPtr		client;

-    int			num_fpes;

-    FontPathElementPtr	*fpe_list;

-    xListFontsWithInfoReply *reply;

-    int			length;

-    LFWIstateRec	current;

-    LFWIstateRec	saved;

-    int			savedNumFonts;

-    Bool		haveSaved;

-    Bool	        from_dispatch;

-    char		*savedName;

-} LFWIclosureRec;

-

-/* ListFonts */

-

-typedef struct _LFclosure {

-    ClientPtr   client;

-    int         num_fpes;

-    FontPathElementPtr *fpe_list;

-    FontNamesPtr names;

-    LFWIstateRec current;

-    LFWIstateRec saved;

-    Bool        haveSaved;

-    Bool	from_dispatch;    

-    char	*savedName;

-    int		savedNameLen;

-}	LFclosureRec;

-

-/* PolyText */

-

-typedef struct _PTclosure {

-    ClientPtr		client;

-    DrawablePtr		pDraw;

-    GC			*pGC;

-    unsigned char	*pElt;

-    unsigned char	*endReq;

-    unsigned char	*data;

-    int			xorg;

-    int			yorg;

-    CARD8		reqType;

-    XID			did;

-    int			err;

-    Bool	        from_dispatch;

-} PTclosureRec;

-

-/* ImageText */

-

-typedef struct _ITclosure {

-    ClientPtr		client;

-    DrawablePtr		pDraw;

-    GC			*pGC;

-    BYTE		nChars;

-    unsigned char	*data;

-    int			xorg;

-    int			yorg;

-    CARD8		reqType;

-    XID			did;

-    Bool	        from_dispatch;

-} ITclosureRec;

-#endif				/* CLOSESTR_H */

+/*
+
+Copyright 1991, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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.
+
+*/
+
+#ifndef CLOSESTR_H
+#define CLOSESTR_H
+
+#include <X11/Xproto.h>
+#include "closure.h"
+#include "dix.h"
+#include "misc.h"
+#include "gcstruct.h"
+
+/* closure structures */
+
+/* OpenFont */
+
+typedef struct _OFclosure {
+    ClientPtr client;
+    short current_fpe;
+    short num_fpes;
+    FontPathElementPtr *fpe_list;
+    Mask flags;
+
+/* XXX -- get these from request buffer instead? */
+    char *origFontName;
+    int origFontNameLen;
+    XID fontid;
+    char *fontname;
+    int fnamelen;
+    Bool	from_dispatch;
+    FontPtr non_cachable_font;
+} OFclosureRec;
+
+/* ListFontsWithInfo */
+
+#define XLFDMAXFONTNAMELEN	256
+typedef struct _LFWIstate {
+    char pattern[XLFDMAXFONTNAMELEN];
+    int patlen;
+    int current_fpe;
+    int max_names;
+    Bool list_started;
+    pointer private;
+} LFWIstateRec, *LFWIstatePtr;
+
+typedef struct _LFWIclosure {
+    ClientPtr client;
+    int num_fpes;
+    FontPathElementPtr *fpe_list;
+    xListFontsWithInfoReply *reply;
+    int length;
+    LFWIstateRec current;
+    LFWIstateRec saved;
+    int savedNumFonts;
+    Bool haveSaved;
+    Bool	        from_dispatch;
+    char *savedName;
+} LFWIclosureRec;
+
+/* ListFonts */
+
+typedef struct _LFclosure {
+    ClientPtr client;
+    int num_fpes;
+    FontPathElementPtr *fpe_list;
+    FontNamesPtr names;
+    LFWIstateRec current;
+    LFWIstateRec saved;
+    Bool haveSaved;
+    Bool	from_dispatch;    
+    char *savedName;
+    int savedNameLen;
+} LFclosureRec;
+
+/* PolyText */
+
+typedef struct _PTclosure {
+    ClientPtr client;
+    DrawablePtr pDraw;
+    GC *pGC;
+    unsigned char *pElt;
+    unsigned char *endReq;
+    unsigned char *data;
+    int xorg;
+    int yorg;
+    CARD8 reqType;
+    XID did;
+    int err;
+    Bool	        from_dispatch;
+} PTclosureRec;
+
+/* ImageText */
+
+typedef struct _ITclosure {
+    ClientPtr client;
+    DrawablePtr pDraw;
+    GC *pGC;
+    BYTE nChars;
+    unsigned char *data;
+    int xorg;
+    int yorg;
+    CARD8 reqType;
+    XID did;
+    Bool	        from_dispatch;
+} ITclosureRec;
+#endif                          /* CLOSESTR_H */
diff --git a/xorg-server/include/closure.h b/xorg-server/include/closure.h
index b261f5e0d..0a7dae6ae 100644
--- a/xorg-server/include/closure.h
+++ b/xorg-server/include/closure.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
@@ -48,10 +47,10 @@ SOFTWARE.
 #ifndef CLOSURE_H
 #define CLOSURE_H 1
 
-typedef struct _LFclosure	*LFclosurePtr;
-typedef struct _LFWIclosure	*LFWIclosurePtr;
-typedef struct _OFclosure	*OFclosurePtr;
-typedef struct _PTclosure	*PTclosurePtr;
-typedef struct _ITclosure	*ITclosurePtr;
+typedef struct _LFclosure *LFclosurePtr;
+typedef struct _LFWIclosure *LFWIclosurePtr;
+typedef struct _OFclosure *OFclosurePtr;
+typedef struct _PTclosure *PTclosurePtr;
+typedef struct _ITclosure *ITclosurePtr;
 
-#endif /* CLOSURE_H */
+#endif                          /* CLOSURE_H */
diff --git a/xorg-server/include/cursorstr.h b/xorg-server/include/cursorstr.h
index b082cb911..68ab2ecfd 100644
--- a/xorg-server/include/cursorstr.h
+++ b/xorg-server/include/cursorstr.h
@@ -1,99 +1,98 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

-

-Except as contained in this notice, the name of The 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

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifndef CURSORSTRUCT_H

-#define CURSORSTRUCT_H 

-

-#include "cursor.h"

-#include "privates.h"

-/* 

- * device-independent cursor storage

- */

-

-/*

- * source and mask point directly to the bits, which are in the server-defined

- * bitmap format.

- */

-typedef struct _CursorBits {

-    unsigned char *source;			/* points to bits */

-    unsigned char *mask;			/* points to bits */

-    Bool emptyMask;				/* all zeros mask */

-    unsigned short width, height, xhot, yhot;	/* metrics */

-    int refcnt;					/* can be shared */

-    PrivateRec *devPrivates;			/* set by pScr->RealizeCursor*/

-#ifdef ARGB_CURSOR

-    CARD32 *argb;				/* full-color alpha blended */

-#endif

-} CursorBits, *CursorBitsPtr;

-

-#define CURSOR_BITS_SIZE (sizeof(CursorBits) + dixPrivatesSize(PRIVATE_CURSOR_BITS))

-

-typedef struct _Cursor {

-    CursorBitsPtr bits;

-    unsigned short foreRed, foreGreen, foreBlue; /* device-independent color */

-    unsigned short backRed, backGreen, backBlue; /* device-independent color */

-    int refcnt;

-    PrivateRec *devPrivates;			/* set by pScr->RealizeCursor*/

-    XID id;

-#ifdef XFIXES

-    CARD32 serialNumber;

-    Atom name;

-#endif

-} CursorRec;

-

-#define CURSOR_REC_SIZE (sizeof(CursorRec) + dixPrivatesSize(PRIVATE_CURSOR))

-

-typedef struct _CursorMetric {

-    unsigned short width, height, xhot, yhot;

-} CursorMetricRec;

-

-typedef struct {

-    int                x, y;

-    ScreenPtr  pScreen;

-} HotSpot;

-

-#endif /* CURSORSTRUCT_H */

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef CURSORSTRUCT_H
+#define CURSORSTRUCT_H
+
+#include "cursor.h"
+#include "privates.h"
+/* 
+ * device-independent cursor storage
+ */
+
+/*
+ * source and mask point directly to the bits, which are in the server-defined
+ * bitmap format.
+ */
+typedef struct _CursorBits {
+    unsigned char *source;      /* points to bits */
+    unsigned char *mask;        /* points to bits */
+    Bool emptyMask;             /* all zeros mask */
+    unsigned short width, height, xhot, yhot;   /* metrics */
+    int refcnt;                 /* can be shared */
+    PrivateRec *devPrivates;    /* set by pScr->RealizeCursor */
+#ifdef ARGB_CURSOR
+    CARD32 *argb;               /* full-color alpha blended */
+#endif
+} CursorBits, *CursorBitsPtr;
+
+#define CURSOR_BITS_SIZE (sizeof(CursorBits) + dixPrivatesSize(PRIVATE_CURSOR_BITS))
+
+typedef struct _Cursor {
+    CursorBitsPtr bits;
+    unsigned short foreRed, foreGreen, foreBlue;        /* device-independent color */
+    unsigned short backRed, backGreen, backBlue;        /* device-independent color */
+    int refcnt;
+    PrivateRec *devPrivates;    /* set by pScr->RealizeCursor */
+    XID id;
+#ifdef XFIXES
+    CARD32 serialNumber;
+    Atom name;
+#endif
+} CursorRec;
+
+#define CURSOR_REC_SIZE (sizeof(CursorRec) + dixPrivatesSize(PRIVATE_CURSOR))
+
+typedef struct _CursorMetric {
+    unsigned short width, height, xhot, yhot;
+} CursorMetricRec;
+
+typedef struct {
+    int x, y;
+    ScreenPtr pScreen;
+} HotSpot;
+
+#endif                          /* CURSORSTRUCT_H */
diff --git a/xorg-server/include/dixaccess.h b/xorg-server/include/dixaccess.h
index 7180acd71..784c83c64 100644
--- a/xorg-server/include/dixaccess.h
+++ b/xorg-server/include/dixaccess.h
@@ -20,35 +20,35 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * simultaneously.
  */
 
-#define DixUnknownAccess	0	/* don't know intentions */
-#define DixReadAccess		(1<<0)	/* inspecting the object */
-#define DixWriteAccess		(1<<1)	/* changing the object */
-#define DixDestroyAccess	(1<<2)	/* destroying the object */
-#define DixCreateAccess		(1<<3)	/* creating the object */
-#define DixGetAttrAccess	(1<<4)	/* get object attributes */
-#define DixSetAttrAccess	(1<<5)	/* set object attributes */
+#define DixUnknownAccess	0       /* don't know intentions */
+#define DixReadAccess		(1<<0)  /* inspecting the object */
+#define DixWriteAccess		(1<<1)  /* changing the object */
+#define DixDestroyAccess	(1<<2)  /* destroying the object */
+#define DixCreateAccess		(1<<3)  /* creating the object */
+#define DixGetAttrAccess	(1<<4)  /* get object attributes */
+#define DixSetAttrAccess	(1<<5)  /* set object attributes */
 #define DixListPropAccess	(1<<6)  /* list properties of object */
-#define DixGetPropAccess	(1<<7)	/* get properties of object */
-#define DixSetPropAccess	(1<<8)	/* set properties of object */
-#define DixGetFocusAccess	(1<<9)	/* get focus of object */
-#define DixSetFocusAccess	(1<<10)	/* set focus of object */
-#define DixListAccess		(1<<11)	/* list objects */
-#define DixAddAccess		(1<<12)	/* add object */
-#define DixRemoveAccess		(1<<13)	/* remove object */
-#define DixHideAccess		(1<<14)	/* hide object */
-#define DixShowAccess		(1<<15)	/* show object */
-#define DixBlendAccess		(1<<16)	/* mix contents of objects */
-#define DixGrabAccess		(1<<17)	/* exclusive access to object */
-#define DixFreezeAccess		(1<<18)	/* freeze status of object */
-#define DixForceAccess		(1<<19)	/* force status of object */
-#define DixInstallAccess	(1<<20)	/* install object */
-#define DixUninstallAccess	(1<<21)	/* uninstall object */
-#define DixSendAccess		(1<<22)	/* send to object */
-#define DixReceiveAccess	(1<<23)	/* receive from object */
-#define DixUseAccess		(1<<24)	/* use object */
-#define DixManageAccess		(1<<25)	/* manage object */
-#define DixDebugAccess		(1<<26)	/* debug object */
-#define DixBellAccess		(1<<27)	/* audible sound */
+#define DixGetPropAccess	(1<<7)  /* get properties of object */
+#define DixSetPropAccess	(1<<8)  /* set properties of object */
+#define DixGetFocusAccess	(1<<9)  /* get focus of object */
+#define DixSetFocusAccess	(1<<10) /* set focus of object */
+#define DixListAccess		(1<<11) /* list objects */
+#define DixAddAccess		(1<<12) /* add object */
+#define DixRemoveAccess		(1<<13) /* remove object */
+#define DixHideAccess		(1<<14) /* hide object */
+#define DixShowAccess		(1<<15) /* show object */
+#define DixBlendAccess		(1<<16) /* mix contents of objects */
+#define DixGrabAccess		(1<<17) /* exclusive access to object */
+#define DixFreezeAccess		(1<<18) /* freeze status of object */
+#define DixForceAccess		(1<<19) /* force status of object */
+#define DixInstallAccess	(1<<20) /* install object */
+#define DixUninstallAccess	(1<<21) /* uninstall object */
+#define DixSendAccess		(1<<22) /* send to object */
+#define DixReceiveAccess	(1<<23) /* receive from object */
+#define DixUseAccess		(1<<24) /* use object */
+#define DixManageAccess		(1<<25) /* manage object */
+#define DixDebugAccess		(1<<26) /* debug object */
+#define DixBellAccess		(1<<27) /* audible sound */
 #define DixPostAccess		(1<<28) /* post or follow-up call */
 
-#endif /* DIX_ACCESS_H */
+#endif                          /* DIX_ACCESS_H */
diff --git a/xorg-server/include/dixfontstr.h b/xorg-server/include/dixfontstr.h
index c559e861e..ce878d06a 100644
--- a/xorg-server/include/dixfontstr.h
+++ b/xorg-server/include/dixfontstr.h
@@ -28,7 +28,7 @@ SOFTWARE.
 #include "dixfont.h"
 #include <X11/fonts/fontstruct.h>
 #include "closure.h"
-#include <X11/Xproto.h> /* for xQueryFontReply */
+#include <X11/Xproto.h>         /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)
 #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field
@@ -85,9 +85,9 @@ SOFTWARE.
 #define	PADGLYPHWIDTHBYTES(w)		(((((w)+7)>>3)+3) & ~0x3)
 #endif
 
-#if GLYPHPADBYTES == 8 /* for a cray? */
+#if GLYPHPADBYTES == 8          /* for a cray? */
 #define	GLYPHWIDTHBYTESPADDED(pci)	((GLYPHWIDTHBYTES(pci)+7) & ~0x7)
 #define	PADGLYPHWIDTHBYTES(w)		(((((w)+7)>>3)+7) & ~0x7)
 #endif
 
-#endif				/* DIXFONTSTRUCT_H */
+#endif                          /* DIXFONTSTRUCT_H */
diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h
index 571a51109..4c56d534a 100644
--- a/xorg-server/include/eventconvert.h
+++ b/xorg-server/include/eventconvert.h
@@ -38,4 +38,4 @@ _X_INTERNAL int GetCoreType(enum EventType type);
 _X_INTERNAL int GetXIType(enum EventType type);
 _X_INTERNAL int GetXI2Type(enum EventType type);
 
-#endif /* _EVENTCONVERT_H_ */
+#endif                          /* _EVENTCONVERT_H_ */
diff --git a/xorg-server/include/events.h b/xorg-server/include/events.h
index 222cc3d19..222bf328b 100644
--- a/xorg-server/include/events.h
+++ b/xorg-server/include/events.h
@@ -27,10 +27,12 @@
 typedef struct _DeviceEvent DeviceEvent;
 typedef struct _DeviceChangedEvent DeviceChangedEvent;
 typedef struct _TouchOwnershipEvent TouchOwnershipEvent;
+
 #if XFreeXDGA
 typedef struct _DGAEvent DGAEvent;
 #endif
 typedef struct _RawDeviceEvent RawDeviceEvent;
+
 #ifdef XQUARTZ
 typedef struct _XQuartzEvent XQuartzEvent;
 #endif
diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h
index a637260cd..e9c5fcbde 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -2,7 +2,7 @@
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
 
-#include "window.h"	/* for WindowPtr */
+#include "window.h"             /* for WindowPtr */
 
 /* Global X server variables that are visible to mi, dix, os, and ddx */
 
@@ -120,4 +120,4 @@ extern _X_EXPORT Bool noXvExtension;
 extern _X_EXPORT Bool noDRI2Extension;
 #endif
 
-#endif /* !_XSERV_GLOBAL_H_ */
+#endif                          /* !_XSERV_GLOBAL_H_ */
diff --git a/xorg-server/include/hotplug.h b/xorg-server/include/hotplug.h
index d074df31d..caa3201e7 100644
--- a/xorg-server/include/hotplug.h
+++ b/xorg-server/include/hotplug.h
@@ -29,4 +29,4 @@
 extern _X_EXPORT void config_init(void);
 extern _X_EXPORT void config_fini(void);
 
-#endif /* HOTPLUG_H */
+#endif                          /* HOTPLUG_H */
diff --git a/xorg-server/include/miscstruct.h b/xorg-server/include/miscstruct.h
index 409b102c0..0820e1e81 100644
--- a/xorg-server/include/miscstruct.h
+++ b/xorg-server/include/miscstruct.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
@@ -57,10 +56,10 @@ typedef xPoint DDXPointRec;
 typedef struct pixman_box16 BoxRec;
 
 typedef union _DevUnion {
-    pointer		ptr;
-    long		val;
-    unsigned long	uval;
-    pointer		(*fptr)(void);
+    pointer ptr;
+    long val;
+    unsigned long uval;
+    pointer (*fptr) (void);
 } DevUnion;
 
-#endif /* MISCSTRUCT_H */
+#endif                          /* MISCSTRUCT_H */
diff --git a/xorg-server/include/opaque.h b/xorg-server/include/opaque.h
index 5c2e9166c..9ca408ae1 100644
--- a/xorg-server/include/opaque.h
+++ b/xorg-server/include/opaque.h
@@ -1,77 +1,77 @@
-/*

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The 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.

-

-*/

-

-#ifndef OPAQUE_H

-#define OPAQUE_H

-

-#include <X11/Xmd.h>

-

-#include "globals.h"

-

-extern _X_EXPORT char *defaultTextFont;

-extern _X_EXPORT char *defaultCursorFont;

-extern _X_EXPORT int MaxClients;

-extern _X_EXPORT volatile char isItTimeToYield;

-extern _X_EXPORT volatile char dispatchException;

-

-/* bit values for dispatchException */

-#define DE_RESET     1

-#define DE_TERMINATE 2

-#define DE_PRIORITYCHANGE 4  /* set when a client's priority changes */

-

-extern _X_EXPORT CARD32 TimeOutValue;

-extern _X_EXPORT int ScreenSaverBlanking;

-extern _X_EXPORT int ScreenSaverAllowExposures;

-extern _X_EXPORT int defaultScreenSaverBlanking;

-extern _X_EXPORT int defaultScreenSaverAllowExposures;

-extern _X_EXPORT char *display;

-

-extern _X_EXPORT int defaultBackingStore;

-extern _X_EXPORT Bool disableBackingStore;

-extern _X_EXPORT Bool enableBackingStore;

-extern _X_EXPORT Bool PartialNetwork;

-extern _X_EXPORT Bool RunFromSigStopParent;

-#ifdef RLIMIT_DATA

-extern _X_EXPORT int limitDataSpace;

-#endif

-#ifdef RLIMIT_STACK

-extern _X_EXPORT int limitStackSpace;

-#endif

-#ifdef RLIMIT_NOFILE

-extern _X_EXPORT int limitNoFile;

-#endif

-extern _X_EXPORT Bool defeatAccessControl;

-extern _X_EXPORT long maxBigRequestSize;

-extern _X_EXPORT Bool party_like_its_1989;

-extern _X_EXPORT Bool whiteRoot;

-extern _X_EXPORT Bool bgNoneRoot;

-

-extern _X_EXPORT Bool CoreDump;

-

-

-#endif /* OPAQUE_H */

+/*
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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.
+
+*/
+
+#ifndef OPAQUE_H
+#define OPAQUE_H
+
+#include <X11/Xmd.h>
+
+#include "globals.h"
+
+extern _X_EXPORT char *defaultTextFont;
+extern _X_EXPORT char *defaultCursorFont;
+extern _X_EXPORT int MaxClients;
+extern _X_EXPORT volatile char isItTimeToYield;
+extern _X_EXPORT volatile char dispatchException;
+
+/* bit values for dispatchException */
+#define DE_RESET     1
+#define DE_TERMINATE 2
+#define DE_PRIORITYCHANGE 4     /* set when a client's priority changes */
+
+extern _X_EXPORT CARD32 TimeOutValue;
+extern _X_EXPORT int ScreenSaverBlanking;
+extern _X_EXPORT int ScreenSaverAllowExposures;
+extern _X_EXPORT int defaultScreenSaverBlanking;
+extern _X_EXPORT int defaultScreenSaverAllowExposures;
+extern _X_EXPORT char *display;
+
+extern _X_EXPORT int defaultBackingStore;
+extern _X_EXPORT Bool disableBackingStore;
+extern _X_EXPORT Bool enableBackingStore;
+extern _X_EXPORT Bool PartialNetwork;
+extern _X_EXPORT Bool RunFromSigStopParent;
+
+#ifdef RLIMIT_DATA
+extern _X_EXPORT int limitDataSpace;
+#endif
+#ifdef RLIMIT_STACK
+extern _X_EXPORT int limitStackSpace;
+#endif
+#ifdef RLIMIT_NOFILE
+extern _X_EXPORT int limitNoFile;
+#endif
+extern _X_EXPORT Bool defeatAccessControl;
+extern _X_EXPORT long maxBigRequestSize;
+extern _X_EXPORT Bool party_like_its_1989;
+extern _X_EXPORT Bool whiteRoot;
+extern _X_EXPORT Bool bgNoneRoot;
+
+extern _X_EXPORT Bool CoreDump;
+
+#endif                          /* OPAQUE_H */
diff --git a/xorg-server/include/optionstr.h b/xorg-server/include/optionstr.h
index a71d245fa..12ab85256 100644
--- a/xorg-server/include/optionstr.h
+++ b/xorg-server/include/optionstr.h
@@ -2,7 +2,6 @@
 #define OPTIONSTR_H_
 #include "list.h"
 
-
 struct _InputOption {
     GenericListRec list;
     char *opt_name;
@@ -11,4 +10,4 @@ struct _InputOption {
     char *opt_comment;
 };
 
-#endif /* INPUTSTRUCT_H */
+#endif                          /* INPUTSTRUCT_H */
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 19190e697..83aecf821 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -1,84 +1,83 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

-

-Except as contained in this notice, the name of The 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

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifndef PIXMAPSTRUCT_H

-#define PIXMAPSTRUCT_H

-#include "pixmap.h"

-#include "screenint.h"

-#include "regionstr.h"

-#include "privates.h"

-

-typedef struct _Drawable {

-    unsigned char	type;	/* DRAWABLE_<type> */

-    unsigned char	class;	/* specific to type */

-    unsigned char	depth;

-    unsigned char	bitsPerPixel;

-    XID			id;	/* resource id */

-    short		x;	/* window: screen absolute, pixmap: 0 */

-    short		y;	/* window: screen absolute, pixmap: 0 */

-    unsigned short	width;

-    unsigned short	height;

-    ScreenPtr		pScreen;

-    unsigned long	serialNumber;

-} DrawableRec;

-

-/*

- * PIXMAP -- device dependent 

- */

-

-typedef struct _Pixmap {

-    DrawableRec		drawable;

-    PrivateRec		*devPrivates;

-    int			refcnt;

-    int			devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */

-    DevUnion		devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */

-    short		screen_x;

-    short		screen_y;

-    unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */

-} PixmapRec;

-

-#endif /* PIXMAPSTRUCT_H */

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef PIXMAPSTRUCT_H
+#define PIXMAPSTRUCT_H
+#include "pixmap.h"
+#include "screenint.h"
+#include "regionstr.h"
+#include "privates.h"
+
+typedef struct _Drawable {
+    unsigned char type;         /* DRAWABLE_<type> */
+    unsigned char class;        /* specific to type */
+    unsigned char depth;
+    unsigned char bitsPerPixel;
+    XID id;                     /* resource id */
+    short x;                    /* window: screen absolute, pixmap: 0 */
+    short y;                    /* window: screen absolute, pixmap: 0 */
+    unsigned short width;
+    unsigned short height;
+    ScreenPtr pScreen;
+    unsigned long serialNumber;
+} DrawableRec;
+
+/*
+ * PIXMAP -- device dependent 
+ */
+
+typedef struct _Pixmap {
+    DrawableRec drawable;
+    PrivateRec *devPrivates;
+    int refcnt;
+    int devKind;                /* This is the pitch of the pixmap, typically width*bpp/8. */
+    DevUnion devPrivate;        /* When !NULL, devPrivate.ptr points to the raw pixel data. */
+    short screen_x;
+    short screen_y;
+    unsigned usage_hint;        /* see CREATE_PIXMAP_USAGE_* */
+} PixmapRec;
+
+#endif                          /* PIXMAPSTRUCT_H */
diff --git a/xorg-server/include/propertyst.h b/xorg-server/include/propertyst.h
index fd3e0118d..c12c71af6 100644
--- a/xorg-server/include/propertyst.h
+++ b/xorg-server/include/propertyst.h
@@ -1,68 +1,66 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

-

-Except as contained in this notice, the name of The 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

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifndef PROPERTYSTRUCT_H

-#define PROPERTYSTRUCT_H 

-#include "misc.h"

-#include "property.h"

-#include "privates.h"

-/* 

- *   PROPERTY -- property element

- */

-

-typedef struct _Property {

-        struct _Property       *next;

-	ATOM 		propertyName;

-	ATOM		type;       /* ignored by server */

-	uint32_t	format;     /* format of data for swapping - 8,16,32 */

-	uint32_t	size;       /* size of data in (format/8) bytes */

-	pointer         data;       /* private to client */

-	PrivateRec	*devPrivates;

-} PropertyRec;

-

-#endif /* PROPERTYSTRUCT_H */

-

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef PROPERTYSTRUCT_H
+#define PROPERTYSTRUCT_H
+#include "misc.h"
+#include "property.h"
+#include "privates.h"
+/* 
+ *   PROPERTY -- property element
+ */
+
+typedef struct _Property {
+    struct _Property *next;
+    ATOM propertyName;
+    ATOM type;                  /* ignored by server */
+    uint32_t format;            /* format of data for swapping - 8,16,32 */
+    uint32_t size;              /* size of data in (format/8) bytes */
+    pointer data;               /* private to client */
+    PrivateRec *devPrivates;
+} PropertyRec;
+
+#endif                          /* PROPERTYSTRUCT_H */
diff --git a/xorg-server/include/ptrveloc.h b/xorg-server/include/ptrveloc.h
index 4f76b0094..8778646f5 100644
--- a/xorg-server/include/ptrveloc.h
+++ b/xorg-server/include/ptrveloc.h
@@ -48,8 +48,8 @@ struct _DeviceVelocityRec;
  * returns actual acceleration depending on velocity, acceleration control,...
  */
 typedef double (*PointerAccelerationProfileFunc)
-              (DeviceIntPtr dev, struct _DeviceVelocityRec* vel,
-               double velocity, double threshold, double accelCoeff);
+ (DeviceIntPtr dev, struct _DeviceVelocityRec * vel,
+  double velocity, double threshold, double accelCoeff);
 
 /**
  * a motion history, with just enough information to
@@ -57,9 +57,9 @@ typedef double (*PointerAccelerationProfileFunc)
  * a more or less straight line
  */
 typedef struct _MotionTracker {
-    double dx, dy;  /* accumulated delta for each axis */
-    int time;       /* time of creation */
-    int dir;        /* initial direction bitfield */
+    double dx, dy;              /* accumulated delta for each axis */
+    int time;                   /* time of creation */
+    int dir;                    /* initial direction bitfield */
 } MotionTracker, *MotionTrackerPtr;
 
 /**
@@ -68,25 +68,25 @@ typedef struct _MotionTracker {
 typedef struct _DeviceVelocityRec {
     MotionTrackerPtr tracker;
     int num_tracker;
-    int cur_tracker;        /* current index */
-    double  velocity;       /* velocity as guessed by algorithm */
-    double  last_velocity;  /* previous velocity estimate */
-    double  last_dx;        /* last time-difference */
-    double  last_dy;        /* phase of last/current estimate */
-    double  corr_mul;       /* config: multiply this into velocity */
-    double  const_acceleration;  /* config: (recipr.) const deceleration */
-    double  min_acceleration;    /* config: minimum acceleration */
-    short   reset_time;     /* config: reset non-visible state after # ms */
-    short   use_softening;  /* config: use softening of mouse values */
-    double  max_rel_diff;   /* config: max. relative difference */
-    double  max_diff;       /* config: max. difference */
-    int     initial_range;  /* config: max. offset used as initial velocity */
-    Bool    average_accel;  /* config: average acceleration over velocity */
+    int cur_tracker;            /* current index */
+    double velocity;            /* velocity as guessed by algorithm */
+    double last_velocity;       /* previous velocity estimate */
+    double last_dx;             /* last time-difference */
+    double last_dy;             /* phase of last/current estimate */
+    double corr_mul;            /* config: multiply this into velocity */
+    double const_acceleration;  /* config: (recipr.) const deceleration */
+    double min_acceleration;    /* config: minimum acceleration */
+    short reset_time;           /* config: reset non-visible state after # ms */
+    short use_softening;        /* config: use softening of mouse values */
+    double max_rel_diff;        /* config: max. relative difference */
+    double max_diff;            /* config: max. difference */
+    int initial_range;          /* config: max. offset used as initial velocity */
+    Bool average_accel;         /* config: average acceleration over velocity */
     PointerAccelerationProfileFunc Profile;
     PointerAccelerationProfileFunc deviceSpecificProfile;
-    void*   profile_private;/* extended data, see  SetAccelerationProfile() */
-    struct {   /* to be able to query this information */
-        int     profile_number;
+    void *profile_private;      /* extended data, see  SetAccelerationProfile() */
+    struct {                    /* to be able to query this information */
+        int profile_number;
     } statistics;
 } DeviceVelocityRec, *DeviceVelocityPtr;
 
@@ -96,49 +96,54 @@ typedef struct _DeviceVelocityRec {
  */
 typedef struct _PredictableAccelSchemeRec {
     DeviceVelocityPtr vel;
-    long* prop_handlers;
+    long *prop_handlers;
     int num_prop_handlers;
 } PredictableAccelSchemeRec, *PredictableAccelSchemePtr;
 
 extern _X_EXPORT void
-InitVelocityData(DeviceVelocityPtr vel);
+ InitVelocityData(DeviceVelocityPtr vel);
 
 extern _X_EXPORT void
-InitTrackers(DeviceVelocityPtr vel, int ntracker);
+ InitTrackers(DeviceVelocityPtr vel, int ntracker);
 
 extern _X_EXPORT BOOL
 ProcessVelocityData2D(DeviceVelocityPtr vel, double dx, double dy, int time);
 
 extern _X_EXPORT double
+
 BasicComputeAcceleration(DeviceIntPtr dev, DeviceVelocityPtr vel,
-    double velocity, double threshold, double acc);
+                         double velocity, double threshold, double acc);
 
 extern _X_EXPORT void
-FreeVelocityData(DeviceVelocityPtr vel);
+ FreeVelocityData(DeviceVelocityPtr vel);
 
 extern _X_EXPORT int
-SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
+ SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
 
 extern _X_EXPORT DeviceVelocityPtr
 GetDevicePredictableAccelData(DeviceIntPtr dev);
 
 extern _X_EXPORT void
+
 SetDeviceSpecificAccelerationProfile(DeviceVelocityPtr vel,
                                      PointerAccelerationProfileFunc profile);
 
 extern _X_INTERNAL void
-AccelerationDefaultCleanup(DeviceIntPtr dev);
+ AccelerationDefaultCleanup(DeviceIntPtr dev);
 
 extern _X_INTERNAL Bool
+
 InitPredictableAccelerationScheme(DeviceIntPtr dev,
-				  struct _ValuatorAccelerationRec* protoScheme);
+                                  struct _ValuatorAccelerationRec *protoScheme);
 
 extern _X_INTERNAL void
-acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val,
+
+acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask *val,
                              CARD32 evtime);
 
 extern _X_INTERNAL void
-acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val,
+
+acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask *val,
                              CARD32 evtime);
 
-#endif  /* POINTERVELOCITY_H */
+#endif                          /* POINTERVELOCITY_H */
diff --git a/xorg-server/include/region.h b/xorg-server/include/region.h
index e9d7e778c..11dd59e98 100644
--- a/xorg-server/include/region.h
+++ b/xorg-server/include/region.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
@@ -50,4 +49,4 @@ SOFTWARE.
 
 #include "regionstr.h"
 
-#endif /* REGION_H */
+#endif                          /* REGION_H */
diff --git a/xorg-server/include/registry.h b/xorg-server/include/registry.h
index 44f79259e..f471b899f 100644
--- a/xorg-server/include/registry.h
+++ b/xorg-server/include/registry.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * not be a stack variable.
  */
 extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
-extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
+extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry * ext);
 
 /*
  * Lookup functions.  The returned string must not be modified or freed.
@@ -45,7 +45,7 @@ extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
  */
 extern _X_EXPORT void dixResetRegistry(void);
 
-#else /* XREGISTRY */
+#else                           /* XREGISTRY */
 
 /* Define calls away when the registry is not being built. */
 
@@ -60,5 +60,5 @@ extern _X_EXPORT void dixResetRegistry(void);
 
 #define dixResetRegistry() { ; }
 
-#endif /* XREGISTRY */
-#endif /* DIX_REGISTRY_H */
+#endif                          /* XREGISTRY */
+#endif                          /* DIX_REGISTRY_H */
diff --git a/xorg-server/include/rgb.h b/xorg-server/include/rgb.h
index 3e768b615..ddfb1d814 100644
--- a/xorg-server/include/rgb.h
+++ b/xorg-server/include/rgb.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
@@ -48,6 +47,6 @@ SOFTWARE.
 #ifndef RGB_H
 #define RGB_H
 typedef struct _RGB {
-	unsigned short red, green, blue;
-	} RGB;
-#endif /* RGB_H */
+    unsigned short red, green, blue;
+} RGB;
+#endif                          /* RGB_H */
diff --git a/xorg-server/include/selection.h b/xorg-server/include/selection.h
index 3271f6abb..37e4f5e64 100644
--- a/xorg-server/include/selection.h
+++ b/xorg-server/include/selection.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
@@ -65,13 +64,12 @@ typedef struct _Selection {
     PrivateRec *devPrivates;
 } Selection;
 
-
 /*
  *  Selection API
  */
 
-extern _X_EXPORT int dixLookupSelection(Selection **result, Atom name,
-		       ClientPtr client, Mask access_mode);
+extern _X_EXPORT int dixLookupSelection(Selection ** result, Atom name,
+                                        ClientPtr client, Mask access_mode);
 
 extern _X_EXPORT Selection *CurrentSelections;
 
@@ -84,12 +82,11 @@ typedef enum {
 } SelectionCallbackKind;
 
 typedef struct {
-    struct _Selection	    *selection;
-    ClientPtr		    client;
-    SelectionCallbackKind   kind;
+    struct _Selection *selection;
+    ClientPtr client;
+    SelectionCallbackKind kind;
 } SelectionInfoRec;
 
-
 /*
  *  Selection server internals
  */
@@ -100,6 +97,4 @@ extern _X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin);
 
 extern _X_EXPORT void DeleteClientFromAnySelections(ClientPtr client);
 
-#endif /* SELECTION_H */
-
-
+#endif                          /* SELECTION_H */
diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h
index 99e89a5c4..be3963f4e 100644
--- a/xorg-server/include/servermd.h
+++ b/xorg-server/include/servermd.h
@@ -1,361 +1,357 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

-

-Except as contained in this notice, the name of The 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

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifndef SERVERMD_H

-#define SERVERMD_H 1

-

-/*

- * Note: much of this is vestigial from mfb/cfb times.  This should

- * really be simplified even further.

- */

-

-/*

- * Machine dependent values:

- * GLYPHPADBYTES should be chosen with consideration for the space-time

- * trade-off.  Padding to 0 bytes means that there is no wasted space

- * in the font bitmaps (both on disk and in memory), but that access of

- * the bitmaps will cause odd-address memory references.  Padding to

- * 2 bytes would ensure even address memory references and would

- * be suitable for a 68010-class machine, but at the expense of wasted

- * space in the font bitmaps.  Padding to 4 bytes would be good

- * for real 32 bit machines, etc.  Be sure that you tell the font

- * compiler what kind of padding you want because its defines are

- * kept separate from this.  See server/include/font.h for how

- * GLYPHPADBYTES is used.

- */

-

-#ifdef __avr32__

-

-#define IMAGE_BYTE_ORDER        MSBFirst

-#define BITMAP_BIT_ORDER        MSBFirst

-#define GLYPHPADBYTES           4

-

-#endif /* __avr32__ */ 

-

-#ifdef __arm32__

-

-#define IMAGE_BYTE_ORDER        LSBFirst

-#define BITMAP_BIT_ORDER        LSBFirst

-#define GLYPHPADBYTES           4

-

-#endif /* __arm32__ */

-

-#if defined(__nds32__)

-

-#define IMAGE_BYTE_ORDER	LSBFirst

-

-#if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)

-# define BITMAP_BIT_ORDER	MSBFirst

-#else

-# define BITMAP_BIT_ORDER	LSBFirst

-#endif

-

-#if defined(XF86MONOVGA) || defined(XF86VGA16)

-# define BITMAP_SCANLINE_UNIT	8

-#endif

-

-#define GLYPHPADBYTES		4

-#define GETLEFTBITS_ALIGNMENT	1

-#define LARGE_INSTRUCTION_CACHE

-#define AVOID_MEMORY_READ

-

-#endif /* __nds32__ */

-

-#if defined __hppa__

-

-#define IMAGE_BYTE_ORDER	MSBFirst

-#define BITMAP_BIT_ORDER	MSBFirst

-#define GLYPHPADBYTES		4	/* to make fb work */

-					/* byte boundries */

-#endif /* hpux || __hppa__ */

-

-#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)

-

-#define IMAGE_BYTE_ORDER        MSBFirst

-#define BITMAP_BIT_ORDER        MSBFirst

-#define GLYPHPADBYTES           4

-

-#endif /* PowerPC */

-

-#if defined(__sh__)

-

-#if defined(__BIG_ENDIAN__)

-# define IMAGE_BYTE_ORDER	MSBFirst

-# define BITMAP_BIT_ORDER	MSBFirst

-# define GLYPHPADBYTES		4

-#else

-# define IMAGE_BYTE_ORDER	LSBFirst

-# define BITMAP_BIT_ORDER	LSBFirst

-# define GLYPHPADBYTES		4

-#endif

-

-#endif /* SuperH */

-

-#if defined(__m32r__)

-

-#if defined(__BIG_ENDIAN__)

-# define IMAGE_BYTE_ORDER      MSBFirst

-# define BITMAP_BIT_ORDER      MSBFirst

-# define GLYPHPADBYTES         4

-#else

-# define IMAGE_BYTE_ORDER      LSBFirst

-# define BITMAP_BIT_ORDER      LSBFirst

-# define GLYPHPADBYTES         4

-#endif

-

-#endif /* __m32r__ */

-

-#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \

-    (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \

-    defined(__sparc__) || defined(__mc68000__)

-

-#if defined(__sparc) || defined(__sparc__)

-# if !defined(sparc)

-#  define sparc 1

-# endif

-#endif

-

-#if defined(sun386) || defined(sun5)

-# define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */

-# define BITMAP_BIT_ORDER	LSBFirst

-#else

-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the SUN only */

-# define BITMAP_BIT_ORDER	MSBFirst

-#endif

-

-#define	GLYPHPADBYTES		4

-

-#endif /* sun && !(i386 && SVR4) */

-

-

-#if defined(ibm032) || defined (ibm)

-

-#ifdef __i386__

-# define IMAGE_BYTE_ORDER	LSBFirst	/* Value for PS/2 only */

-#else

-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the RT only*/

-#endif

-#define BITMAP_BIT_ORDER	MSBFirst

-#define	GLYPHPADBYTES		1

-/* ibm pcc doesn't understand pragmas. */

-

-#ifdef __i386__

-#define BITMAP_SCANLINE_UNIT	8

-#endif

-

-#endif /* ibm */

-

-#if (defined(mips) || defined(__mips)) 

-

-#if defined(MIPSEL) || defined(__MIPSEL__)

-# define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */

-# define BITMAP_BIT_ORDER	LSBFirst

-# define GLYPHPADBYTES		4

-#else

-# define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the MIPS only */

-# define BITMAP_BIT_ORDER	MSBFirst

-# define GLYPHPADBYTES		4

-#endif

-

-#endif /* mips */

-

-#if defined(__alpha) || defined(__alpha__)

-# define IMAGE_BYTE_ORDER	LSBFirst	/* Values for the Alpha only */

-# define BITMAP_BIT_ORDER       LSBFirst

-# define GLYPHPADBYTES		4

-

-#endif /* alpha */

-

-#if defined (linux) && defined (__s390__)

-

-#define IMAGE_BYTE_ORDER      	MSBFirst

-#define BITMAP_BIT_ORDER      	MSBFirst

-#define GLYPHPADBYTES         	4

-

-#define BITMAP_SCANLINE_UNIT	8

-#define FAST_UNALIGNED_READ

-

-#endif /* linux/s390 */

-

-#if defined (linux) && defined (__s390x__)

-

-#define IMAGE_BYTE_ORDER       MSBFirst

-#define BITMAP_BIT_ORDER       MSBFirst

-#define GLYPHPADBYTES          4

-

-#define BITMAP_SCANLINE_UNIT	8

-#define FAST_UNALIGNED_READ

-

-#endif /* linux/s390x */

-

-

-#if defined(__ia64__) || defined(ia64)

-

-# define IMAGE_BYTE_ORDER	LSBFirst

-# define BITMAP_BIT_ORDER       LSBFirst

-# define GLYPHPADBYTES		4

-

-#endif /* ia64 */

-

-#if defined(__amd64__) || defined(amd64) || defined(__amd64)

-# define IMAGE_BYTE_ORDER	LSBFirst

-# define BITMAP_BIT_ORDER       LSBFirst

-# define GLYPHPADBYTES		4

-/* ???? */

-#endif /* AMD64 */

-

-#if	defined(SVR4) && (defined(__i386__) || defined(__i386) ) ||	\

-	defined(__alpha__) || defined(__alpha) || \

-	defined(__i386__) || \

-	defined(__s390x__) || defined(__s390__)

-  

-#ifndef IMAGE_BYTE_ORDER

-#define IMAGE_BYTE_ORDER	LSBFirst

-#endif

-

-#ifndef BITMAP_BIT_ORDER

-# define BITMAP_BIT_ORDER      LSBFirst

-#endif

-

-#ifndef GLYPHPADBYTES

-#define GLYPHPADBYTES           4

-#endif

-

-#endif /* SVR4 / BSD / i386 */

-

-#if defined (linux) && defined (__mc68000__)

-

-#define IMAGE_BYTE_ORDER       MSBFirst

-#define BITMAP_BIT_ORDER       MSBFirst

-#define GLYPHPADBYTES          4

-

-#endif /* linux/m68k */

-

-

-/* linux on ARM */

-#if defined(linux) && defined(__arm__)

-#define IMAGE_BYTE_ORDER	LSBFirst

-#define BITMAP_BIT_ORDER	LSBFirst

-#define GLYPHPADBYTES		4

-#endif

-

-/* linux on IBM S/390 */

-#if defined (linux) && defined (__s390__)

-#define IMAGE_BYTE_ORDER	MSBFirst

-#define BITMAP_BIT_ORDER	MSBFirst

-#define GLYPHPADBYTES		4

-#endif /* linux/s390 */ 

-

-#ifdef WIN32

-#define IMAGE_BYTE_ORDER	LSBFirst

-#define BITMAP_BIT_ORDER	LSBFirst

-#define GLYPHPADBYTES		4

-#endif

-

-/* size of buffer to use with GetImage, measured in bytes. There's obviously

- * a trade-off between the amount of heap used and the number of times the

- * ddx routine has to be called.

- */

-#ifndef IMAGE_BUFSIZE

-#define IMAGE_BUFSIZE		(64*1024)

-#endif

-

-/* pad scanline to a longword */

-#ifndef BITMAP_SCANLINE_UNIT

-#define BITMAP_SCANLINE_UNIT	32

-#endif

-

-#ifndef BITMAP_SCANLINE_PAD

-#define BITMAP_SCANLINE_PAD  32

-#define LOG2_BITMAP_PAD		5

-#define LOG2_BYTES_PER_SCANLINE_PAD	2

-#endif

-

-#include <X11/Xfuncproto.h>

-/* 

- *   This returns the number of padding units, for depth d and width w.

- * For bitmaps this can be calculated with the macros above.

- * Other depths require either grovelling over the formats field of the

- * screenInfo or hardwired constants.

- */

-

-typedef struct _PaddingInfo {

-	int     padRoundUp;	/* pixels per pad unit - 1 */

-	int	padPixelsLog2;	/* log 2 (pixels per pad unit) */

-	int     padBytesLog2;	/* log 2 (bytes per pad unit) */

-	int	notPower2;	/* bitsPerPixel not a power of 2 */

-	int	bytesPerPixel;	/* only set when notPower2 is TRUE */

-	int	bitsPerPixel;	/* bits per pixel */

-} PaddingInfo;

-extern _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[];

-

-/* The only portable way to get the bpp from the depth is to look it up */

-#define BitsPerPixel(d) (PixmapWidthPaddingInfo[d].bitsPerPixel)

-

-#define PixmapWidthInPadUnits(w, d) \

-    (PixmapWidthPaddingInfo[d].notPower2 ? \

-    (((int)(w) * PixmapWidthPaddingInfo[d].bytesPerPixel +  \

-	         PixmapWidthPaddingInfo[d].bytesPerPixel) >> \

-	PixmapWidthPaddingInfo[d].padBytesLog2) : \

-    ((int)((w) + PixmapWidthPaddingInfo[d].padRoundUp) >> \

-	PixmapWidthPaddingInfo[d].padPixelsLog2))

-

-/*

- *	Return the number of bytes to which a scanline of the given

- * depth and width will be padded.

- */

-#define PixmapBytePad(w, d) \

-    (PixmapWidthInPadUnits(w, d) << PixmapWidthPaddingInfo[d].padBytesLog2)

-

-#define BitmapBytePad(w) \

-    (((int)((w) + BITMAP_SCANLINE_PAD - 1) >> LOG2_BITMAP_PAD) << LOG2_BYTES_PER_SCANLINE_PAD)

-

-#define PixmapWidthInPadUnitsProto(w, d) PixmapWidthInPadUnits(w, d)

-#define PixmapBytePadProto(w, d) PixmapBytePad(w, d)

-#define BitmapBytePadProto(w) BitmapBytePad(w)

-

-#endif /* SERVERMD_H */

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef SERVERMD_H
+#define SERVERMD_H 1
+
+/*
+ * Note: much of this is vestigial from mfb/cfb times.  This should
+ * really be simplified even further.
+ */
+
+/*
+ * Machine dependent values:
+ * GLYPHPADBYTES should be chosen with consideration for the space-time
+ * trade-off.  Padding to 0 bytes means that there is no wasted space
+ * in the font bitmaps (both on disk and in memory), but that access of
+ * the bitmaps will cause odd-address memory references.  Padding to
+ * 2 bytes would ensure even address memory references and would
+ * be suitable for a 68010-class machine, but at the expense of wasted
+ * space in the font bitmaps.  Padding to 4 bytes would be good
+ * for real 32 bit machines, etc.  Be sure that you tell the font
+ * compiler what kind of padding you want because its defines are
+ * kept separate from this.  See server/include/font.h for how
+ * GLYPHPADBYTES is used.
+ */
+
+#ifdef __avr32__
+
+#define IMAGE_BYTE_ORDER        MSBFirst
+#define BITMAP_BIT_ORDER        MSBFirst
+#define GLYPHPADBYTES           4
+
+#endif                          /* __avr32__ */
+
+#ifdef __arm32__
+
+#define IMAGE_BYTE_ORDER        LSBFirst
+#define BITMAP_BIT_ORDER        LSBFirst
+#define GLYPHPADBYTES           4
+
+#endif                          /* __arm32__ */
+
+#if defined(__nds32__)
+
+#define IMAGE_BYTE_ORDER	LSBFirst
+
+#if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
+#define BITMAP_BIT_ORDER	MSBFirst
+#else
+#define BITMAP_BIT_ORDER	LSBFirst
+#endif
+
+#if defined(XF86MONOVGA) || defined(XF86VGA16)
+#define BITMAP_SCANLINE_UNIT	8
+#endif
+
+#define GLYPHPADBYTES		4
+#define GETLEFTBITS_ALIGNMENT	1
+#define LARGE_INSTRUCTION_CACHE
+#define AVOID_MEMORY_READ
+
+#endif                          /* __nds32__ */
+
+#if defined __hppa__
+
+#define IMAGE_BYTE_ORDER	MSBFirst
+#define BITMAP_BIT_ORDER	MSBFirst
+#define GLYPHPADBYTES		4       /* to make fb work */
+                                        /* byte boundries */
+#endif                          /* hpux || __hppa__ */
+
+#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
+
+#define IMAGE_BYTE_ORDER        MSBFirst
+#define BITMAP_BIT_ORDER        MSBFirst
+#define GLYPHPADBYTES           4
+
+#endif                          /* PowerPC */
+
+#if defined(__sh__)
+
+#if defined(__BIG_ENDIAN__)
+#define IMAGE_BYTE_ORDER	MSBFirst
+#define BITMAP_BIT_ORDER	MSBFirst
+#define GLYPHPADBYTES		4
+#else
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
+#endif                          /* SuperH */
+
+#if defined(__m32r__)
+
+#if defined(__BIG_ENDIAN__)
+#define IMAGE_BYTE_ORDER      MSBFirst
+#define BITMAP_BIT_ORDER      MSBFirst
+#define GLYPHPADBYTES         4
+#else
+#define IMAGE_BYTE_ORDER      LSBFirst
+#define BITMAP_BIT_ORDER      LSBFirst
+#define GLYPHPADBYTES         4
+#endif
+
+#endif                          /* __m32r__ */
+
+#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
+    (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
+    defined(__sparc__) || defined(__mc68000__)
+
+#if defined(__sparc) || defined(__sparc__)
+#if !defined(sparc)
+#define sparc 1
+#endif
+#endif
+
+#if defined(sun386) || defined(sun5)
+#define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
+#define BITMAP_BIT_ORDER	LSBFirst
+#else
+#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the SUN only */
+#define BITMAP_BIT_ORDER	MSBFirst
+#endif
+
+#define	GLYPHPADBYTES		4
+
+#endif                          /* sun && !(i386 && SVR4) */
+
+#if defined(ibm032) || defined (ibm)
+
+#ifdef __i386__
+#define IMAGE_BYTE_ORDER	LSBFirst        /* Value for PS/2 only */
+#else
+#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the RT only */
+#endif
+#define BITMAP_BIT_ORDER	MSBFirst
+#define	GLYPHPADBYTES		1
+/* ibm pcc doesn't understand pragmas. */
+
+#ifdef __i386__
+#define BITMAP_SCANLINE_UNIT	8
+#endif
+
+#endif                          /* ibm */
+
+#if (defined(mips) || defined(__mips))
+
+#if defined(MIPSEL) || defined(__MIPSEL__)
+#define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#else
+#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the MIPS only */
+#define BITMAP_BIT_ORDER	MSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
+#endif                          /* mips */
+
+#if defined(__alpha) || defined(__alpha__)
+#define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the Alpha only */
+#define BITMAP_BIT_ORDER       LSBFirst
+#define GLYPHPADBYTES		4
+
+#endif                          /* alpha */
+
+#if defined (linux) && defined (__s390__)
+
+#define IMAGE_BYTE_ORDER      	MSBFirst
+#define BITMAP_BIT_ORDER      	MSBFirst
+#define GLYPHPADBYTES         	4
+
+#define BITMAP_SCANLINE_UNIT	8
+#define FAST_UNALIGNED_READ
+
+#endif                          /* linux/s390 */
+
+#if defined (linux) && defined (__s390x__)
+
+#define IMAGE_BYTE_ORDER       MSBFirst
+#define BITMAP_BIT_ORDER       MSBFirst
+#define GLYPHPADBYTES          4
+
+#define BITMAP_SCANLINE_UNIT	8
+#define FAST_UNALIGNED_READ
+
+#endif                          /* linux/s390x */
+
+#if defined(__ia64__) || defined(ia64)
+
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER       LSBFirst
+#define GLYPHPADBYTES		4
+
+#endif                          /* ia64 */
+
+#if defined(__amd64__) || defined(amd64) || defined(__amd64)
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER       LSBFirst
+#define GLYPHPADBYTES		4
+/* ???? */
+#endif                          /* AMD64 */
+
+#if	defined(SVR4) && (defined(__i386__) || defined(__i386) ) ||	\
+	defined(__alpha__) || defined(__alpha) || \
+	defined(__i386__) || \
+	defined(__s390x__) || defined(__s390__)
+
+#ifndef IMAGE_BYTE_ORDER
+#define IMAGE_BYTE_ORDER	LSBFirst
+#endif
+
+#ifndef BITMAP_BIT_ORDER
+#define BITMAP_BIT_ORDER      LSBFirst
+#endif
+
+#ifndef GLYPHPADBYTES
+#define GLYPHPADBYTES           4
+#endif
+
+#endif                          /* SVR4 / BSD / i386 */
+
+#if defined (linux) && defined (__mc68000__)
+
+#define IMAGE_BYTE_ORDER       MSBFirst
+#define BITMAP_BIT_ORDER       MSBFirst
+#define GLYPHPADBYTES          4
+
+#endif                          /* linux/m68k */
+
+/* linux on ARM */
+#if defined(linux) && defined(__arm__)
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
+/* linux on IBM S/390 */
+#if defined (linux) && defined (__s390__)
+#define IMAGE_BYTE_ORDER	MSBFirst
+#define BITMAP_BIT_ORDER	MSBFirst
+#define GLYPHPADBYTES		4
+#endif                          /* linux/s390 */
+
+#ifdef WIN32
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
+/* size of buffer to use with GetImage, measured in bytes. There's obviously
+ * a trade-off between the amount of heap used and the number of times the
+ * ddx routine has to be called.
+ */
+#ifndef IMAGE_BUFSIZE
+#define IMAGE_BUFSIZE		(64*1024)
+#endif
+
+/* pad scanline to a longword */
+#ifndef BITMAP_SCANLINE_UNIT
+#define BITMAP_SCANLINE_UNIT	32
+#endif
+
+#ifndef BITMAP_SCANLINE_PAD
+#define BITMAP_SCANLINE_PAD  32
+#define LOG2_BITMAP_PAD		5
+#define LOG2_BYTES_PER_SCANLINE_PAD	2
+#endif
+
+#include <X11/Xfuncproto.h>
+/* 
+ *   This returns the number of padding units, for depth d and width w.
+ * For bitmaps this can be calculated with the macros above.
+ * Other depths require either grovelling over the formats field of the
+ * screenInfo or hardwired constants.
+ */
+
+typedef struct _PaddingInfo {
+    int padRoundUp;             /* pixels per pad unit - 1 */
+    int padPixelsLog2;          /* log 2 (pixels per pad unit) */
+    int padBytesLog2;           /* log 2 (bytes per pad unit) */
+    int notPower2;              /* bitsPerPixel not a power of 2 */
+    int bytesPerPixel;          /* only set when notPower2 is TRUE */
+    int bitsPerPixel;           /* bits per pixel */
+} PaddingInfo;
+extern _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[];
+
+/* The only portable way to get the bpp from the depth is to look it up */
+#define BitsPerPixel(d) (PixmapWidthPaddingInfo[d].bitsPerPixel)
+
+#define PixmapWidthInPadUnits(w, d) \
+    (PixmapWidthPaddingInfo[d].notPower2 ? \
+    (((int)(w) * PixmapWidthPaddingInfo[d].bytesPerPixel +  \
+	         PixmapWidthPaddingInfo[d].bytesPerPixel) >> \
+	PixmapWidthPaddingInfo[d].padBytesLog2) : \
+    ((int)((w) + PixmapWidthPaddingInfo[d].padRoundUp) >> \
+	PixmapWidthPaddingInfo[d].padPixelsLog2))
+
+/*
+ *	Return the number of bytes to which a scanline of the given
+ * depth and width will be padded.
+ */
+#define PixmapBytePad(w, d) \
+    (PixmapWidthInPadUnits(w, d) << PixmapWidthPaddingInfo[d].padBytesLog2)
+
+#define BitmapBytePad(w) \
+    (((int)((w) + BITMAP_SCANLINE_PAD - 1) >> LOG2_BITMAP_PAD) << LOG2_BYTES_PER_SCANLINE_PAD)
+
+#define PixmapWidthInPadUnitsProto(w, d) PixmapWidthInPadUnits(w, d)
+#define PixmapBytePadProto(w, d) PixmapBytePad(w, d)
+#define BitmapBytePadProto(w) BitmapBytePad(w)
+
+#endif                          /* SERVERMD_H */
diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h
index dc8f7e20c..52a5e8388 100644
--- a/xorg-server/include/site.h
+++ b/xorg-server/include/site.h
@@ -1,127 +1,126 @@
-/************************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

-

-Except as contained in this notice, the name of The 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

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-********************************************************/

-

-#ifndef SITE_H

-#define SITE_H

-/*

- * The vendor string identifies the vendor responsible for the

- * server executable.

- */

-#ifndef VENDOR_STRING

-#define VENDOR_STRING "HC-Consult"

-#endif

-

-/*

- * The vendor release number identifies, for the purpose of submitting

- * traceable bug reports, the release number of software produced

- * by the vendor.

- */

-#ifndef VENDOR_RELEASE

-#define VENDOR_RELEASE	XORG_VERSION_CURRENT

-#endif

-

-/*

- * The following constants are provided solely as a last line of defense.  The

- * normal build ALWAYS overrides them using a special rule given in

- * server/dix/Imakefile.  If you want to change either of these constants, 

- * you should set the DefaultFontPath or DefaultRGBDatabase configuration 

- * parameters.

- * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!

- */

-#ifndef COMPILEDDEFAULTFONTPATH

-#define COMPILEDDEFAULTFONTPATH	"/usr/share/fonts/X11/misc/"

-#endif

-

-/*

- * The following constants contain default values for all of the variables 

- * that can be initialized on the server command line or in the environment.

- */

-#define COMPILEDDEFAULTFONT	"fixed"

-#define COMPILEDCURSORFONT	"cursor"

-#ifndef COMPILEDDISPLAYCLASS

-#define COMPILEDDISPLAYCLASS	"MIT-unspecified"

-#endif

-#define DEFAULT_TIMEOUT		60	/* seconds */

-#define DEFAULT_KEYBOARD_CLICK 	0

-#define DEFAULT_BELL		50

-#define DEFAULT_BELL_PITCH	400

-#define DEFAULT_BELL_DURATION	100

-#define DEFAULT_AUTOREPEAT	TRUE

-#define DEFAULT_AUTOREPEATS	{\

-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\

-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\

-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\

-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

-

-#define DEFAULT_LEDS		0x0        /* all off */

-#define DEFAULT_LEDS_MASK	0xffffffff /* 32 */

-#define DEFAULT_INT_RESOLUTION		1000

-#define DEFAULT_INT_MIN_VALUE		0

-#define DEFAULT_INT_MAX_VALUE		100

-#define DEFAULT_INT_DISPLAYED		0

-

-#define DEFAULT_PTR_NUMERATOR	2

-#define DEFAULT_PTR_DENOMINATOR	1

-#define DEFAULT_PTR_THRESHOLD	4

-

-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))

-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))

-#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking

-#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures

-#ifndef DEFAULT_ACCESS_CONTROL

-#define DEFAULT_ACCESS_CONTROL TRUE

-#endif

-

-/* Default logging parameters. */

-#ifndef DEFAULT_LOG_VERBOSITY

-#define DEFAULT_LOG_VERBOSITY		0

-#endif

-#ifndef DEFAULT_LOG_FILE_VERBOSITY

-#define DEFAULT_LOG_FILE_VERBOSITY	3

-#endif

-

-#endif /* SITE_H */

+/************************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The 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
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+********************************************************/
+
+#ifndef SITE_H
+#define SITE_H
+/*
+ * The vendor string identifies the vendor responsible for the
+ * server executable.
+ */
+#ifndef VENDOR_STRING
+#define VENDOR_STRING "HC-Consult"
+#endif
+
+/*
+ * The vendor release number identifies, for the purpose of submitting
+ * traceable bug reports, the release number of software produced
+ * by the vendor.
+ */
+#ifndef VENDOR_RELEASE
+#define VENDOR_RELEASE	XORG_VERSION_CURRENT
+#endif
+
+/*
+ * The following constants are provided solely as a last line of defense.  The
+ * normal build ALWAYS overrides them using a special rule given in
+ * server/dix/Imakefile.  If you want to change either of these constants, 
+ * you should set the DefaultFontPath or DefaultRGBDatabase configuration 
+ * parameters.
+ * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!
+ */
+#ifndef COMPILEDDEFAULTFONTPATH
+#define COMPILEDDEFAULTFONTPATH	"/usr/share/fonts/X11/misc/"
+#endif
+
+/*
+ * The following constants contain default values for all of the variables 
+ * that can be initialized on the server command line or in the environment.
+ */
+#define COMPILEDDEFAULTFONT	"fixed"
+#define COMPILEDCURSORFONT	"cursor"
+#ifndef COMPILEDDISPLAYCLASS
+#define COMPILEDDISPLAYCLASS	"MIT-unspecified"
+#endif
+#define DEFAULT_TIMEOUT		60      /* seconds */
+#define DEFAULT_KEYBOARD_CLICK 	0
+#define DEFAULT_BELL		50
+#define DEFAULT_BELL_PITCH	400
+#define DEFAULT_BELL_DURATION	100
+#define DEFAULT_AUTOREPEAT	TRUE
+#define DEFAULT_AUTOREPEATS	{\
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+
+#define DEFAULT_LEDS		0x0     /* all off */
+#define DEFAULT_LEDS_MASK	0xffffffff      /* 32 */
+#define DEFAULT_INT_RESOLUTION		1000
+#define DEFAULT_INT_MIN_VALUE		0
+#define DEFAULT_INT_MAX_VALUE		100
+#define DEFAULT_INT_DISPLAYED		0
+
+#define DEFAULT_PTR_NUMERATOR	2
+#define DEFAULT_PTR_DENOMINATOR	1
+#define DEFAULT_PTR_THRESHOLD	4
+
+#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
+#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
+#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
+#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
+#ifndef DEFAULT_ACCESS_CONTROL
+#define DEFAULT_ACCESS_CONTROL TRUE
+#endif
+
+/* Default logging parameters. */
+#ifndef DEFAULT_LOG_VERBOSITY
+#define DEFAULT_LOG_VERBOSITY		0
+#endif
+#ifndef DEFAULT_LOG_FILE_VERBOSITY
+#define DEFAULT_LOG_FILE_VERBOSITY	3
+#endif
+
+#endif                          /* SITE_H */
diff --git a/xorg-server/include/validate.h b/xorg-server/include/validate.h
index e88fb41a2..1df22a38a 100644
--- a/xorg-server/include/validate.h
+++ b/xorg-server/include/validate.h
@@ -37,4 +37,4 @@ typedef union _Validate *ValidatePtr;
 
 #define UnmapValData ((ValidatePtr)1)
 
-#endif /* VALIDATE_H */
+#endif                          /* VALIDATE_H */
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index 04553f831..79a957e58 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.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
@@ -53,7 +52,7 @@ SOFTWARE.
 #include "regionstr.h"
 #include "cursor.h"
 #include "property.h"
-#include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
+#include "resource.h"           /* for ROOT_WINDOW_ID_BASE */
 #include "dix.h"
 #include "privates.h"
 #include "miscstruct.h"
@@ -73,27 +72,27 @@ SOFTWARE.
 
 /* used as NULL-terminated list */
 typedef struct _DevCursorNode {
-    CursorPtr                   cursor;
-    DeviceIntPtr                dev;
-    struct _DevCursorNode*      next;
+    CursorPtr cursor;
+    DeviceIntPtr dev;
+    struct _DevCursorNode *next;
 } DevCursNodeRec, *DevCursNodePtr, *DevCursorList;
 
 typedef struct _WindowOpt {
-    CursorPtr		cursor;		   /* default: window.cursorNone */
-    VisualID		visual;		   /* default: same as parent */
-    Colormap		colormap;	   /* default: same as parent */
-    Mask		dontPropagateMask; /* default: window.dontPropagate */
-    Mask		otherEventMasks;   /* default: 0 */
-    struct _OtherClients *otherClients;	   /* default: NULL */
-    struct _GrabRec	*passiveGrabs;	   /* default: NULL */
-    PropertyPtr		userProps;	   /* default: NULL */
-    unsigned long	backingBitPlanes;  /* default: ~0L */
-    unsigned long	backingPixel;	   /* default: 0 */
-    RegionPtr		boundingShape;	   /* default: NULL */
-    RegionPtr		clipShape;	   /* default: NULL */
-    RegionPtr		inputShape;	   /* default: NULL */
-    struct _OtherInputMasks *inputMasks;   /* default: NULL */
-    DevCursorList       deviceCursors;     /* default: NULL */
+    CursorPtr cursor;           /* default: window.cursorNone */
+    VisualID visual;            /* default: same as parent */
+    Colormap colormap;          /* default: same as parent */
+    Mask dontPropagateMask;     /* default: window.dontPropagate */
+    Mask otherEventMasks;       /* default: 0 */
+    struct _OtherClients *otherClients; /* default: NULL */
+    struct _GrabRec *passiveGrabs;      /* default: NULL */
+    PropertyPtr userProps;      /* default: NULL */
+    unsigned long backingBitPlanes;     /* default: ~0L */
+    unsigned long backingPixel; /* default: 0 */
+    RegionPtr boundingShape;    /* default: NULL */
+    RegionPtr clipShape;        /* default: NULL */
+    RegionPtr inputShape;       /* default: NULL */
+    struct _OtherInputMasks *inputMasks;        /* default: NULL */
+    DevCursorList deviceCursors;        /* default: NULL */
 } WindowOptRec, *WindowOptPtr;
 
 #define BackgroundPixel	    2L
@@ -127,49 +126,49 @@ typedef struct _WindowOpt {
 #define RedirectDrawManual	2
 
 typedef struct _Window {
-    DrawableRec		drawable;
-    PrivateRec		*devPrivates;
-    WindowPtr		parent;		/* ancestor chain */
-    WindowPtr		nextSib;	/* next lower sibling */
-    WindowPtr		prevSib;	/* next higher sibling */
-    WindowPtr		firstChild;	/* top-most child */
-    WindowPtr		lastChild;	/* bottom-most child */
-    RegionRec		clipList;	/* clipping rectangle for output */
-    RegionRec		borderClip;	/* NotClippedByChildren + border */
-    union _Validate	*valdata;
-    RegionRec		winSize;
-    RegionRec		borderSize;
-    DDXPointRec		origin;		/* position relative to parent */
-    unsigned short	borderWidth;
-    unsigned long	deliverableEvents; /* all masks from all clients */
-    Mask		eventMask;      /* mask from the creating client */
-    PixUnion		background;
-    PixUnion		border;
-    pointer		backStorage;	/* null when BS disabled */
-    WindowOptPtr	optional;
-    unsigned		backgroundState:2; /* None, Relative, Pixel, Pixmap */
-    unsigned		borderIsPixel:1;
-    unsigned		cursorIsNone:1;	/* else real cursor (might inherit) */
-    unsigned		backingStore:2;
-    unsigned		saveUnder:1;
-    unsigned		DIXsaveUnder:1;
-    unsigned		bitGravity:4;
-    unsigned		winGravity:4;
-    unsigned		overrideRedirect:1;
-    unsigned		visibility:2;
-    unsigned		mapped:1;
-    unsigned		realized:1;	/* ancestors are all mapped */
-    unsigned		viewable:1;	/* realized && InputOutput */
-    unsigned		dontPropagate:3;/* index into DontPropagateMasks */
-    unsigned		forcedBS:1;	/* system-supplied backingStore */
-    unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */
-    unsigned		forcedBG:1;	/* must have an opaque background */
+    DrawableRec drawable;
+    PrivateRec *devPrivates;
+    WindowPtr parent;           /* ancestor chain */
+    WindowPtr nextSib;          /* next lower sibling */
+    WindowPtr prevSib;          /* next higher sibling */
+    WindowPtr firstChild;       /* top-most child */
+    WindowPtr lastChild;        /* bottom-most child */
+    RegionRec clipList;         /* clipping rectangle for output */
+    RegionRec borderClip;       /* NotClippedByChildren + border */
+    union _Validate *valdata;
+    RegionRec winSize;
+    RegionRec borderSize;
+    DDXPointRec origin;         /* position relative to parent */
+    unsigned short borderWidth;
+    unsigned long deliverableEvents;   /* all masks from all clients */
+    Mask eventMask;             /* mask from the creating client */
+    PixUnion background;
+    PixUnion border;
+    pointer backStorage;        /* null when BS disabled */
+    WindowOptPtr optional;
+    unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */
+    unsigned borderIsPixel:1;
+    unsigned cursorIsNone:1;    /* else real cursor (might inherit) */
+    unsigned backingStore:2;
+    unsigned saveUnder:1;
+    unsigned DIXsaveUnder:1;
+    unsigned bitGravity:4;
+    unsigned winGravity:4;
+    unsigned overrideRedirect:1;
+    unsigned visibility:2;
+    unsigned mapped:1;
+    unsigned realized:1;        /* ancestors are all mapped */
+    unsigned viewable:1;        /* realized && InputOutput */
+    unsigned dontPropagate:3;   /* index into DontPropagateMasks */
+    unsigned forcedBS:1;        /* system-supplied backingStore */
+    unsigned redirectDraw:2;    /* COMPOSITE rendering redirect */
+    unsigned forcedBG:1;        /* must have an opaque background */
 #ifdef ROOTLESS
-    unsigned		rootlessUnhittable:1;	/* doesn't hit-test */
+    unsigned rootlessUnhittable:1;      /* doesn't hit-test */
 #endif
 #ifdef COMPOSITE
-    unsigned		damagedDescendants:1;	/* some descendants are damaged */
-    unsigned		inhibitBGPaint:1;	/* paint the background? */
+    unsigned damagedDescendants:1;      /* some descendants are damaged */
+    unsigned inhibitBGPaint:1;  /* paint the background? */
 #endif
 } WindowRec;
 
@@ -178,7 +177,7 @@ typedef struct _Window {
  * fields (or filling the appropriate default value)
  */
 
-extern _X_EXPORT Mask	DontPropagateMasks[];
+extern _X_EXPORT Mask DontPropagateMasks[];
 
 #define wTrackParent(w,field)	((w)->optional ? \
 				    (w)->optional->field \
@@ -219,4 +218,4 @@ typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;
 
 extern _X_EXPORT int screenIsSaved;
 
-#endif /* WINDOWSTRUCT_H */
+#endif                          /* WINDOWSTRUCT_H */
diff --git a/xorg-server/include/xkbstr.h b/xorg-server/include/xkbstr.h
index 499512d7a..b85bf9220 100644
--- a/xorg-server/include/xkbstr.h
+++ b/xorg-server/include/xkbstr.h
@@ -40,59 +40,60 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	Xkb2CharsToInt(h,l)	((short)(((h)<<8)|(l)))
 #endif
 
-	/*
-	 * Common data structures and access macros
-	 */
+        /*
+         * Common data structures and access macros
+         */
 
 typedef struct _XkbStateRec {
-	unsigned char   group; /* base + latched + locked */
-	unsigned char   locked_group;
-	/* FIXME: Why are base + latched short and not char?? */
-	unsigned short  base_group; /* physically ... down? */
-	unsigned short  latched_group;
-
-	unsigned char   mods; /* base + latched + locked */
-	unsigned char   base_mods; /* physically down */
-	unsigned char   latched_mods;
-	unsigned char   locked_mods;
-
-	unsigned char   compat_state; /* mods + group for core state */
-
-	/* grab mods = all depressed and latched mods, _not_ locked mods */
-	unsigned char   grab_mods; /* grab mods minus internal mods */
-	unsigned char   compat_grab_mods; /* grab mods + group for core state,
-	                                     but not locked groups if
-                                             IgnoreGroupLocks set */
-
-	/* effective mods = all mods (depressed, latched, locked) */
-	unsigned char   lookup_mods; /* effective mods minus internal mods */
-	unsigned char   compat_lookup_mods; /* effective mods + group */
-
-	unsigned short  ptr_buttons; /* core pointer buttons */
-} XkbStateRec,*XkbStatePtr;
+    unsigned char group;        /* base + latched + locked */
+    unsigned char locked_group;
+    /* FIXME: Why are base + latched short and not char?? */
+    unsigned short base_group;  /* physically ... down? */
+    unsigned short latched_group;
+
+    unsigned char mods;         /* base + latched + locked */
+    unsigned char base_mods;    /* physically down */
+    unsigned char latched_mods;
+    unsigned char locked_mods;
+
+    unsigned char compat_state; /* mods + group for core state */
+
+    /* grab mods = all depressed and latched mods, _not_ locked mods */
+    unsigned char grab_mods;    /* grab mods minus internal mods */
+    unsigned char compat_grab_mods;     /* grab mods + group for core state,
+                                           but not locked groups if
+                                           IgnoreGroupLocks set */
+
+    /* effective mods = all mods (depressed, latched, locked) */
+    unsigned char lookup_mods;  /* effective mods minus internal mods */
+    unsigned char compat_lookup_mods;   /* effective mods + group */
+
+    unsigned short ptr_buttons; /* core pointer buttons */
+} XkbStateRec, *XkbStatePtr;
+
 #define	XkbStateFieldFromRec(s)	XkbBuildCoreState((s)->lookup_mods,(s)->group)
 #define	XkbGrabStateFromRec(s)	XkbBuildCoreState((s)->grab_mods,(s)->group)
 
 typedef struct _XkbMods {
-	unsigned char	mask;	/* effective mods */
-	unsigned char	real_mods;
-	unsigned short	vmods;
-} XkbModsRec,*XkbModsPtr;
+    unsigned char mask;         /* effective mods */
+    unsigned char real_mods;
+    unsigned short vmods;
+} XkbModsRec, *XkbModsPtr;
 
 typedef struct _XkbKTMapEntry {
-	Bool		active;
-	unsigned char	level;
-	XkbModsRec	mods;
-} XkbKTMapEntryRec,*XkbKTMapEntryPtr;
+    Bool active;
+    unsigned char level;
+    XkbModsRec mods;
+} XkbKTMapEntryRec, *XkbKTMapEntryPtr;
 
 typedef struct _XkbKeyType {
-	XkbModsRec		mods;
-	unsigned char	  	num_levels;
-	unsigned char	  	map_count;
-	XkbKTMapEntryPtr  	map;
-	XkbModsPtr  		preserve;
-	Atom		  	name;
-	Atom *			level_names;
+    XkbModsRec mods;
+    unsigned char num_levels;
+    unsigned char map_count;
+    XkbKTMapEntryPtr map;
+    XkbModsPtr preserve;
+    Atom name;
+    Atom *level_names;
 } XkbKeyTypeRec, *XkbKeyTypePtr;
 
 #define	XkbNumGroups(g)			((g)&0x0f)
@@ -103,103 +104,109 @@ typedef struct _XkbKeyType {
                                   ((g) & 0x0f))
 #define	XkbSetNumGroups(g,n)	(((g)&0xf0)|((n)&0x0f))
 
-	/*
-	 * Structures and access macros used primarily by the server
-	 */
+        /*
+         * Structures and access macros used primarily by the server
+         */
 
 typedef struct _XkbBehavior {
-	unsigned char	type;
-	unsigned char	data;
+    unsigned char type;
+    unsigned char data;
 } XkbBehavior;
 
 #define	XkbAnyActionDataSize 7
-typedef	struct _XkbAnyAction {
-	unsigned char	type;
-	unsigned char	data[XkbAnyActionDataSize];
+typedef struct _XkbAnyAction {
+    unsigned char type;
+    unsigned char data[XkbAnyActionDataSize];
 } XkbAnyAction;
 
 typedef struct _XkbModAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	mask;
-	unsigned char	real_mods;
-        /* FIXME: Make this an int. */
-	unsigned char	vmods1;
-	unsigned char	vmods2;
+    unsigned char type;
+    unsigned char flags;
+    unsigned char mask;
+    unsigned char real_mods;
+    /* FIXME: Make this an int. */
+    unsigned char vmods1;
+    unsigned char vmods2;
 } XkbModAction;
+
 #define	XkbModActionVMods(a) ((short) (((a)->vmods1 << 8) | (a)->vmods2))
 #define	XkbSetModActionVMods(a,v) \
 	((a)->vmods1 = (((v) >> 8) & 0xff), \
          (a)->vmods2 = (v) & 0xff)
 
 typedef struct _XkbGroupAction {
-	unsigned char	type;
-	unsigned char	flags;
-        /* FIXME: Make this an int. */
-	char		group_XXX;
+    unsigned char type;
+    unsigned char flags;
+    /* FIXME: Make this an int. */
+    char group_XXX;
 } XkbGroupAction;
+
 #define	XkbSAGroup(a)		(XkbCharToInt((a)->group_XXX))
 #define	XkbSASetGroup(a,g)	((a)->group_XXX=(g))
 
 typedef struct _XkbISOAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	mask;
-	unsigned char	real_mods;
-        /* FIXME: Make this an int. */
-	char		group_XXX;
-	unsigned char	affect;
-	unsigned char	vmods1;
-	unsigned char	vmods2;
+    unsigned char type;
+    unsigned char flags;
+    unsigned char mask;
+    unsigned char real_mods;
+    /* FIXME: Make this an int. */
+    char group_XXX;
+    unsigned char affect;
+    unsigned char vmods1;
+    unsigned char vmods2;
 } XkbISOAction;
 
 typedef struct _XkbPtrAction {
-	unsigned char	type;
-	unsigned char	flags;
-        /* FIXME: Make this an int. */
-	unsigned char	high_XXX;
-	unsigned char	low_XXX;
-	unsigned char	high_YYY;
-	unsigned char	low_YYY;
+    unsigned char type;
+    unsigned char flags;
+    /* FIXME: Make this an int. */
+    unsigned char high_XXX;
+    unsigned char low_XXX;
+    unsigned char high_YYY;
+    unsigned char low_YYY;
 } XkbPtrAction;
+
 #define	XkbPtrActionX(a)      (Xkb2CharsToInt((a)->high_XXX,(a)->low_XXX))
 #define	XkbPtrActionY(a)      (Xkb2CharsToInt((a)->high_YYY,(a)->low_YYY))
 #define	XkbSetPtrActionX(a,x) (XkbIntTo2Chars(x,(a)->high_XXX,(a)->low_XXX))
 #define	XkbSetPtrActionY(a,y) (XkbIntTo2Chars(y,(a)->high_YYY,(a)->low_YYY))
 
 typedef struct _XkbPtrBtnAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	count;
-	unsigned char	button;
+    unsigned char type;
+    unsigned char flags;
+    unsigned char count;
+    unsigned char button;
 } XkbPtrBtnAction;
 
 typedef struct _XkbPtrDfltAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	affect;
-	char		valueXXX;
+    unsigned char type;
+    unsigned char flags;
+    unsigned char affect;
+    char valueXXX;
 } XkbPtrDfltAction;
+
 #define	XkbSAPtrDfltValue(a)		(XkbCharToInt((a)->valueXXX))
 #define	XkbSASetPtrDfltValue(a, c) ((a)->valueXXX = (c) & 0xff)
 
 typedef struct _XkbSwitchScreenAction {
-	unsigned char	type;
-	unsigned char	flags;
-	char		screenXXX;
+    unsigned char type;
+    unsigned char flags;
+    char screenXXX;
 } XkbSwitchScreenAction;
+
 #define	XkbSAScreen(a)			(XkbCharToInt((a)->screenXXX))
 #define	XkbSASetScreen(a, s) ((a)->screenXXX = (s) & 0xff)
 
 typedef struct _XkbCtrlsAction {
-	unsigned char	type;
-	unsigned char	flags;
-        /* FIXME: Make this an int. */
-	unsigned char	ctrls3;
-	unsigned char	ctrls2;
-	unsigned char	ctrls1;
-	unsigned char	ctrls0;
+    unsigned char type;
+    unsigned char flags;
+    /* FIXME: Make this an int. */
+    unsigned char ctrls3;
+    unsigned char ctrls2;
+    unsigned char ctrls1;
+    unsigned char ctrls0;
 } XkbCtrlsAction;
+
 #define	XkbActionSetCtrls(a, c) ((a)->ctrls3 = ((c) >> 24) & 0xff, \
                                  (a)->ctrls2 = ((c) >> 16) & 0xff, \
                                  (a)->ctrls1 = ((c) >> 8) & 0xff, \
@@ -210,21 +217,21 @@ typedef struct _XkbCtrlsAction {
                            ((unsigned int) (a)->ctrls0))
 
 typedef struct _XkbMessageAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	message[6];
+    unsigned char type;
+    unsigned char flags;
+    unsigned char message[6];
 } XkbMessageAction;
 
-typedef struct	_XkbRedirectKeyAction {
-	unsigned char	type;
-	unsigned char	new_key;
-	unsigned char	mods_mask;
-	unsigned char	mods;
-        /* FIXME: Make this an int. */
-	unsigned char	vmods_mask0;
-	unsigned char	vmods_mask1;
-	unsigned char	vmods0;
-	unsigned char	vmods1;
+typedef struct _XkbRedirectKeyAction {
+    unsigned char type;
+    unsigned char new_key;
+    unsigned char mods_mask;
+    unsigned char mods;
+    /* FIXME: Make this an int. */
+    unsigned char vmods_mask0;
+    unsigned char vmods_mask1;
+    unsigned char vmods0;
+    unsigned char vmods1;
 } XkbRedirectKeyAction;
 
 #define	XkbSARedirectVMods(a)		((((unsigned int)(a)->vmods1)<<8)|\
@@ -238,64 +245,64 @@ typedef struct	_XkbRedirectKeyAction {
 					 ((a)->vmods_mask0=((m)&0xff)))
 
 typedef struct _XkbDeviceBtnAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	count;
-	unsigned char	button;
-	unsigned char	device;
+    unsigned char type;
+    unsigned char flags;
+    unsigned char count;
+    unsigned char button;
+    unsigned char device;
 } XkbDeviceBtnAction;
 
 typedef struct _XkbDeviceValuatorAction {
-	unsigned char	type;
-	unsigned char	device;
-	unsigned char	v1_what;
-	unsigned char	v1_ndx;
-	unsigned char	v1_value;
-	unsigned char	v2_what;
-	unsigned char	v2_ndx;
-	unsigned char	v2_value;
+    unsigned char type;
+    unsigned char device;
+    unsigned char v1_what;
+    unsigned char v1_ndx;
+    unsigned char v1_value;
+    unsigned char v2_what;
+    unsigned char v2_ndx;
+    unsigned char v2_value;
 } XkbDeviceValuatorAction;
 
-typedef	union _XkbAction {
-	XkbAnyAction		any;
-	XkbModAction		mods;
-	XkbGroupAction		group;
-	XkbISOAction		iso;
-	XkbPtrAction		ptr;
-	XkbPtrBtnAction		btn;
-	XkbPtrDfltAction	dflt;
-	XkbSwitchScreenAction	screen;
-	XkbCtrlsAction		ctrls;
-	XkbMessageAction	msg;
-	XkbRedirectKeyAction	redirect;
-	XkbDeviceBtnAction	devbtn;
-	XkbDeviceValuatorAction	devval;
-	unsigned char 		type;
+typedef union _XkbAction {
+    XkbAnyAction any;
+    XkbModAction mods;
+    XkbGroupAction group;
+    XkbISOAction iso;
+    XkbPtrAction ptr;
+    XkbPtrBtnAction btn;
+    XkbPtrDfltAction dflt;
+    XkbSwitchScreenAction screen;
+    XkbCtrlsAction ctrls;
+    XkbMessageAction msg;
+    XkbRedirectKeyAction redirect;
+    XkbDeviceBtnAction devbtn;
+    XkbDeviceValuatorAction devval;
+    unsigned char type;
 } XkbAction;
 
-typedef	struct _XkbControls {
-	unsigned char	mk_dflt_btn;
-	unsigned char	num_groups;
-	unsigned char	groups_wrap;
-	XkbModsRec	internal;
-	XkbModsRec	ignore_lock;
-	unsigned int	enabled_ctrls;
-	unsigned short	repeat_delay;
-	unsigned short	repeat_interval;
-	unsigned short	slow_keys_delay;
-	unsigned short	debounce_delay;
-	unsigned short	mk_delay;
-	unsigned short	mk_interval;
-	unsigned short	mk_time_to_max;
-	unsigned short	mk_max_speed;
-		 short	mk_curve;
-	unsigned short	ax_options;
-	unsigned short	ax_timeout;
-	unsigned short	axt_opts_mask;
-	unsigned short	axt_opts_values;
-	unsigned int	axt_ctrls_mask;
-	unsigned int	axt_ctrls_values;
-	unsigned char	per_key_repeat[XkbPerKeyBitArraySize];
+typedef struct _XkbControls {
+    unsigned char mk_dflt_btn;
+    unsigned char num_groups;
+    unsigned char groups_wrap;
+    XkbModsRec internal;
+    XkbModsRec ignore_lock;
+    unsigned int enabled_ctrls;
+    unsigned short repeat_delay;
+    unsigned short repeat_interval;
+    unsigned short slow_keys_delay;
+    unsigned short debounce_delay;
+    unsigned short mk_delay;
+    unsigned short mk_interval;
+    unsigned short mk_time_to_max;
+    unsigned short mk_max_speed;
+    short mk_curve;
+    unsigned short ax_options;
+    unsigned short ax_timeout;
+    unsigned short axt_opts_mask;
+    unsigned short axt_opts_values;
+    unsigned int axt_ctrls_mask;
+    unsigned int axt_ctrls_values;
+    unsigned char per_key_repeat[XkbPerKeyBitArraySize];
 } XkbControlsRec, *XkbControlsPtr;
 
 #define	XkbAX_AnyFeedback(c)	((c)->enabled_ctrls&XkbAccessXFeedbackMask)
@@ -304,46 +311,46 @@ typedef	struct _XkbControls {
                                   XkbAX_NeedOption((c), (w)))
 
 typedef struct _XkbServerMapRec {
-	unsigned short		 num_acts;
-	unsigned short		 size_acts;
-	XkbAction		*acts;
+    unsigned short num_acts;
+    unsigned short size_acts;
+    XkbAction *acts;
 
-	XkbBehavior		*behaviors;
-	unsigned short		*key_acts;
+    XkbBehavior *behaviors;
+    unsigned short *key_acts;
 #if defined(__cplusplus) || defined(c_plusplus)
-	/* explicit is a C++ reserved word */
-	unsigned char		*c_explicit;
+    /* explicit is a C++ reserved word */
+    unsigned char *c_explicit;
 #else
-	unsigned char		*explicit;
+    unsigned char *explicit;
 #endif
-	unsigned char		 vmods[XkbNumVirtualMods];
-	unsigned short		*vmodmap;
+    unsigned char vmods[XkbNumVirtualMods];
+    unsigned short *vmodmap;
 } XkbServerMapRec, *XkbServerMapPtr;
 
 #define	XkbSMKeyActionsPtr(m, k) (&(m)->acts[(m)->key_acts[(k)]])
 
-	/*
-	 * Structures and access macros used primarily by clients
-	 */
+        /*
+         * Structures and access macros used primarily by clients
+         */
 
-typedef	struct _XkbSymMapRec {
-	unsigned char	 kt_index[XkbNumKbdGroups];
-	unsigned char	 group_info;
-	unsigned char	 width;
-	unsigned short	 offset;
+typedef struct _XkbSymMapRec {
+    unsigned char kt_index[XkbNumKbdGroups];
+    unsigned char group_info;
+    unsigned char width;
+    unsigned short offset;
 } XkbSymMapRec, *XkbSymMapPtr;
 
 typedef struct _XkbClientMapRec {
-	unsigned char		 size_types;
-	unsigned char		 num_types;
-	XkbKeyTypePtr		 types;
+    unsigned char size_types;
+    unsigned char num_types;
+    XkbKeyTypePtr types;
 
-	unsigned short		 size_syms;
-	unsigned short		 num_syms;
-	KeySym			*syms;
-	XkbSymMapPtr		 key_sym_map;
+    unsigned short size_syms;
+    unsigned short num_syms;
+    KeySym *syms;
+    XkbSymMapPtr key_sym_map;
 
-	unsigned char		*modmap;
+    unsigned char *modmap;
 } XkbClientMapRec, *XkbClientMapPtr;
 
 #define	XkbCMKeyGroupInfo(m, k) ((m)->key_sym_map[(k)].group_info)
@@ -357,35 +364,35 @@ typedef struct _XkbClientMapRec {
 #define	XkbCMKeySymsOffset(m, k) ((m)->key_sym_map[(k)].offset)
 #define	XkbCMKeySymsPtr(m, k) (&(m)->syms[XkbCMKeySymsOffset((m), (k))])
 
-	/*
-	 * Compatibility structures and access macros
-	 */
+        /*
+         * Compatibility structures and access macros
+         */
 
 typedef struct _XkbSymInterpretRec {
-	KeySym		sym;
-	unsigned char	flags;
-	unsigned char	match;
-	unsigned char	mods;
-	unsigned char	virtual_mod;
-	XkbAnyAction	act;
-} XkbSymInterpretRec,*XkbSymInterpretPtr;
+    KeySym sym;
+    unsigned char flags;
+    unsigned char match;
+    unsigned char mods;
+    unsigned char virtual_mod;
+    XkbAnyAction act;
+} XkbSymInterpretRec, *XkbSymInterpretPtr;
 
 typedef struct _XkbCompatMapRec {
-	XkbSymInterpretPtr	 sym_interpret;
-	XkbModsRec		 groups[XkbNumKbdGroups];
-	unsigned short		 num_si;
-	unsigned short		 size_si;
+    XkbSymInterpretPtr sym_interpret;
+    XkbModsRec groups[XkbNumKbdGroups];
+    unsigned short num_si;
+    unsigned short size_si;
 } XkbCompatMapRec, *XkbCompatMapPtr;
 
 typedef struct _XkbIndicatorMapRec {
-	unsigned char	flags;
-        /* FIXME: For some reason, interepretation of groups is wildly
-         *        different between which being base/latched/locked. */
-	unsigned char	which_groups;
-	unsigned char	groups;
-	unsigned char	which_mods;
-	XkbModsRec	mods;
-	unsigned int	ctrls;
+    unsigned char flags;
+    /* FIXME: For some reason, interepretation of groups is wildly
+     *        different between which being base/latched/locked. */
+    unsigned char which_groups;
+    unsigned char groups;
+    unsigned char which_mods;
+    XkbModsRec mods;
+    unsigned int ctrls;
 } XkbIndicatorMapRec, *XkbIndicatorMapPtr;
 
 #define	XkbIM_IsAuto(i)	(!((i)->flags & XkbIM_NoAutomatic) && \
@@ -394,63 +401,64 @@ typedef struct _XkbIndicatorMapRec {
                           (i)->ctrls))
 #define	XkbIM_InUse(i)	((i)->flags || (i)->which_groups || (i)->which_mods || \
                          (i)->ctrls)
-	
 
 typedef struct _XkbIndicatorRec {
-	unsigned long	  	phys_indicators;
-	XkbIndicatorMapRec	maps[XkbNumIndicators];
-} XkbIndicatorRec,*XkbIndicatorPtr;
+    unsigned long phys_indicators;
+    XkbIndicatorMapRec maps[XkbNumIndicators];
+} XkbIndicatorRec, *XkbIndicatorPtr;
 
-typedef	struct _XkbKeyNameRec {
-	char	name[XkbKeyNameLength];
-} XkbKeyNameRec,*XkbKeyNamePtr;
+typedef struct _XkbKeyNameRec {
+    char name[XkbKeyNameLength];
+} XkbKeyNameRec, *XkbKeyNamePtr;
 
 typedef struct _XkbKeyAliasRec {
-	char	real[XkbKeyNameLength];
-	char	alias[XkbKeyNameLength];
-} XkbKeyAliasRec,*XkbKeyAliasPtr;
+    char real[XkbKeyNameLength];
+    char alias[XkbKeyNameLength];
+} XkbKeyAliasRec, *XkbKeyAliasPtr;
 
-	/*
-	 * Names for everything 
-	 */
+        /*
+         * Names for everything 
+         */
 typedef struct _XkbNamesRec {
-	Atom		  keycodes;
-	Atom		  geometry;
-	Atom		  symbols;
-	Atom              types;
-	Atom		  compat;
-	Atom		  vmods[XkbNumVirtualMods];
-	Atom		  indicators[XkbNumIndicators];
-	Atom		  groups[XkbNumKbdGroups];
-	XkbKeyNamePtr	  keys;
-	XkbKeyAliasPtr	  key_aliases;
-	Atom		 *radio_groups;
-	Atom		  phys_symbols;
-
-	unsigned char	  num_keys;
-	unsigned char	  num_key_aliases;
-	unsigned short	  num_rg;
-} XkbNamesRec,*XkbNamesPtr;
-
-typedef	struct _XkbGeometry	*XkbGeometryPtr;
-	/*
-	 * Tie it all together into one big keyboard description
-	 */
-typedef	struct _XkbDesc {
-        unsigned int            defined;
-	unsigned short	 	flags;
-	unsigned short		device_spec;
-	KeyCode			min_key_code;
-	KeyCode			max_key_code;
-
-	XkbControlsPtr		ctrls;
-	XkbServerMapPtr		server;
-	XkbClientMapPtr		map;
-	XkbIndicatorPtr		indicators;
-	XkbNamesPtr		names;
-	XkbCompatMapPtr		compat;
-	XkbGeometryPtr		geom;
+    Atom keycodes;
+    Atom geometry;
+    Atom symbols;
+    Atom types;
+    Atom compat;
+    Atom vmods[XkbNumVirtualMods];
+    Atom indicators[XkbNumIndicators];
+    Atom groups[XkbNumKbdGroups];
+    XkbKeyNamePtr keys;
+    XkbKeyAliasPtr key_aliases;
+    Atom *radio_groups;
+    Atom phys_symbols;
+
+    unsigned char num_keys;
+    unsigned char num_key_aliases;
+    unsigned short num_rg;
+} XkbNamesRec, *XkbNamesPtr;
+
+typedef struct _XkbGeometry *XkbGeometryPtr;
+
+        /*
+         * Tie it all together into one big keyboard description
+         */
+typedef struct _XkbDesc {
+    unsigned int defined;
+    unsigned short flags;
+    unsigned short device_spec;
+    KeyCode min_key_code;
+    KeyCode max_key_code;
+
+    XkbControlsPtr ctrls;
+    XkbServerMapPtr server;
+    XkbClientMapPtr map;
+    XkbIndicatorPtr indicators;
+    XkbNamesPtr names;
+    XkbCompatMapPtr compat;
+    XkbGeometryPtr geom;
 } XkbDescRec, *XkbDescPtr;
+
 #define	XkbKeyKeyTypeIndex(d, k, g)	(XkbCMKeyTypeIndex((d)->map, (k), (g)))
 #define	XkbKeyKeyType(d, k, g)		(XkbCMKeyType((d)->map, (k), (g)))
 #define	XkbKeyGroupWidth(d, k, g)	(XkbCMKeyGroupWidth((d)->map, (k), (g)))
@@ -477,157 +485,156 @@ typedef	struct _XkbDesc {
 				 (k) <= (d)->max_key_code)
 #define	XkbNumKeys(d)		((d)->max_key_code-(d)->min_key_code+1)
 
-
-	/*
-	 * The following structures can be used to track changes
-	 * to a keyboard device
-	 */
+        /*
+         * The following structures can be used to track changes
+         * to a keyboard device
+         */
 typedef struct _XkbMapChanges {
-	unsigned short		 changed;
-	KeyCode			 min_key_code;
-	KeyCode			 max_key_code;
-	unsigned char		 first_type;
-	unsigned char		 num_types;
-	KeyCode			 first_key_sym;
-	unsigned char		 num_key_syms;
-	KeyCode			 first_key_act;
-	unsigned char		 num_key_acts;
-	KeyCode			 first_key_behavior;
-	unsigned char		 num_key_behaviors;
-	KeyCode 		 first_key_explicit;
-	unsigned char		 num_key_explicit;
-	KeyCode			 first_modmap_key;
-	unsigned char		 num_modmap_keys;
-	KeyCode			 first_vmodmap_key;
-	unsigned char		 num_vmodmap_keys;
-	unsigned char		 pad;
-	unsigned short		 vmods;
-} XkbMapChangesRec,*XkbMapChangesPtr;
+    unsigned short changed;
+    KeyCode min_key_code;
+    KeyCode max_key_code;
+    unsigned char first_type;
+    unsigned char num_types;
+    KeyCode first_key_sym;
+    unsigned char num_key_syms;
+    KeyCode first_key_act;
+    unsigned char num_key_acts;
+    KeyCode first_key_behavior;
+    unsigned char num_key_behaviors;
+    KeyCode first_key_explicit;
+    unsigned char num_key_explicit;
+    KeyCode first_modmap_key;
+    unsigned char num_modmap_keys;
+    KeyCode first_vmodmap_key;
+    unsigned char num_vmodmap_keys;
+    unsigned char pad;
+    unsigned short vmods;
+} XkbMapChangesRec, *XkbMapChangesPtr;
 
 typedef struct _XkbControlsChanges {
-	unsigned int 		 changed_ctrls;
-	unsigned int		 enabled_ctrls_changes;
-	Bool			 num_groups_changed;
-} XkbControlsChangesRec,*XkbControlsChangesPtr;
+    unsigned int changed_ctrls;
+    unsigned int enabled_ctrls_changes;
+    Bool num_groups_changed;
+} XkbControlsChangesRec, *XkbControlsChangesPtr;
 
 typedef struct _XkbIndicatorChanges {
-	unsigned int		 state_changes;
-	unsigned int		 map_changes;
-} XkbIndicatorChangesRec,*XkbIndicatorChangesPtr;
+    unsigned int state_changes;
+    unsigned int map_changes;
+} XkbIndicatorChangesRec, *XkbIndicatorChangesPtr;
 
 typedef struct _XkbNameChanges {
-	unsigned int 		changed;
-	unsigned char		first_type;
-	unsigned char		num_types;
-	unsigned char		first_lvl;
-	unsigned char		num_lvls;
-	unsigned char		num_aliases;
-	unsigned char		num_rg;
-	unsigned char		first_key;
-	unsigned char		num_keys;
-	unsigned short		changed_vmods;
-	unsigned long		changed_indicators;
-	unsigned char		changed_groups;
-} XkbNameChangesRec,*XkbNameChangesPtr;
+    unsigned int changed;
+    unsigned char first_type;
+    unsigned char num_types;
+    unsigned char first_lvl;
+    unsigned char num_lvls;
+    unsigned char num_aliases;
+    unsigned char num_rg;
+    unsigned char first_key;
+    unsigned char num_keys;
+    unsigned short changed_vmods;
+    unsigned long changed_indicators;
+    unsigned char changed_groups;
+} XkbNameChangesRec, *XkbNameChangesPtr;
 
 typedef struct _XkbCompatChanges {
-	unsigned char		changed_groups;
-	unsigned short		first_si;
-	unsigned short		num_si;
-} XkbCompatChangesRec,*XkbCompatChangesPtr;
+    unsigned char changed_groups;
+    unsigned short first_si;
+    unsigned short num_si;
+} XkbCompatChangesRec, *XkbCompatChangesPtr;
 
 typedef struct _XkbChanges {
-	unsigned short		 device_spec;
-	unsigned short		 state_changes;
-	XkbMapChangesRec	 map;
-	XkbControlsChangesRec	 ctrls;
-	XkbIndicatorChangesRec	 indicators;
-	XkbNameChangesRec	 names;
-	XkbCompatChangesRec	 compat;
+    unsigned short device_spec;
+    unsigned short state_changes;
+    XkbMapChangesRec map;
+    XkbControlsChangesRec ctrls;
+    XkbIndicatorChangesRec indicators;
+    XkbNameChangesRec names;
+    XkbCompatChangesRec compat;
 } XkbChangesRec, *XkbChangesPtr;
 
-	/*
-	 * These data structures are used to construct a keymap from 
-	 * a set of components or to list components in the server
-	 * database.
-	 */
+        /*
+         * These data structures are used to construct a keymap from 
+         * a set of components or to list components in the server
+         * database.
+         */
 typedef struct _XkbComponentNames {
-	char *			 keycodes;
-	char *			 types;
-	char *			 compat;
-	char *			 symbols;
-	char *			 geometry;
+    char *keycodes;
+    char *types;
+    char *compat;
+    char *symbols;
+    char *geometry;
 } XkbComponentNamesRec, *XkbComponentNamesPtr;
 
 typedef struct _XkbComponentName {
-	unsigned short		flags;
-	char *			name;
-} XkbComponentNameRec,*XkbComponentNamePtr;
+    unsigned short flags;
+    char *name;
+} XkbComponentNameRec, *XkbComponentNamePtr;
 
 typedef struct _XkbComponentList {
-	int			num_keymaps;
-	int			num_keycodes;
-	int			num_types;
-	int			num_compat;
-	int			num_symbols;
-	int			num_geometry;
-	XkbComponentNamePtr	keymaps;
-	XkbComponentNamePtr 	keycodes;
-	XkbComponentNamePtr	types;
-	XkbComponentNamePtr	compat;
-	XkbComponentNamePtr	symbols;
-	XkbComponentNamePtr	geometry;
+    int num_keymaps;
+    int num_keycodes;
+    int num_types;
+    int num_compat;
+    int num_symbols;
+    int num_geometry;
+    XkbComponentNamePtr keymaps;
+    XkbComponentNamePtr keycodes;
+    XkbComponentNamePtr types;
+    XkbComponentNamePtr compat;
+    XkbComponentNamePtr symbols;
+    XkbComponentNamePtr geometry;
 } XkbComponentListRec, *XkbComponentListPtr;
 
-	/*
-	 * The following data structures describe and track changes to a 
-	 * non-keyboard extension device 
-	 */
+        /*
+         * The following data structures describe and track changes to a 
+         * non-keyboard extension device 
+         */
 typedef struct _XkbDeviceLedInfo {
-	unsigned short			led_class;
-	unsigned short			led_id;
-	unsigned int			phys_indicators;
-	unsigned int			maps_present;
-	unsigned int			names_present;
-	unsigned int			state;
-	Atom 				names[XkbNumIndicators];
-	XkbIndicatorMapRec		maps[XkbNumIndicators];
-} XkbDeviceLedInfoRec,*XkbDeviceLedInfoPtr;
+    unsigned short led_class;
+    unsigned short led_id;
+    unsigned int phys_indicators;
+    unsigned int maps_present;
+    unsigned int names_present;
+    unsigned int state;
+    Atom names[XkbNumIndicators];
+    XkbIndicatorMapRec maps[XkbNumIndicators];
+} XkbDeviceLedInfoRec, *XkbDeviceLedInfoPtr;
 
 typedef struct _XkbDeviceInfo {
-	char *			name;
-	Atom			type;
-	unsigned short		device_spec;
-	Bool			has_own_state;
-	unsigned short		supported;
-	unsigned short		unsupported;
-
-	unsigned short		num_btns;
-	XkbAction *		btn_acts;
-
-	unsigned short		sz_leds;
-	unsigned short		num_leds;
-	unsigned short		dflt_kbd_fb;
-	unsigned short		dflt_led_fb;
-	XkbDeviceLedInfoPtr	leds;
-} XkbDeviceInfoRec,*XkbDeviceInfoPtr;
+    char *name;
+    Atom type;
+    unsigned short device_spec;
+    Bool has_own_state;
+    unsigned short supported;
+    unsigned short unsupported;
+
+    unsigned short num_btns;
+    XkbAction *btn_acts;
+
+    unsigned short sz_leds;
+    unsigned short num_leds;
+    unsigned short dflt_kbd_fb;
+    unsigned short dflt_led_fb;
+    XkbDeviceLedInfoPtr leds;
+} XkbDeviceInfoRec, *XkbDeviceInfoPtr;
 
 #define	XkbXI_DevHasBtnActs(d)	((d)->num_btns > 0 && (d)->btn_acts)
 #define	XkbXI_LegalDevBtn(d,b)	(XkbXI_DevHasBtnActs(d) && (b) < (d)->num_btns)
 #define	XkbXI_DevHasLeds(d)	((d)->num_leds > 0 && (d)->leds)
 
 typedef struct _XkbDeviceLedChanges {
-	unsigned short		led_class;
-	unsigned short		led_id;
-	unsigned int		defined; /* names or maps changed */
-	struct _XkbDeviceLedChanges *next;
-} XkbDeviceLedChangesRec,*XkbDeviceLedChangesPtr;
+    unsigned short led_class;
+    unsigned short led_id;
+    unsigned int defined;       /* names or maps changed */
+    struct _XkbDeviceLedChanges *next;
+} XkbDeviceLedChangesRec, *XkbDeviceLedChangesPtr;
 
 typedef struct _XkbDeviceChanges {
-	unsigned int		changed;
-	unsigned short		first_btn;
-	unsigned short		num_btns;
-	XkbDeviceLedChangesRec 	leds;
-} XkbDeviceChangesRec,*XkbDeviceChangesPtr;
+    unsigned int changed;
+    unsigned short first_btn;
+    unsigned short num_btns;
+    XkbDeviceLedChangesRec leds;
+} XkbDeviceChangesRec, *XkbDeviceChangesPtr;
 
-#endif /* _XKBSTR_H_ */
+#endif                          /* _XKBSTR_H_ */
diff --git a/xorg-server/include/xserver-properties.h b/xorg-server/include/xserver-properties.h
index 18b54ba32..85f2ce5c4 100644
--- a/xorg-server/include/xserver-properties.h
+++ b/xorg-server/include/xserver-properties.h
@@ -20,7 +20,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /* Properties managed by the server. */
 
 #ifndef _XSERVER_PROPERTIES_H_
@@ -63,7 +62,6 @@
 /* FLOAT, format 32 */
 #define ACCEL_PROP_VELOCITY_SCALING "Device Accel Velocity Scaling"
 
-
 /* Axis labels */
 #define AXIS_LABEL_PROP "Axis Labels"