4 files changed, 1131 insertions, 680 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 38666a422..3a6549185 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -242,7 +242,6 @@ long	    SmartLastPrint;
 #endif
 
 void        Dispatch(void);
-void        InitProcVectors(void);
 
 static int
 SmartScheduleClient (int *clientReady, int nready)
@@ -3428,25 +3427,6 @@ int ProcNoOperation(ClientPtr client)
     return Success;
 }
 
-void
-InitProcVectors(void)
-{
-    int i;
-    for (i = 0; i<256; i++)
-    {
-	if(!ProcVector[i])
-	{
-            ProcVector[i] = SwappedProcVector[i] = ProcBadRequest;
-	    ReplySwapVector[i] = ReplyNotSwappd;
-	}
-    }
-    for(i = LASTEvent; i < 128; i++)
-    {
-	EventSwapVector[i] = NotImplemented;
-    }
-    
-}
-
 /**********************
  * CloseDownClient
  *
diff --git a/xorg-server/dix/dispatch.h b/xorg-server/dix/dispatch.h
index dd07096af..718684724 100644
--- a/xorg-server/dix/dispatch.h
+++ b/xorg-server/dix/dispatch.h
@@ -1,146 +1,145 @@
-/************************************************************
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        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 the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
-
-********************************************************/
-
-/*
- * This prototypes the dispatch.c module (except for functions declared in
- * global headers), plus related dispatch procedures from devices.c, events.c,
- * extension.c, property.c. 
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef DISPATCH_H
-#define DISPATCH_H 1
-
-DISPATCH_PROC(InitClientPrivates);
-DISPATCH_PROC(ProcAllocColor);
-DISPATCH_PROC(ProcAllocColorCells);
-DISPATCH_PROC(ProcAllocColorPlanes);
-DISPATCH_PROC(ProcAllocNamedColor);
-DISPATCH_PROC(ProcBell);
-DISPATCH_PROC(ProcChangeAccessControl);
-DISPATCH_PROC(ProcChangeCloseDownMode);
-DISPATCH_PROC(ProcChangeGC);
-DISPATCH_PROC(ProcChangeHosts);
-DISPATCH_PROC(ProcChangeKeyboardControl);
-DISPATCH_PROC(ProcChangeKeyboardMapping);
-DISPATCH_PROC(ProcChangePointerControl);
-DISPATCH_PROC(ProcChangeProperty);
-DISPATCH_PROC(ProcChangeSaveSet);
-DISPATCH_PROC(ProcChangeWindowAttributes);
-DISPATCH_PROC(ProcCirculateWindow);
-DISPATCH_PROC(ProcClearToBackground);
-DISPATCH_PROC(ProcCloseFont);
-DISPATCH_PROC(ProcConfigureWindow);
-DISPATCH_PROC(ProcConvertSelection);
-DISPATCH_PROC(ProcCopyArea);
-DISPATCH_PROC(ProcCopyColormapAndFree);
-DISPATCH_PROC(ProcCopyGC);
-DISPATCH_PROC(ProcCopyPlane);
-DISPATCH_PROC(ProcCreateColormap);
-DISPATCH_PROC(ProcCreateCursor);
-DISPATCH_PROC(ProcCreateGC);
-DISPATCH_PROC(ProcCreateGlyphCursor);
-DISPATCH_PROC(ProcCreatePixmap);
-DISPATCH_PROC(ProcCreateWindow);
-DISPATCH_PROC(ProcDeleteProperty);
-DISPATCH_PROC(ProcDestroySubwindows);
-DISPATCH_PROC(ProcDestroyWindow);
-DISPATCH_PROC(ProcEstablishConnection);
-DISPATCH_PROC(ProcFillPoly);
-DISPATCH_PROC(ProcForceScreenSaver);
-DISPATCH_PROC(ProcFreeColormap);
-DISPATCH_PROC(ProcFreeColors);
-DISPATCH_PROC(ProcFreeCursor);
-DISPATCH_PROC(ProcFreeGC);
-DISPATCH_PROC(ProcFreePixmap);
-DISPATCH_PROC(ProcGetAtomName);
-DISPATCH_PROC(ProcGetFontPath);
-DISPATCH_PROC(ProcGetGeometry);
-DISPATCH_PROC(ProcGetImage);
-DISPATCH_PROC(ProcGetKeyboardControl);
-DISPATCH_PROC(ProcGetKeyboardMapping);
-DISPATCH_PROC(ProcGetModifierMapping);
-DISPATCH_PROC(ProcGetMotionEvents);
-DISPATCH_PROC(ProcGetPointerControl);
-DISPATCH_PROC(ProcGetPointerMapping);
-DISPATCH_PROC(ProcGetProperty);
-DISPATCH_PROC(ProcGetScreenSaver);
-DISPATCH_PROC(ProcGetSelectionOwner);
-DISPATCH_PROC(ProcGetWindowAttributes);
-DISPATCH_PROC(ProcGrabServer);
-DISPATCH_PROC(ProcImageText16);
-DISPATCH_PROC(ProcImageText8);
-DISPATCH_PROC(ProcInitialConnection);
-DISPATCH_PROC(ProcInstallColormap);
-DISPATCH_PROC(ProcInternAtom);
-DISPATCH_PROC(ProcKillClient);
-DISPATCH_PROC(ProcListExtensions);
-DISPATCH_PROC(ProcListFonts);
-DISPATCH_PROC(ProcListFontsWithInfo);
-DISPATCH_PROC(ProcListHosts);
-DISPATCH_PROC(ProcListInstalledColormaps);
-DISPATCH_PROC(ProcListProperties);
-DISPATCH_PROC(ProcLookupColor);
-DISPATCH_PROC(ProcMapSubwindows);
-DISPATCH_PROC(ProcMapWindow);
-DISPATCH_PROC(ProcNoOperation);
-DISPATCH_PROC(ProcOpenFont);
-DISPATCH_PROC(ProcPolyArc);
-DISPATCH_PROC(ProcPolyFillArc);
-DISPATCH_PROC(ProcPolyFillRectangle);
-DISPATCH_PROC(ProcPolyLine);
-DISPATCH_PROC(ProcPolyPoint);
-DISPATCH_PROC(ProcPolyRectangle);
-DISPATCH_PROC(ProcPolySegment);
-DISPATCH_PROC(ProcPolyText);
-DISPATCH_PROC(ProcPutImage);
-DISPATCH_PROC(ProcQueryBestSize);
-DISPATCH_PROC(ProcQueryColors);
-DISPATCH_PROC(ProcQueryExtension);
-DISPATCH_PROC(ProcQueryFont);
-DISPATCH_PROC(ProcQueryKeymap);
-DISPATCH_PROC(ProcQueryTextExtents);
-DISPATCH_PROC(ProcQueryTree);
-DISPATCH_PROC(ProcReparentWindow);
-DISPATCH_PROC(ProcRotateProperties);
-DISPATCH_PROC(ProcSetClipRectangles);
-DISPATCH_PROC(ProcSetDashes);
-DISPATCH_PROC(ProcSetFontPath);
-DISPATCH_PROC(ProcSetModifierMapping);
-DISPATCH_PROC(ProcSetPointerMapping);
-DISPATCH_PROC(ProcSetScreenSaver);
-DISPATCH_PROC(ProcSetSelectionOwner);
-DISPATCH_PROC(ProcStoreColors);
-DISPATCH_PROC(ProcStoreNamedColor);
-DISPATCH_PROC(ProcTranslateCoords);
-DISPATCH_PROC(ProcUngrabServer);
-DISPATCH_PROC(ProcUninstallColormap);
-DISPATCH_PROC(ProcUnmapSubwindows);
-DISPATCH_PROC(ProcUnmapWindow);
-
-#endif /* DISPATCH_H */
+/************************************************************
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        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 the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
+
+********************************************************/
+
+/*
+ * This prototypes the dispatch.c module (except for functions declared in
+ * global headers), plus related dispatch procedures from devices.c, events.c,
+ * extension.c, property.c. 
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifndef DISPATCH_H
+#define DISPATCH_H 1
+
+int ProcAllocColor(ClientPtr /* client */);
+int ProcAllocColorCells(ClientPtr /* client */);
+int ProcAllocColorPlanes(ClientPtr /* client */);
+int ProcAllocNamedColor(ClientPtr /* client */);
+int ProcBell(ClientPtr /* client */);
+int ProcChangeAccessControl(ClientPtr /* client */);
+int ProcChangeCloseDownMode(ClientPtr /* client */);
+int ProcChangeGC(ClientPtr /* client */);
+int ProcChangeHosts(ClientPtr /* client */);
+int ProcChangeKeyboardControl(ClientPtr /* client */);
+int ProcChangeKeyboardMapping(ClientPtr /* client */);
+int ProcChangePointerControl(ClientPtr /* client */);
+int ProcChangeProperty(ClientPtr /* client */);
+int ProcChangeSaveSet(ClientPtr /* client */);
+int ProcChangeWindowAttributes(ClientPtr /* client */);
+int ProcCirculateWindow(ClientPtr /* client */);
+int ProcClearToBackground(ClientPtr /* client */);
+int ProcCloseFont(ClientPtr /* client */);
+int ProcConfigureWindow(ClientPtr /* client */);
+int ProcConvertSelection(ClientPtr /* client */);
+int ProcCopyArea(ClientPtr /* client */);
+int ProcCopyColormapAndFree(ClientPtr /* client */);
+int ProcCopyGC(ClientPtr /* client */);
+int ProcCopyPlane(ClientPtr /* client */);
+int ProcCreateColormap(ClientPtr /* client */);
+int ProcCreateCursor(ClientPtr /* client */);
+int ProcCreateGC(ClientPtr /* client */);
+int ProcCreateGlyphCursor(ClientPtr /* client */);
+int ProcCreatePixmap(ClientPtr /* client */);
+int ProcCreateWindow(ClientPtr /* client */);
+int ProcDeleteProperty(ClientPtr /* client */);
+int ProcDestroySubwindows(ClientPtr /* client */);
+int ProcDestroyWindow(ClientPtr /* client */);
+int ProcEstablishConnection(ClientPtr /* client */);
+int ProcFillPoly(ClientPtr /* client */);
+int ProcForceScreenSaver(ClientPtr /* client */);
+int ProcFreeColormap(ClientPtr /* client */);
+int ProcFreeColors(ClientPtr /* client */);
+int ProcFreeCursor(ClientPtr /* client */);
+int ProcFreeGC(ClientPtr /* client */);
+int ProcFreePixmap(ClientPtr /* client */);
+int ProcGetAtomName(ClientPtr /* client */);
+int ProcGetFontPath(ClientPtr /* client */);
+int ProcGetGeometry(ClientPtr /* client */);
+int ProcGetImage(ClientPtr /* client */);
+int ProcGetKeyboardControl(ClientPtr /* client */);
+int ProcGetKeyboardMapping(ClientPtr /* client */);
+int ProcGetModifierMapping(ClientPtr /* client */);
+int ProcGetMotionEvents(ClientPtr /* client */);
+int ProcGetPointerControl(ClientPtr /* client */);
+int ProcGetPointerMapping(ClientPtr /* client */);
+int ProcGetProperty(ClientPtr /* client */);
+int ProcGetScreenSaver(ClientPtr /* client */);
+int ProcGetSelectionOwner(ClientPtr /* client */);
+int ProcGetWindowAttributes(ClientPtr /* client */);
+int ProcGrabServer(ClientPtr /* client */);
+int ProcImageText16(ClientPtr /* client */);
+int ProcImageText8(ClientPtr /* client */);
+int ProcInitialConnection(ClientPtr /* client */);
+int ProcInstallColormap(ClientPtr /* client */);
+int ProcInternAtom(ClientPtr /* client */);
+int ProcKillClient(ClientPtr /* client */);
+int ProcListExtensions(ClientPtr /* client */);
+int ProcListFonts(ClientPtr /* client */);
+int ProcListFontsWithInfo(ClientPtr /* client */);
+int ProcListHosts(ClientPtr /* client */);
+int ProcListInstalledColormaps(ClientPtr /* client */);
+int ProcListProperties(ClientPtr /* client */);
+int ProcLookupColor(ClientPtr /* client */);
+int ProcMapSubwindows(ClientPtr /* client */);
+int ProcMapWindow(ClientPtr /* client */);
+int ProcNoOperation(ClientPtr /* client */);
+int ProcOpenFont(ClientPtr /* client */);
+int ProcPolyArc(ClientPtr /* client */);
+int ProcPolyFillArc(ClientPtr /* client */);
+int ProcPolyFillRectangle(ClientPtr /* client */);
+int ProcPolyLine(ClientPtr /* client */);
+int ProcPolyPoint(ClientPtr /* client */);
+int ProcPolyRectangle(ClientPtr /* client */);
+int ProcPolySegment(ClientPtr /* client */);
+int ProcPolyText(ClientPtr /* client */);
+int ProcPutImage(ClientPtr /* client */);
+int ProcQueryBestSize(ClientPtr /* client */);
+int ProcQueryColors(ClientPtr /* client */);
+int ProcQueryExtension(ClientPtr /* client */);
+int ProcQueryFont(ClientPtr /* client */);
+int ProcQueryKeymap(ClientPtr /* client */);
+int ProcQueryTextExtents(ClientPtr /* client */);
+int ProcQueryTree(ClientPtr /* client */);
+int ProcReparentWindow(ClientPtr /* client */);
+int ProcRotateProperties(ClientPtr /* client */);
+int ProcSetClipRectangles(ClientPtr /* client */);
+int ProcSetDashes(ClientPtr /* client */);
+int ProcSetFontPath(ClientPtr /* client */);
+int ProcSetModifierMapping(ClientPtr /* client */);
+int ProcSetPointerMapping(ClientPtr /* client */);
+int ProcSetScreenSaver(ClientPtr /* client */);
+int ProcSetSelectionOwner(ClientPtr /* client */);
+int ProcStoreColors(ClientPtr /* client */);
+int ProcStoreNamedColor(ClientPtr /* client */);
+int ProcTranslateCoords(ClientPtr /* client */);
+int ProcUngrabServer(ClientPtr /* client */);
+int ProcUninstallColormap(ClientPtr /* client */);
+int ProcUnmapSubwindows(ClientPtr /* client */);
+int ProcUnmapWindow(ClientPtr /* client */);
+
+#endif /* DISPATCH_H */
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 4c81c4d1b..169147112 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -108,7 +108,6 @@ Equipment Corporation.
 #include "panoramiXsrv.h"
 #else
 #include "dixevents.h"		/* InitEvents() */
-#include "dispatch.h"		/* InitProcVectors() */
 #endif
 
 #ifdef DPMSExtension
@@ -122,8 +121,6 @@ Equipment Corporation.
 
 extern void Dispatch(void);
 
-extern void InitProcVectors(void);
-
 #ifdef XQUARTZ
 #include <pthread.h>
 
@@ -215,7 +212,6 @@ int main(int argc, char *argv[], char *envp[])
 	if(serverGeneration == 1)
 	{
 	    CreateWellKnownSockets();
-	    InitProcVectors();
 	    for (i=1; i<MAXCLIENTS; i++)
 		clients[i] = NullClient;
 	    serverClient = calloc(sizeof(ClientRec), 1);
diff --git a/xorg-server/dix/tables.c b/xorg-server/dix/tables.c
index 5aafb8b0f..a11423187 100644
--- a/xorg-server/dix/tables.c
+++ b/xorg-server/dix/tables.c
@@ -1,510 +1,986 @@
-/***********************************************************
-
-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.
-
-******************************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "windowstr.h"
-#include "extnsionst.h"
-#include "dixstruct.h"
-#include "dixevents.h"
-#include "dispatch.h"
-#include "swaprep.h"
-#include "swapreq.h"
-
-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,
-    0,					/* 120 */
-    0,
-    0,
-    0,
-    0,
-    0,					/* 125 */
-    0,
-    ProcNoOperation    
-};
-
-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, */
-    0,					/* 120 */
-    0,
-    0,
-    0,
-    0,
-    0,					/* 125 */
-    0,
-    SProcNoOperation
-};
-
-EventSwapPtr EventSwapVector[128] =
-{
-    (EventSwapPtr)SErrorEvent,
-    NotImplemented,
-    SKeyButtonPtrEvent,
-    SKeyButtonPtrEvent,
-    SKeyButtonPtrEvent,
-    SKeyButtonPtrEvent,			/* 5 */
-    SKeyButtonPtrEvent,
-    SEnterLeaveEvent,
-    SEnterLeaveEvent,
-    SFocusEvent,
-    SFocusEvent,			/* 10 */
-    SKeymapNotifyEvent,
-    SExposeEvent,
-    SGraphicsExposureEvent,
-    SNoExposureEvent,
-    SVisibilityEvent,			/* 15 */
-    SCreateNotifyEvent,
-    SDestroyNotifyEvent,
-    SUnmapNotifyEvent,
-    SMapNotifyEvent,
-    SMapRequestEvent,			/* 20 */
-    SReparentEvent,
-    SConfigureNotifyEvent,
-    SConfigureRequestEvent,
-    SGravityEvent,
-    SResizeRequestEvent,		/* 25 */
-    SCirculateEvent,
-    SCirculateEvent,
-    SPropertyEvent,
-    SSelectionClearEvent,
-    SSelectionRequestEvent,		/* 30 */
-    SSelectionNotifyEvent,
-    SColormapEvent,
-    SClientMessageEvent,
-    SMappingEvent,
-};
-
-
-ReplySwapPtr ReplySwapVector[256] =
-{
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetWindowAttributesReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 5 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 10 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetGeometryReply,
-    (ReplySwapPtr)SQueryTreeReply,		/* 15 */
-    (ReplySwapPtr)SInternAtomReply,
-    (ReplySwapPtr)SGetAtomNameReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetPropertyReply,		/* 20 */
-    (ReplySwapPtr)SListPropertiesReply,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetSelectionOwnerReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 25 */
-    (ReplySwapPtr)SGenericReply,		/* SGrabPointerReply, */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 30 */
-    (ReplySwapPtr)SGenericReply,		/* SGrabKeyboardReply, */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 35 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SQueryPointerReply,
-    (ReplySwapPtr)SGetMotionEventsReply,
-    (ReplySwapPtr)STranslateCoordsReply,	/* 40 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetInputFocusReply,
-    (ReplySwapPtr)SQueryKeymapReply,
-    ReplyNotSwappd,				/* 45 */
-    ReplyNotSwappd,
-    (ReplySwapPtr)SQueryFontReply,
-    (ReplySwapPtr)SQueryTextExtentsReply,
-    (ReplySwapPtr)SListFontsReply,
-    (ReplySwapPtr)SListFontsWithInfoReply,	/* 50 */
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetFontPathReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 55 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 60 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 65 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 70 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetImageReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 75 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 80 */
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SListInstalledColormapsReply,
-    (ReplySwapPtr)SAllocColorReply,
-    (ReplySwapPtr)SAllocNamedColorReply,	/* 85 */
-    (ReplySwapPtr)SAllocColorCellsReply,
-    (ReplySwapPtr)SAllocColorPlanesReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 90 */
-    (ReplySwapPtr)SQueryColorsReply,
-    (ReplySwapPtr)SLookupColorReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 95 */
-    ReplyNotSwappd,
-    (ReplySwapPtr)SQueryBestSizeReply,
-    (ReplySwapPtr)SGenericReply,		/* SQueryExtensionReply, */
-    (ReplySwapPtr)SListExtensionsReply,
-    ReplyNotSwappd,				/* 100 */
-    (ReplySwapPtr)SGetKeyboardMappingReply,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetKeyboardControlReply,
-    ReplyNotSwappd,
-    ReplyNotSwappd,				/* 105 */
-    (ReplySwapPtr)SGetPointerControlReply,
-    ReplyNotSwappd,
-    (ReplySwapPtr)SGetScreenSaverReply,
-    ReplyNotSwappd,
-    (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
-};
+/***********************************************************
+
+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.
+
+******************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "windowstr.h"
+#include "extnsionst.h"
+#include "dixstruct.h"
+#include "dixevents.h"
+#include "dispatch.h"
+#include "swaprep.h"
+#include "swapreq.h"
+
+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 (* 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[128] =
+{
+    (EventSwapPtr)SErrorEvent,
+    NotImplemented,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,			/* 5 */
+    SKeyButtonPtrEvent,
+    SEnterLeaveEvent,
+    SEnterLeaveEvent,
+    SFocusEvent,
+    SFocusEvent,			/* 10 */
+    SKeymapNotifyEvent,
+    SExposeEvent,
+    SGraphicsExposureEvent,
+    SNoExposureEvent,
+    SVisibilityEvent,			/* 15 */
+    SCreateNotifyEvent,
+    SDestroyNotifyEvent,
+    SUnmapNotifyEvent,
+    SMapNotifyEvent,
+    SMapRequestEvent,			/* 20 */
+    SReparentEvent,
+    SConfigureNotifyEvent,
+    SConfigureRequestEvent,
+    SGravityEvent,
+    SResizeRequestEvent,		/* 25 */
+    SCirculateEvent,
+    SCirculateEvent,
+    SPropertyEvent,
+    SSelectionClearEvent,
+    SSelectionRequestEvent,		/* 30 */
+    SSelectionNotifyEvent,
+    SColormapEvent,
+    SClientMessageEvent,
+    SMappingEvent,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented
+};
+
+
+ReplySwapPtr ReplySwapVector[256] =
+{
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetWindowAttributesReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 5 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 10 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetGeometryReply,
+    (ReplySwapPtr)SQueryTreeReply,		/* 15 */
+    (ReplySwapPtr)SInternAtomReply,
+    (ReplySwapPtr)SGetAtomNameReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetPropertyReply,		/* 20 */
+    (ReplySwapPtr)SListPropertiesReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetSelectionOwnerReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 25 */
+    (ReplySwapPtr)SGenericReply,		/* SGrabPointerReply, */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 30 */
+    (ReplySwapPtr)SGenericReply,		/* SGrabKeyboardReply, */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 35 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryPointerReply,
+    (ReplySwapPtr)SGetMotionEventsReply,
+    (ReplySwapPtr)STranslateCoordsReply,	/* 40 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetInputFocusReply,
+    (ReplySwapPtr)SQueryKeymapReply,
+    ReplyNotSwappd,				/* 45 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryFontReply,
+    (ReplySwapPtr)SQueryTextExtentsReply,
+    (ReplySwapPtr)SListFontsReply,
+    (ReplySwapPtr)SListFontsWithInfoReply,	/* 50 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetFontPathReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 55 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 60 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 65 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 70 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetImageReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 75 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 80 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SListInstalledColormapsReply,
+    (ReplySwapPtr)SAllocColorReply,
+    (ReplySwapPtr)SAllocNamedColorReply,	/* 85 */
+    (ReplySwapPtr)SAllocColorCellsReply,
+    (ReplySwapPtr)SAllocColorPlanesReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 90 */
+    (ReplySwapPtr)SQueryColorsReply,
+    (ReplySwapPtr)SLookupColorReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 95 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryBestSizeReply,
+    (ReplySwapPtr)SGenericReply,		/* SQueryExtensionReply, */
+    (ReplySwapPtr)SListExtensionsReply,
+    ReplyNotSwappd,				/* 100 */
+    (ReplySwapPtr)SGetKeyboardMappingReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetKeyboardControlReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 105 */
+    (ReplySwapPtr)SGetPointerControlReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetScreenSaverReply,
+    ReplyNotSwappd,
+    (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,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd
+};