Merge remote-tracking branch 'origin/released'

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

1 files changed, 430 insertions, 608 deletions

diff --git a/xorg-server/dix/tables.c b/xorg-server/dix/tables.c
index 45ae2a9d1..705ef0d4d 100644
--- a/xorg-server/dix/tables.c
+++ b/xorg-server/dix/tables.c
@@ -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
@@ -59,572 +58,397 @@ SOFTWARE.
 #include "swaprep.h"
 #include "swapreq.h"
 
-int (* InitialVector[3]) (
-	ClientPtr /* client */
-    ) =
-{
-    0,
-    ProcInitialConnection,
-    ProcEstablishConnection
-};
+int (*InitialVector[3]) (ClientPtr      /* client */
+    ) = {
+0, ProcInitialConnection, ProcEstablishConnection};
 
-int (* ProcVector[256]) (
-	ClientPtr /* client */
-    ) =
-{
-    ProcBadRequest,
-    ProcCreateWindow,
-    ProcChangeWindowAttributes,
-    ProcGetWindowAttributes,
-    ProcDestroyWindow,
-    ProcDestroySubwindows,		/* 5 */
-    ProcChangeSaveSet,
-    ProcReparentWindow,
-    ProcMapWindow,
-    ProcMapSubwindows,
-    ProcUnmapWindow,			/* 10 */
-    ProcUnmapSubwindows,
-    ProcConfigureWindow,
-    ProcCirculateWindow,
-    ProcGetGeometry,
-    ProcQueryTree,			/* 15 */
-    ProcInternAtom,
-    ProcGetAtomName,
-    ProcChangeProperty,
-    ProcDeleteProperty,
-    ProcGetProperty,			/* 20 */
-    ProcListProperties,
-    ProcSetSelectionOwner,
-    ProcGetSelectionOwner,
-    ProcConvertSelection,
-    ProcSendEvent,			/* 25 */
-    ProcGrabPointer,
-    ProcUngrabPointer,
-    ProcGrabButton,
-    ProcUngrabButton,
-    ProcChangeActivePointerGrab,	/* 30 */
-    ProcGrabKeyboard,
-    ProcUngrabKeyboard,
-    ProcGrabKey,
-    ProcUngrabKey,
-    ProcAllowEvents,			/* 35 */
-    ProcGrabServer,
-    ProcUngrabServer,
-    ProcQueryPointer,
-    ProcGetMotionEvents,
-    ProcTranslateCoords,		/* 40 */
-    ProcWarpPointer,
-    ProcSetInputFocus,
-    ProcGetInputFocus,
-    ProcQueryKeymap,
-    ProcOpenFont,			/* 45 */
-    ProcCloseFont,
-    ProcQueryFont,
-    ProcQueryTextExtents,
-    ProcListFonts,
-    ProcListFontsWithInfo,		/* 50 */
-    ProcSetFontPath,
-    ProcGetFontPath,
-    ProcCreatePixmap,
-    ProcFreePixmap,
-    ProcCreateGC,			/* 55 */
-    ProcChangeGC,
-    ProcCopyGC,
-    ProcSetDashes,
-    ProcSetClipRectangles,
-    ProcFreeGC,				/* 60 */
-    ProcClearToBackground,
-    ProcCopyArea,
-    ProcCopyPlane,
-    ProcPolyPoint,
-    ProcPolyLine,			/* 65 */
-    ProcPolySegment,
-    ProcPolyRectangle,
-    ProcPolyArc,
-    ProcFillPoly,
-    ProcPolyFillRectangle,		/* 70 */
-    ProcPolyFillArc,
-    ProcPutImage,
-    ProcGetImage,
-    ProcPolyText,
-    ProcPolyText,			/* 75 */
-    ProcImageText8,
-    ProcImageText16,
-    ProcCreateColormap,
-    ProcFreeColormap,
-    ProcCopyColormapAndFree,		/* 80 */
-    ProcInstallColormap,
-    ProcUninstallColormap,
-    ProcListInstalledColormaps,
-    ProcAllocColor,
-    ProcAllocNamedColor,		/* 85 */
-    ProcAllocColorCells,
-    ProcAllocColorPlanes,
-    ProcFreeColors,
-    ProcStoreColors,
-    ProcStoreNamedColor,		/* 90 */
-    ProcQueryColors,
-    ProcLookupColor,
-    ProcCreateCursor,
-    ProcCreateGlyphCursor,
-    ProcFreeCursor,			/* 95 */
-    ProcRecolorCursor,
-    ProcQueryBestSize,
-    ProcQueryExtension,
-    ProcListExtensions,
-    ProcChangeKeyboardMapping,		/* 100 */
-    ProcGetKeyboardMapping,
-    ProcChangeKeyboardControl,
-    ProcGetKeyboardControl,
-    ProcBell,
-    ProcChangePointerControl,		/* 105 */
-    ProcGetPointerControl,
-    ProcSetScreenSaver,
-    ProcGetScreenSaver,
-    ProcChangeHosts,
-    ProcListHosts,			/* 110 */
-    ProcChangeAccessControl,
-    ProcChangeCloseDownMode,
-    ProcKillClient,
-    ProcRotateProperties,
-    ProcForceScreenSaver,		/* 115 */
-    ProcSetPointerMapping,
-    ProcGetPointerMapping,
-    ProcSetModifierMapping,
-    ProcGetModifierMapping,
-    ProcBadRequest,				/* 120 */
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,				/* 125 */
-    ProcBadRequest,
-    ProcNoOperation,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest
-};
+int (*ProcVector[256]) (ClientPtr       /* client */
+    ) = {
+    ProcBadRequest, ProcCreateWindow, ProcChangeWindowAttributes, ProcGetWindowAttributes, ProcDestroyWindow, ProcDestroySubwindows,    /* 5 */
+        ProcChangeSaveSet, ProcReparentWindow, ProcMapWindow, ProcMapSubwindows, ProcUnmapWindow,       /* 10 */
+        ProcUnmapSubwindows, ProcConfigureWindow, ProcCirculateWindow, ProcGetGeometry, ProcQueryTree,  /* 15 */
+        ProcInternAtom, ProcGetAtomName, ProcChangeProperty, ProcDeleteProperty, ProcGetProperty,       /* 20 */
+        ProcListProperties, ProcSetSelectionOwner, ProcGetSelectionOwner, ProcConvertSelection, ProcSendEvent,  /* 25 */
+        ProcGrabPointer, ProcUngrabPointer, ProcGrabButton, ProcUngrabButton, ProcChangeActivePointerGrab,      /* 30 */
+        ProcGrabKeyboard, ProcUngrabKeyboard, ProcGrabKey, ProcUngrabKey, ProcAllowEvents,      /* 35 */
+        ProcGrabServer, ProcUngrabServer, ProcQueryPointer, ProcGetMotionEvents, ProcTranslateCoords,   /* 40 */
+        ProcWarpPointer, ProcSetInputFocus, ProcGetInputFocus, ProcQueryKeymap, ProcOpenFont,   /* 45 */
+        ProcCloseFont, ProcQueryFont, ProcQueryTextExtents, ProcListFonts, ProcListFontsWithInfo,       /* 50 */
+        ProcSetFontPath, ProcGetFontPath, ProcCreatePixmap, ProcFreePixmap, ProcCreateGC,       /* 55 */
+        ProcChangeGC, ProcCopyGC, ProcSetDashes, ProcSetClipRectangles, ProcFreeGC,     /* 60 */
+        ProcClearToBackground, ProcCopyArea, ProcCopyPlane, ProcPolyPoint, ProcPolyLine,        /* 65 */
+        ProcPolySegment, ProcPolyRectangle, ProcPolyArc, ProcFillPoly, ProcPolyFillRectangle,   /* 70 */
+        ProcPolyFillArc, ProcPutImage, ProcGetImage, ProcPolyText, ProcPolyText,        /* 75 */
+        ProcImageText8, ProcImageText16, ProcCreateColormap, ProcFreeColormap, ProcCopyColormapAndFree, /* 80 */
+        ProcInstallColormap, ProcUninstallColormap, ProcListInstalledColormaps, ProcAllocColor, ProcAllocNamedColor,    /* 85 */
+        ProcAllocColorCells, ProcAllocColorPlanes, ProcFreeColors, ProcStoreColors, ProcStoreNamedColor,        /* 90 */
+        ProcQueryColors, ProcLookupColor, ProcCreateCursor, ProcCreateGlyphCursor, ProcFreeCursor,      /* 95 */
+        ProcRecolorCursor, ProcQueryBestSize, ProcQueryExtension, ProcListExtensions, ProcChangeKeyboardMapping,        /* 100 */
+        ProcGetKeyboardMapping, ProcChangeKeyboardControl, ProcGetKeyboardControl, ProcBell, ProcChangePointerControl,  /* 105 */
+        ProcGetPointerControl, ProcSetScreenSaver, ProcGetScreenSaver, ProcChangeHosts, ProcListHosts,  /* 110 */
+        ProcChangeAccessControl, ProcChangeCloseDownMode, ProcKillClient, ProcRotateProperties, ProcForceScreenSaver,   /* 115 */
+        ProcSetPointerMapping, ProcGetPointerMapping, ProcSetModifierMapping, ProcGetModifierMapping, ProcBadRequest,   /* 120 */
+        ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest, /* 125 */
+ProcBadRequest,
+        ProcNoOperation,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest};
 
-int (* SwappedProcVector[256]) (
-	ClientPtr /* client */
-    ) =
-{
-    ProcBadRequest,
-    SProcCreateWindow,
-    SProcChangeWindowAttributes,
-    SProcResourceReq,			/* GetWindowAttributes */
-    SProcResourceReq,			/* DestroyWindow */
-    SProcResourceReq,			/* 5 DestroySubwindows */
-    SProcResourceReq,			/* SProcChangeSaveSet, */
-    SProcReparentWindow,
-    SProcResourceReq,			/* MapWindow */
-    SProcResourceReq,			/* MapSubwindows */
-    SProcResourceReq,			/* 10 UnmapWindow */
-    SProcResourceReq,			/* UnmapSubwindows */
-    SProcConfigureWindow,
-    SProcResourceReq,			/* SProcCirculateWindow, */
-    SProcResourceReq,			/* GetGeometry */
-    SProcResourceReq,			/* 15 QueryTree */
-    SProcInternAtom,
-    SProcResourceReq,			/* SProcGetAtomName, */
-    SProcChangeProperty,
-    SProcDeleteProperty,
-    SProcGetProperty,			/* 20 */
-    SProcResourceReq,			/* SProcListProperties, */
-    SProcSetSelectionOwner,
-    SProcResourceReq, 			/* SProcGetSelectionOwner, */
-    SProcConvertSelection,
-    SProcSendEvent,			/* 25 */
-    SProcGrabPointer,
-    SProcResourceReq, 			/* SProcUngrabPointer, */
-    SProcGrabButton,
-    SProcUngrabButton,
-    SProcChangeActivePointerGrab,	/* 30 */
-    SProcGrabKeyboard,
-    SProcResourceReq,			/* SProcUngrabKeyboard, */
-    SProcGrabKey,
-    SProcUngrabKey,
-    SProcResourceReq,			/* 35 SProcAllowEvents, */
-    SProcSimpleReq,			/* SProcGrabServer, */
-    SProcSimpleReq,			/* SProcUngrabServer, */
-    SProcResourceReq,			/* SProcQueryPointer, */
-    SProcGetMotionEvents,
-    SProcTranslateCoords,		/*40 */
-    SProcWarpPointer,
-    SProcSetInputFocus,
-    SProcSimpleReq,			/* SProcGetInputFocus, */
-    SProcSimpleReq,			/* QueryKeymap, */
-    SProcOpenFont,			/* 45 */
-    SProcResourceReq,			/* SProcCloseFont, */
-    SProcResourceReq, 			/* SProcQueryFont, */
-    SProcResourceReq,			/* SProcQueryTextExtents,  */
-    SProcListFonts,
-    SProcListFontsWithInfo,		/* 50 */
-    SProcSetFontPath,
-    SProcSimpleReq,			/* GetFontPath, */
-    SProcCreatePixmap,
-    SProcResourceReq,			/* SProcFreePixmap, */
-    SProcCreateGC,			/* 55 */
-    SProcChangeGC,
-    SProcCopyGC,
-    SProcSetDashes,
-    SProcSetClipRectangles,
-    SProcResourceReq,			/* 60 SProcFreeGC, */
-    SProcClearToBackground,
-    SProcCopyArea,
-    SProcCopyPlane,
-    SProcPoly,				/* PolyPoint, */
-    SProcPoly,				/* 65 PolyLine */
-    SProcPoly,				/* PolySegment, */
-    SProcPoly,				/* PolyRectangle, */
-    SProcPoly,				/* PolyArc, */
-    SProcFillPoly,
-    SProcPoly,				/* 70 PolyFillRectangle */
-    SProcPoly,				/* PolyFillArc, */
-    SProcPutImage,
-    SProcGetImage,
-    SProcPolyText,
-    SProcPolyText,			/* 75 */
-    SProcImageText,
-    SProcImageText,
-    SProcCreateColormap,
-    SProcResourceReq,			/* SProcFreeColormap, */
-    SProcCopyColormapAndFree,		/* 80 */
-    SProcResourceReq,			/* SProcInstallColormap, */
-    SProcResourceReq,			/* SProcUninstallColormap, */
-    SProcResourceReq, 			/* SProcListInstalledColormaps, */
-    SProcAllocColor,
-    SProcAllocNamedColor,		/* 85 */
-    SProcAllocColorCells,
-    SProcAllocColorPlanes,
-    SProcFreeColors,
-    SProcStoreColors,
-    SProcStoreNamedColor,		/* 90 */
-    SProcQueryColors,
-    SProcLookupColor,
-    SProcCreateCursor,
-    SProcCreateGlyphCursor,
-    SProcResourceReq,			/* 95 SProcFreeCursor, */
-    SProcRecolorCursor,
-    SProcQueryBestSize,
-    SProcQueryExtension,
-    SProcSimpleReq,			/* ListExtensions, */
-    SProcChangeKeyboardMapping,		/* 100 */
-    SProcSimpleReq,			/* GetKeyboardMapping, */
-    SProcChangeKeyboardControl,
-    SProcSimpleReq,			/* GetKeyboardControl, */
-    SProcSimpleReq,			/* Bell, */
-    SProcChangePointerControl,		/* 105 */
-    SProcSimpleReq,			/* GetPointerControl, */
-    SProcSetScreenSaver,
-    SProcSimpleReq,			/* GetScreenSaver, */
-    SProcChangeHosts,
-    SProcSimpleReq,			/* 110 ListHosts, */
-    SProcSimpleReq,			/* SProcChangeAccessControl, */
-    SProcSimpleReq,			/* SProcChangeCloseDownMode, */
-    SProcResourceReq,			/* SProcKillClient, */
-    SProcRotateProperties,
-    SProcSimpleReq,			/* 115 ForceScreenSaver */
-    SProcSimpleReq,			/* SetPointerMapping, */
-    SProcSimpleReq,			/* GetPointerMapping, */
-    SProcSimpleReq,			/* SetModifierMapping, */
-    SProcSimpleReq,			/* GetModifierMapping, */
-    ProcBadRequest,				/* 120 */
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,				/* 125 */
-    ProcBadRequest,
-    SProcNoOperation,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest,
-    ProcBadRequest
-};
+int (*SwappedProcVector[256]) (ClientPtr        /* client */
+    ) = {
+    ProcBadRequest, SProcCreateWindow, SProcChangeWindowAttributes, SProcResourceReq,   /* GetWindowAttributes */
+        SProcResourceReq,       /* DestroyWindow */
+        SProcResourceReq,       /* 5 DestroySubwindows */
+        SProcResourceReq,       /* SProcChangeSaveSet, */
+        SProcReparentWindow, SProcResourceReq,  /* MapWindow */
+        SProcResourceReq,       /* MapSubwindows */
+        SProcResourceReq,       /* 10 UnmapWindow */
+        SProcResourceReq,       /* UnmapSubwindows */
+        SProcConfigureWindow, SProcResourceReq, /* SProcCirculateWindow, */
+        SProcResourceReq,       /* GetGeometry */
+        SProcResourceReq,       /* 15 QueryTree */
+        SProcInternAtom, SProcResourceReq,      /* SProcGetAtomName, */
+        SProcChangeProperty, SProcDeleteProperty, SProcGetProperty,     /* 20 */
+        SProcResourceReq,       /* SProcListProperties, */
+        SProcSetSelectionOwner, SProcResourceReq,       /* SProcGetSelectionOwner, */
+        SProcConvertSelection, SProcSendEvent,  /* 25 */
+        SProcGrabPointer, SProcResourceReq,     /* SProcUngrabPointer, */
+        SProcGrabButton, SProcUngrabButton, SProcChangeActivePointerGrab,       /* 30 */
+        SProcGrabKeyboard, SProcResourceReq,    /* SProcUngrabKeyboard, */
+        SProcGrabKey, SProcUngrabKey, SProcResourceReq, /* 35 SProcAllowEvents, */
+        SProcSimpleReq,         /* SProcGrabServer, */
+        SProcSimpleReq,         /* SProcUngrabServer, */
+        SProcResourceReq,       /* SProcQueryPointer, */
+        SProcGetMotionEvents, SProcTranslateCoords,     /*40 */
+        SProcWarpPointer, SProcSetInputFocus, SProcSimpleReq,   /* SProcGetInputFocus, */
+        SProcSimpleReq,         /* QueryKeymap, */
+        SProcOpenFont,          /* 45 */
+        SProcResourceReq,       /* SProcCloseFont, */
+        SProcResourceReq,       /* SProcQueryFont, */
+        SProcResourceReq,       /* SProcQueryTextExtents,  */
+        SProcListFonts, SProcListFontsWithInfo, /* 50 */
+        SProcSetFontPath, SProcSimpleReq,       /* GetFontPath, */
+        SProcCreatePixmap, SProcResourceReq,    /* SProcFreePixmap, */
+        SProcCreateGC,          /* 55 */
+        SProcChangeGC, SProcCopyGC, SProcSetDashes, SProcSetClipRectangles, SProcResourceReq,   /* 60 SProcFreeGC, */
+        SProcClearToBackground, SProcCopyArea, SProcCopyPlane, SProcPoly,       /* PolyPoint, */
+        SProcPoly,              /* 65 PolyLine */
+        SProcPoly,              /* PolySegment, */
+        SProcPoly,              /* PolyRectangle, */
+        SProcPoly,              /* PolyArc, */
+        SProcFillPoly, SProcPoly,       /* 70 PolyFillRectangle */
+        SProcPoly,              /* PolyFillArc, */
+        SProcPutImage, SProcGetImage, SProcPolyText, SProcPolyText,     /* 75 */
+        SProcImageText, SProcImageText, SProcCreateColormap, SProcResourceReq,  /* SProcFreeColormap, */
+        SProcCopyColormapAndFree,       /* 80 */
+        SProcResourceReq,       /* SProcInstallColormap, */
+        SProcResourceReq,       /* SProcUninstallColormap, */
+        SProcResourceReq,       /* SProcListInstalledColormaps, */
+        SProcAllocColor, SProcAllocNamedColor,  /* 85 */
+        SProcAllocColorCells, SProcAllocColorPlanes, SProcFreeColors, SProcStoreColors, SProcStoreNamedColor,   /* 90 */
+        SProcQueryColors, SProcLookupColor, SProcCreateCursor, SProcCreateGlyphCursor, SProcResourceReq,        /* 95 SProcFreeCursor, */
+        SProcRecolorCursor, SProcQueryBestSize, SProcQueryExtension, SProcSimpleReq,    /* ListExtensions, */
+        SProcChangeKeyboardMapping,     /* 100 */
+        SProcSimpleReq,         /* GetKeyboardMapping, */
+        SProcChangeKeyboardControl, SProcSimpleReq,     /* GetKeyboardControl, */
+        SProcSimpleReq,         /* Bell, */
+        SProcChangePointerControl,      /* 105 */
+        SProcSimpleReq,         /* GetPointerControl, */
+        SProcSetScreenSaver, SProcSimpleReq,    /* GetScreenSaver, */
+        SProcChangeHosts, SProcSimpleReq,       /* 110 ListHosts, */
+        SProcSimpleReq,         /* SProcChangeAccessControl, */
+        SProcSimpleReq,         /* SProcChangeCloseDownMode, */
+        SProcResourceReq,       /* SProcKillClient, */
+        SProcRotateProperties, SProcSimpleReq,  /* 115 ForceScreenSaver */
+        SProcSimpleReq,         /* SetPointerMapping, */
+        SProcSimpleReq,         /* GetPointerMapping, */
+        SProcSimpleReq,         /* SetModifierMapping, */
+        SProcSimpleReq,         /* GetModifierMapping, */
+        ProcBadRequest,         /* 120 */
+        ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest, /* 125 */
+ProcBadRequest,
+        SProcNoOperation,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest,
+        ProcBadRequest, ProcBadRequest, ProcBadRequest, ProcBadRequest};
 
-EventSwapPtr EventSwapVector[MAXEVENTS] =
-{
-    (EventSwapPtr)SErrorEvent,
+EventSwapPtr EventSwapVector[MAXEVENTS] = {
+    (EventSwapPtr) SErrorEvent,
     NotImplemented,
     SKeyButtonPtrEvent,
     SKeyButtonPtrEvent,
     SKeyButtonPtrEvent,
-    SKeyButtonPtrEvent,			/* 5 */
+    SKeyButtonPtrEvent,         /* 5 */
     SKeyButtonPtrEvent,
     SEnterLeaveEvent,
     SEnterLeaveEvent,
     SFocusEvent,
-    SFocusEvent,			/* 10 */
+    SFocusEvent,                /* 10 */
     SKeymapNotifyEvent,
     SExposeEvent,
     SGraphicsExposureEvent,
     SNoExposureEvent,
-    SVisibilityEvent,			/* 15 */
+    SVisibilityEvent,           /* 15 */
     SCreateNotifyEvent,
     SDestroyNotifyEvent,
     SUnmapNotifyEvent,
     SMapNotifyEvent,
-    SMapRequestEvent,			/* 20 */
+    SMapRequestEvent,           /* 20 */
     SReparentEvent,
     SConfigureNotifyEvent,
     SConfigureRequestEvent,
     SGravityEvent,
-    SResizeRequestEvent,		/* 25 */
+    SResizeRequestEvent,        /* 25 */
     SCirculateEvent,
     SCirculateEvent,
     SPropertyEvent,
     SSelectionClearEvent,
-    SSelectionRequestEvent,		/* 30 */
+    SSelectionRequestEvent,     /* 30 */
     SSelectionNotifyEvent,
     SColormapEvent,
     SClientMessageEvent,
@@ -724,137 +548,135 @@ EventSwapPtr EventSwapVector[MAXEVENTS] =
     NotImplemented
 };
 
-
-ReplySwapPtr ReplySwapVector[256] =
-{
+ReplySwapPtr ReplySwapVector[256] = {
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetWindowAttributesReply,
+    (ReplySwapPtr) SGetWindowAttributesReply,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 5 */
+    ReplyNotSwappd,             /* 5 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 10 */
+    ReplyNotSwappd,             /* 10 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetGeometryReply,
-    (ReplySwapPtr)SQueryTreeReply,		/* 15 */
-    (ReplySwapPtr)SInternAtomReply,
-    (ReplySwapPtr)SGetAtomNameReply,
+    (ReplySwapPtr) SGetGeometryReply,
+    (ReplySwapPtr) SQueryTreeReply,     /* 15 */
+    (ReplySwapPtr) SInternAtomReply,
+    (ReplySwapPtr) SGetAtomNameReply,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetPropertyReply,		/* 20 */
-    (ReplySwapPtr)SListPropertiesReply,
+    (ReplySwapPtr) SGetPropertyReply,   /* 20 */
+    (ReplySwapPtr) SListPropertiesReply,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetSelectionOwnerReply,
+    (ReplySwapPtr) SGetSelectionOwnerReply,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 25 */
-    (ReplySwapPtr)SGenericReply,		/* SGrabPointerReply, */
+    ReplyNotSwappd,             /* 25 */
+    (ReplySwapPtr) SGenericReply,       /* SGrabPointerReply, */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 30 */
-    (ReplySwapPtr)SGenericReply,		/* SGrabKeyboardReply, */
+    ReplyNotSwappd,             /* 30 */
+    (ReplySwapPtr) SGenericReply,       /* SGrabKeyboardReply, */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 35 */
+    ReplyNotSwappd,             /* 35 */
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SQueryPointerReply,
-    (ReplySwapPtr)SGetMotionEventsReply,
-    (ReplySwapPtr)STranslateCoordsReply,	/* 40 */
+    (ReplySwapPtr) SQueryPointerReply,
+    (ReplySwapPtr) SGetMotionEventsReply,
+    (ReplySwapPtr) STranslateCoordsReply,       /* 40 */
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetInputFocusReply,
-    (ReplySwapPtr)SQueryKeymapReply,
-    ReplyNotSwappd,				/* 45 */
+    (ReplySwapPtr) SGetInputFocusReply,
+    (ReplySwapPtr) SQueryKeymapReply,
+    ReplyNotSwappd,             /* 45 */
     ReplyNotSwappd,
-    (ReplySwapPtr)SQueryFontReply,
-    (ReplySwapPtr)SQueryTextExtentsReply,
-    (ReplySwapPtr)SListFontsReply,
-    (ReplySwapPtr)SListFontsWithInfoReply,	/* 50 */
+    (ReplySwapPtr) SQueryFontReply,
+    (ReplySwapPtr) SQueryTextExtentsReply,
+    (ReplySwapPtr) SListFontsReply,
+    (ReplySwapPtr) SListFontsWithInfoReply,     /* 50 */
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetFontPathReply,
+    (ReplySwapPtr) SGetFontPathReply,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 55 */
+    ReplyNotSwappd,             /* 55 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 60 */
+    ReplyNotSwappd,             /* 60 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 65 */
+    ReplyNotSwappd,             /* 65 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 70 */
+    ReplyNotSwappd,             /* 70 */
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetImageReply,
+    (ReplySwapPtr) SGetImageReply,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 75 */
+    ReplyNotSwappd,             /* 75 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 80 */
+    ReplyNotSwappd,             /* 80 */
     ReplyNotSwappd,
     ReplyNotSwappd,
-    (ReplySwapPtr)SListInstalledColormapsReply,
-    (ReplySwapPtr)SAllocColorReply,
-    (ReplySwapPtr)SAllocNamedColorReply,	/* 85 */
-    (ReplySwapPtr)SAllocColorCellsReply,
-    (ReplySwapPtr)SAllocColorPlanesReply,
+    (ReplySwapPtr) SListInstalledColormapsReply,
+    (ReplySwapPtr) SAllocColorReply,
+    (ReplySwapPtr) SAllocNamedColorReply,       /* 85 */
+    (ReplySwapPtr) SAllocColorCellsReply,
+    (ReplySwapPtr) SAllocColorPlanesReply,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 90 */
-    (ReplySwapPtr)SQueryColorsReply,
-    (ReplySwapPtr)SLookupColorReply,
+    ReplyNotSwappd,             /* 90 */
+    (ReplySwapPtr) SQueryColorsReply,
+    (ReplySwapPtr) SLookupColorReply,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 95 */
+    ReplyNotSwappd,             /* 95 */
     ReplyNotSwappd,
-    (ReplySwapPtr)SQueryBestSizeReply,
-    (ReplySwapPtr)SGenericReply,		/* SQueryExtensionReply, */
-    (ReplySwapPtr)SListExtensionsReply,
-    ReplyNotSwappd,				/* 100 */
-    (ReplySwapPtr)SGetKeyboardMappingReply,
+    (ReplySwapPtr) SQueryBestSizeReply,
+    (ReplySwapPtr) SGenericReply,       /* SQueryExtensionReply, */
+    (ReplySwapPtr) SListExtensionsReply,
+    ReplyNotSwappd,             /* 100 */
+    (ReplySwapPtr) SGetKeyboardMappingReply,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetKeyboardControlReply,
+    (ReplySwapPtr) SGetKeyboardControlReply,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 105 */
-    (ReplySwapPtr)SGetPointerControlReply,
+    ReplyNotSwappd,             /* 105 */
+    (ReplySwapPtr) SGetPointerControlReply,
     ReplyNotSwappd,
-    (ReplySwapPtr)SGetScreenSaverReply,
+    (ReplySwapPtr) SGetScreenSaverReply,
     ReplyNotSwappd,
-    (ReplySwapPtr)SListHostsReply,		/* 110 */
+    (ReplySwapPtr) SListHostsReply,     /* 110 */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,
-    ReplyNotSwappd,				/* 115 */
-    (ReplySwapPtr)SGenericReply,		/* SetPointerMapping */
-    (ReplySwapPtr)SGetPointerMappingReply,
-    (ReplySwapPtr)SGenericReply,		/* SetModifierMapping */
-    (ReplySwapPtr)SGetModifierMappingReply,	/* 119 */
-    ReplyNotSwappd,				/* 120 */
-    ReplyNotSwappd,				/* 121 */
-    ReplyNotSwappd,				/* 122 */
-    ReplyNotSwappd,				/* 123 */
-    ReplyNotSwappd,				/* 124 */
-    ReplyNotSwappd,				/* 125 */
-    ReplyNotSwappd,				/* 126 */
-    ReplyNotSwappd,				/* NoOperation */
+    ReplyNotSwappd,             /* 115 */
+    (ReplySwapPtr) SGenericReply,       /* SetPointerMapping */
+    (ReplySwapPtr) SGetPointerMappingReply,
+    (ReplySwapPtr) SGenericReply,       /* SetModifierMapping */
+    (ReplySwapPtr) SGetModifierMappingReply,    /* 119 */
+    ReplyNotSwappd,             /* 120 */
+    ReplyNotSwappd,             /* 121 */
+    ReplyNotSwappd,             /* 122 */
+    ReplyNotSwappd,             /* 123 */
+    ReplyNotSwappd,             /* 124 */
+    ReplyNotSwappd,             /* 125 */
+    ReplyNotSwappd,             /* 126 */
+    ReplyNotSwappd,             /* NoOperation */
     ReplyNotSwappd,
     ReplyNotSwappd,
     ReplyNotSwappd,