Convert to X.Org standard indentation & cleanup whitespace

Performed with util/modular/x-indent-all.sh, followed by manual fixups

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 2973 insertions, 3269 deletions

diff --git a/print11.c b/print11.c
index 400ec20..e7da143 100644
--- a/print11.c
+++ b/print11.c
@@ -1,8 +1,8 @@
-/* ************************************************** *
- *						      *
- *  Request, Reply, Event, Error Printing	      *
- *						      *
- *	James Peterson, 1988			      *
+/*
+ *  Request, Reply, Event, Error Printing
+ *
+ *	James Peterson, 1988
+ *
  * Copyright (C) 1988 MCC
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +22,9 @@
  * 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.
- *						      *
+ *
+ */
+/*
  * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -44,7 +46,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * ************************************************** */
+ */
 
 #include "scope.h"
 #include "x11.h"
@@ -90,89 +92,86 @@ static void ListFontsWithInfoReply2(const unsigned char *buf);
 /* ************************************************************ */
 
 void
-PrintSetUpMessage (
-    const unsigned char *buf)
+PrintSetUpMessage(const unsigned char *buf)
 {
-  short   n;
-  short   d;
+    short n;
+    short d;
 
-  enterprocedure("PrintSetUpMessage");
-  if (Verbose < 1)
-    return;
-  SetIndentLevel(PRINTCLIENT);
-  PrintField(buf, 0, 1, BYTEMODE, "byte-order");
-  PrintField(buf, 2, 2, CARD16, "major-version");
-  PrintField(buf, 4, 2, CARD16, "minor-version");
-  printfield(buf, 6, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[6]);
-  printfield(buf, 8, 2, DVALUE2(d), "length of data");
-  d = IShort(&buf[8]);
-  PrintString8(&buf[12], n, "authorization-protocol-name");
-  PrintString8(&buf[pad((long)(12 + n))], d, "authorization-protocol-data");
+    enterprocedure("PrintSetUpMessage");
+    if (Verbose < 1)
+        return;
+    SetIndentLevel(PRINTCLIENT);
+    PrintField(buf, 0, 1, BYTEMODE, "byte-order");
+    PrintField(buf, 2, 2, CARD16, "major-version");
+    PrintField(buf, 4, 2, CARD16, "minor-version");
+    printfield(buf, 6, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[6]);
+    printfield(buf, 8, 2, DVALUE2(d), "length of data");
+    d = IShort(&buf[8]);
+    PrintString8(&buf[12], n, "authorization-protocol-name");
+    PrintString8(&buf[pad((long) (12 + n))], d, "authorization-protocol-data");
 }
 
 void
-PrintSetUpReply (
-    const unsigned char *buf)
+PrintSetUpReply(const unsigned char *buf)
 {
-  enterprocedure("PrintSetUpReply");
-  SetIndentLevel(PRINTSERVER);
-  if (IByte(&buf[0]))
-    PrintSuccessfulSetUpReply(buf);
-  else
-    PrintFailedSetUpReply(buf);
+    enterprocedure("PrintSetUpReply");
+    SetIndentLevel(PRINTSERVER);
+    if (IByte(&buf[0]))
+        PrintSuccessfulSetUpReply(buf);
+    else
+        PrintFailedSetUpReply(buf);
 }
 
 static void
-PrintFailedSetUpReply (
-    const unsigned char *buf)
+PrintFailedSetUpReply(const unsigned char *buf)
 {
-  short   n;
+    short n;
 
-  PrintField(buf, 0, 1, 0, "SetUp Failed");
-  if (Verbose < 1)
-    return;
-  printfield(buf, 1, 1, DVALUE1(n), "length of reason in bytes");
-  n = IByte(&buf[1]);
-  PrintField(buf, 2, 2, CARD16, "major-version");
-  PrintField(buf, 4, 2, CARD16, "minor-version");
-  printfield(buf, 6, 2, DVALUE2((n + p) / 4), "length of data");
-  PrintString8(&buf[8], n, "reason");
+    PrintField(buf, 0, 1, 0, "SetUp Failed");
+    if (Verbose < 1)
+        return;
+    printfield(buf, 1, 1, DVALUE1(n), "length of reason in bytes");
+    n = IByte(&buf[1]);
+    PrintField(buf, 2, 2, CARD16, "major-version");
+    PrintField(buf, 4, 2, CARD16, "minor-version");
+    printfield(buf, 6, 2, DVALUE2((n + p) / 4), "length of data");
+    PrintString8(&buf[8], n, "reason");
 }
 
 static void
-PrintSuccessfulSetUpReply (
-    const unsigned char *buf)
-{
-  short   v;
-  short   n;
-  short   m;
-
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 2, 2, CARD16, "protocol-major-version");
-  PrintField(buf, 4, 2, CARD16, "protocol-minor-version");
-  printfield(buf, 6, 2, DVALUE2(8 + 2*n + (v + p + m) / 4), "length of data");
-  PrintField(buf, 8, 4, CARD32, "release-number");
-  PrintField(buf, 12, 4, CARD32, "resource-id-base");
-  PrintField(buf, 16, 4, CARD32, "resource-id-mask");
-  PrintField(buf, 20, 4, CARD32, "motion-buffer-size");
-  printfield(buf, 24, 2, DVALUE2(v), "length of vendor");
-  v = IShort(&buf[24]);
-  printfield(buf, 26, 2, CARD16, "maximum-request-length");
-  printfield(buf, 28, 1, CARD8, "number of roots");
-  m = IByte(&buf[28]);
-  printfield(buf, 29, 1, DVALUE1(n), "number of pixmap-formats");
-  n = IByte(&buf[29]);
-  PrintField(buf, 30, 1, BYTEORDER, "image-byte-order");
-  PrintField(buf, 31, 1, BYTEORDER, "bitmap-format-bit-order");
-  PrintField(buf, 32, 1, CARD8, "bitmap-format-scanline-unit");
-  PrintField(buf, 33, 1, CARD8, "bitmap-format-scanline-pad");
-  PrintField(buf, 34, 1, KEYCODE, "min-keycode");
-  PrintField(buf, 35, 1, KEYCODE, "max-keycode");
-  PrintString8(&buf[40], v, "vendor");
-  PrintList(&buf[pad((long)(40 + v))], (long)n, FORMAT, "pixmap-formats");
-  PrintList(&buf[pad((long)(40 + v) + 8 * n)], (long)m, SCREEN, "roots");
+PrintSuccessfulSetUpReply(const unsigned char *buf)
+{
+    short v;
+    short n;
+    short m;
+
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 2, 2, CARD16, "protocol-major-version");
+    PrintField(buf, 4, 2, CARD16, "protocol-minor-version");
+    printfield(buf, 6, 2, DVALUE2(8 + 2 * n + (v + p + m) / 4),
+               "length of data");
+    PrintField(buf, 8, 4, CARD32, "release-number");
+    PrintField(buf, 12, 4, CARD32, "resource-id-base");
+    PrintField(buf, 16, 4, CARD32, "resource-id-mask");
+    PrintField(buf, 20, 4, CARD32, "motion-buffer-size");
+    printfield(buf, 24, 2, DVALUE2(v), "length of vendor");
+    v = IShort(&buf[24]);
+    printfield(buf, 26, 2, CARD16, "maximum-request-length");
+    printfield(buf, 28, 1, CARD8, "number of roots");
+    m = IByte(&buf[28]);
+    printfield(buf, 29, 1, DVALUE1(n), "number of pixmap-formats");
+    n = IByte(&buf[29]);
+    PrintField(buf, 30, 1, BYTEORDER, "image-byte-order");
+    PrintField(buf, 31, 1, BYTEORDER, "bitmap-format-bit-order");
+    PrintField(buf, 32, 1, CARD8, "bitmap-format-scanline-unit");
+    PrintField(buf, 33, 1, CARD8, "bitmap-format-scanline-pad");
+    PrintField(buf, 34, 1, KEYCODE, "min-keycode");
+    PrintField(buf, 35, 1, KEYCODE, "max-keycode");
+    PrintString8(&buf[40], v, "vendor");
+    PrintList(&buf[pad((long) (40 + v))], (long) n, FORMAT, "pixmap-formats");
+    PrintList(&buf[pad((long) (40 + v) + 8 * n)], (long) m, SCREEN, "roots");
 }
 
 /* ************************************************************ */
@@ -194,230 +193,212 @@ const char REPLYHEADER[] = "..............REPLY";
 /* Error Printing procedures */
 
 void
-RequestError (
-    const unsigned char *buf)
+RequestError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Request */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-ValueError (
-    const unsigned char *buf)
+ValueError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Value */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, INT32, "bad value");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Value */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, INT32, "bad value");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-WindowError (
-    const unsigned char *buf)
+WindowError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Window */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Window */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-PixmapError (
-    const unsigned char *buf)
+PixmapError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Pixmap */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Pixmap */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-AtomError (
-    const unsigned char *buf)
+AtomError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Atom */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad atom id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Atom */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad atom id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-CursorError (
-    const unsigned char *buf)
+CursorError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Cursor */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Cursor */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-FontError (
-    const unsigned char *buf)
+FontError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Font */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Font */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-MatchError (
-    const unsigned char *buf)
+MatchError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Match */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Match */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-DrawableError (
-    const unsigned char *buf)
+DrawableError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Drawable */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Drawable */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-AccessError (
-    const unsigned char *buf)
+AccessError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Access */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Access */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-AllocError (
-    const unsigned char *buf)
+AllocError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Alloc */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Alloc */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-ColormapError (
-    const unsigned char *buf)
+ColormapError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Colormap */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Colormap */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-GContextError (
-    const unsigned char *buf)
+GContextError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* GContext */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* GContext */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-IDChoiceError (
-    const unsigned char *buf)
+IDChoiceError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* IDChoice */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* IDChoice */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-NameError (
-    const unsigned char *buf)
+NameError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Name */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Name */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-LengthError (
-    const unsigned char *buf)
+LengthError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Length */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Length */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-ImplementationError (
-    const unsigned char *buf)
+ImplementationError(const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Implementation */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(buf, 1, 1, ERROR, ERRORHEADER); /* Implementation */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 void
-UnknownError (
-    const unsigned char *buf)
+UnknownError(const unsigned char *buf)
 {
-  PrintField(RBf, 1, 1, ERROR, ERRORHEADER);
-  if (Verbose < 1)
-    return;
-  printfield (buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, CARD32, "bad resource id");
-  PrintField(buf, 8, 2, CARD16, "minor opcode");
-  PrintField(buf, 10, 1, CARD8, "major opcode");
+    PrintField(RBf, 1, 1, ERROR, ERRORHEADER);
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, CARD32, "bad resource id");
+    PrintField(buf, 8, 2, CARD16, "minor opcode");
+    PrintField(buf, 10, 1, CARD8, "major opcode");
 }
 
 /* ************************************************************ */
@@ -428,552 +409,518 @@ UnknownError (
 /* Event Printing procedures */
 
 void
-KeyPressEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeyPress */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, KEYCODE, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BOOL, "same-screen");
-}
-
-void
-KeyReleaseEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeyRelease */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, KEYCODE, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BOOL, "same-screen");
-}
-
-void
-ButtonPressEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ButtonPress */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, BUTTON, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BOOL, "same-screen");
-}
-
-void
-ButtonReleaseEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ButtonRelease */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, BUTTON, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BOOL, "same-screen");
-}
-
-void
-MotionNotifyEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MotionNotify */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, MOTIONDETAIL, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BOOL, "same-screen");
-}
-
-void
-EnterNotifyEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* EnterNotify */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, ENTERDETAIL, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BUTTONMODE, "mode");
-  PrintField(buf, 31, 1, SCREENFOCUS, "same-screen, focus");
-}
-
-void
-LeaveNotifyEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* LeaveNotify */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, ENTERDETAIL, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "event");
-  PrintField(buf, 16, 4, WINDOW, "child");
-  PrintField(buf, 20, 2, INT16, "root-x");
-  PrintField(buf, 22, 2, INT16, "root-y");
-  PrintField(buf, 24, 2, INT16, "event-x");
-  PrintField(buf, 26, 2, INT16, "event-y");
-  PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
-  PrintField(buf, 30, 1, BUTTONMODE, "mode");
-  PrintField(buf, 31, 1, SCREENFOCUS, "same-screen, focus");
-}
-
-void
-FocusInEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* FocusIn */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, ENTERDETAIL, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 1, BUTTONMODE, "mode");
-}
+KeyPressEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* KeyPress */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, KEYCODE, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BOOL, "same-screen");
+}
+
+void
+KeyReleaseEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* KeyRelease */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, KEYCODE, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BOOL, "same-screen");
+}
+
+void
+ButtonPressEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ButtonPress */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, BUTTON, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BOOL, "same-screen");
+}
+
+void
+ButtonReleaseEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ButtonRelease */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, BUTTON, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BOOL, "same-screen");
+}
+
+void
+MotionNotifyEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* MotionNotify */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, MOTIONDETAIL, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BOOL, "same-screen");
+}
+
+void
+EnterNotifyEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* EnterNotify */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, ENTERDETAIL, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BUTTONMODE, "mode");
+    PrintField(buf, 31, 1, SCREENFOCUS, "same-screen, focus");
+}
+
+void
+LeaveNotifyEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* LeaveNotify */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, ENTERDETAIL, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "event");
+    PrintField(buf, 16, 4, WINDOW, "child");
+    PrintField(buf, 20, 2, INT16, "root-x");
+    PrintField(buf, 22, 2, INT16, "root-y");
+    PrintField(buf, 24, 2, INT16, "event-x");
+    PrintField(buf, 26, 2, INT16, "event-y");
+    PrintField(buf, 28, 2, SETofKEYBUTMASK, "state");
+    PrintField(buf, 30, 1, BUTTONMODE, "mode");
+    PrintField(buf, 31, 1, SCREENFOCUS, "same-screen, focus");
+}
+
+void
+FocusInEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* FocusIn */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, ENTERDETAIL, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 1, BUTTONMODE, "mode");
+}
 
 void
-FocusOutEvent (
-    const unsigned char *buf)
-{
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* FocusOut */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, ENTERDETAIL, "detail");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 1, BUTTONMODE, "mode");
+FocusOutEvent(const unsigned char *buf)
+{
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* FocusOut */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, ENTERDETAIL, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 1, BUTTONMODE, "mode");
 }
 
 void
-KeymapNotifyEvent (
-    const unsigned char *buf)
+KeymapNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeymapNotify */ ;
-  if (Verbose < 1)
-    return;
-  PrintBytes(&buf[1], (long)31,"keys");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* KeymapNotify */
+    if (Verbose < 1)
+        return;
+    PrintBytes(&buf[1], (long) 31, "keys");
 }
 
 void
-ExposeEvent (
-    const unsigned char *buf)
+ExposeEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* Expose */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 2, CARD16, "x");
-  PrintField(buf, 10, 2, CARD16, "y");
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-  PrintField(buf, 16, 2, CARD16, "count");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* Expose */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 2, CARD16, "x");
+    PrintField(buf, 10, 2, CARD16, "y");
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
+    PrintField(buf, 16, 2, CARD16, "count");
 }
 
 void
-GraphicsExposureEvent (
-    const unsigned char *buf)
+GraphicsExposureEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* GraphicsExposure */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 2, CARD16, "x");
-  PrintField(buf, 10, 2, CARD16, "y");
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-  PrintField(buf, 16, 2, CARD16, "minor-opcode");
-  PrintField(buf, 18, 2, CARD16, "count");
-  PrintField(buf, 20, 1, CARD8, "major-opcode");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* GraphicsExposure */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 2, CARD16, "x");
+    PrintField(buf, 10, 2, CARD16, "y");
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
+    PrintField(buf, 16, 2, CARD16, "minor-opcode");
+    PrintField(buf, 18, 2, CARD16, "count");
+    PrintField(buf, 20, 1, CARD8, "major-opcode");
 }
 
 void
-NoExposureEvent (
-    const unsigned char *buf)
+NoExposureEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* NoExposure */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 2, CARD16, "minor-opcode");
-  PrintField(buf, 10, 1, CARD8, "major-opcode");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* NoExposure */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 2, CARD16, "minor-opcode");
+    PrintField(buf, 10, 1, CARD8, "major-opcode");
 }
 
 void
-VisibilityNotifyEvent (
-    const unsigned char *buf)
+VisibilityNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* VisibilityNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 1, VISIBLE, "state");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* VisibilityNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 1, VISIBLE, "state");
 }
 
 void
-CreateNotifyEvent (
-    const unsigned char *buf)
+CreateNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CreateNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "parent");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintField(buf, 16, 2, CARD16, "width");
-  PrintField(buf, 18, 2, CARD16, "height");
-  PrintField(buf, 20, 2, CARD16, "border-width");
-  PrintField(buf, 22, 1, BOOL, "override-redirect");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* CreateNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "parent");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintField(buf, 16, 2, CARD16, "width");
+    PrintField(buf, 18, 2, CARD16, "height");
+    PrintField(buf, 20, 2, CARD16, "border-width");
+    PrintField(buf, 22, 1, BOOL, "override-redirect");
 }
 
 void
-DestroyNotifyEvent (
-    const unsigned char *buf)
+DestroyNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* DestroyNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* DestroyNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
 }
 
 void
-UnmapNotifyEvent (
-    const unsigned char *buf)
+UnmapNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* UnmapNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 1, BOOL, "from-configure");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* UnmapNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 1, BOOL, "from-configure");
 }
 
 void
-MapNotifyEvent (
-    const unsigned char *buf)
+MapNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MapNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 1, BOOL, "override-redirect");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* MapNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 1, BOOL, "override-redirect");
 }
 
 void
-MapRequestEvent (
-    const unsigned char *buf)
+MapRequestEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MapRequest */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "parent");
-  PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* MapRequest */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "parent");
+    PrintField(buf, 8, 4, WINDOW, "window");
 }
 
 void
-ReparentNotifyEvent (
-    const unsigned char *buf)
+ReparentNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ReparentNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 4, WINDOW, "parent");
-  PrintField(buf, 16, 2, INT16, "x");
-  PrintField(buf, 18, 2, INT16, "y");
-  PrintField(buf, 20, 1, BOOL, "override-redirect");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ReparentNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 4, WINDOW, "parent");
+    PrintField(buf, 16, 2, INT16, "x");
+    PrintField(buf, 18, 2, INT16, "y");
+    PrintField(buf, 20, 1, BOOL, "override-redirect");
 }
 
 void
-ConfigureNotifyEvent (
-    const unsigned char *buf)
+ConfigureNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ConfigureNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 4, WINDOW, "above-sibling");
-  PrintField(buf, 16, 2, INT16, "x");
-  PrintField(buf, 18, 2, INT16, "y");
-  PrintField(buf, 20, 2, CARD16, "width");
-  PrintField(buf, 22, 2, CARD16, "height");
-  PrintField(buf, 24, 2, CARD16, "border-width");
-  PrintField(buf, 26, 1, BOOL, "override-redirect");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ConfigureNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 4, WINDOW, "above-sibling");
+    PrintField(buf, 16, 2, INT16, "x");
+    PrintField(buf, 18, 2, INT16, "y");
+    PrintField(buf, 20, 2, CARD16, "width");
+    PrintField(buf, 22, 2, CARD16, "height");
+    PrintField(buf, 24, 2, CARD16, "border-width");
+    PrintField(buf, 26, 1, BOOL, "override-redirect");
 }
 
 void
-ConfigureRequestEvent (
-    const unsigned char *buf)
+ConfigureRequestEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ConfigureRequest */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, STACKMODE, "stack-mode");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "parent");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 4, WINDOW, "sibling");
-  PrintField(buf, 16, 2, INT16, "x");
-  PrintField(buf, 18, 2, INT16, "y");
-  PrintField(buf, 20, 2, CARD16, "width");
-  PrintField(buf, 22, 2, CARD16, "height");
-  PrintField(buf, 24, 2, CARD16, "border-width");
-  PrintField(buf, 26, 2, CONFIGURE_BITMASK, "value-mask");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ConfigureRequest */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, STACKMODE, "stack-mode");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "parent");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 4, WINDOW, "sibling");
+    PrintField(buf, 16, 2, INT16, "x");
+    PrintField(buf, 18, 2, INT16, "y");
+    PrintField(buf, 20, 2, CARD16, "width");
+    PrintField(buf, 22, 2, CARD16, "height");
+    PrintField(buf, 24, 2, CARD16, "border-width");
+    PrintField(buf, 26, 2, CONFIGURE_BITMASK, "value-mask");
 }
 
 void
-GravityNotifyEvent (
-    const unsigned char *buf)
+GravityNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* GravityNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* GravityNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
 }
 
 void
-ResizeRequestEvent (
-    const unsigned char *buf)
+ResizeRequestEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ResizeRequest */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 2, CARD16, "width");
-  PrintField(buf, 10, 2, CARD16, "height");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ResizeRequest */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 2, CARD16, "width");
+    PrintField(buf, 10, 2, CARD16, "height");
 }
 
 void
-CirculateNotifyEvent (
-    const unsigned char *buf)
+CirculateNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CirculateNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "event");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 4, WINDOW, "parent");
-  PrintField(buf, 16, 1, CIRSTAT, "place");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* CirculateNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "event");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 4, WINDOW, "parent");
+    PrintField(buf, 16, 1, CIRSTAT, "place");
 }
 
 void
-CirculateRequestEvent (
-    const unsigned char *buf)
+CirculateRequestEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CirculateRequest */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "parent");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 16, 1, CIRSTAT, "place");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* CirculateRequest */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "parent");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 16, 1, CIRSTAT, "place");
 }
 
 void
-PropertyNotifyEvent (
-    const unsigned char *buf)
+PropertyNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* PropertyNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, ATOM, "atom");
-  PrintField(buf, 12, 4, TIMESTAMP, "time");
-  PrintField(buf, 16, 1, PROPCHANGE, "state");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* PropertyNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, ATOM, "atom");
+    PrintField(buf, 12, 4, TIMESTAMP, "time");
+    PrintField(buf, 16, 1, PROPCHANGE, "state");
 }
 
 void
-SelectionClearEvent (
-    const unsigned char *buf)
+SelectionClearEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionClear */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "owner");
-  PrintField(buf, 12, 4, ATOM, "selection");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* SelectionClear */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "owner");
+    PrintField(buf, 12, 4, ATOM, "selection");
 }
 
 void
-SelectionRequestEvent (
-    const unsigned char *buf)
+SelectionRequestEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionRequest */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "owner");
-  PrintField(buf, 12, 4, WINDOW, "requestor");
-  PrintField(buf, 16, 4, ATOM, "selection");
-  PrintField(buf, 20, 4, ATOM, "target");
-  PrintField(buf, 24, 4, ATOM, "property");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* SelectionRequest */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "owner");
+    PrintField(buf, 12, 4, WINDOW, "requestor");
+    PrintField(buf, 16, 4, ATOM, "selection");
+    PrintField(buf, 20, 4, ATOM, "target");
+    PrintField(buf, 24, 4, ATOM, "property");
 }
 
 void
-SelectionNotifyEvent (
-    const unsigned char *buf)
+SelectionNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
-  PrintField(buf, 8, 4, WINDOW, "requestor");
-  PrintField(buf, 12, 4, ATOM, "selection");
-  PrintField(buf, 16, 4, ATOM, "target");
-  PrintField(buf, 20, 4, ATOM, "property");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* SelectionNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 8, 4, WINDOW, "requestor");
+    PrintField(buf, 12, 4, ATOM, "selection");
+    PrintField(buf, 16, 4, ATOM, "target");
+    PrintField(buf, 20, 4, ATOM, "property");
 }
 
 void
-ColormapNotifyEvent (
-    const unsigned char *buf)
+ColormapNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ColormapNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, COLORMAP, "colormap");
-  PrintField(buf, 12, 1, BOOL, "new");
-  PrintField(buf, 13, 1, CMAPCHANGE, "state");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ColormapNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, COLORMAP, "colormap");
+    PrintField(buf, 12, 1, BOOL, "new");
+    PrintField(buf, 13, 1, CMAPCHANGE, "state");
 }
 
 void
-ClientMessageEvent (
-    const unsigned char *buf)
+ClientMessageEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ClientMessage */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, CARD8, "format");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, ATOM, "type");
-  PrintBytes(&buf[12], (long)20,"data");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* ClientMessage */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, CARD8, "format");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, ATOM, "type");
+    PrintBytes(&buf[12], (long) 20, "data");
 }
 
 void
-MappingNotifyEvent (
-    const unsigned char *buf)
+MappingNotifyEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MappingNotify */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  PrintField(buf, 4, 1, MAPOBJECT, "request");
-  PrintField(buf, 5, 1, KEYCODE, "first-keycode");
-  PrintField(buf, 6, 1, CARD8, "count");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* MappingNotify */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintField(buf, 4, 1, MAPOBJECT, "request");
+    PrintField(buf, 5, 1, KEYCODE, "first-keycode");
+    PrintField(buf, 6, 1, CARD8, "count");
 }
 
 void
-UnknownGenericEvent (
-    const unsigned char *buf)
+UnknownGenericEvent(const unsigned char *buf)
 {
-  long n;
+    long n;
 
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* GenericEvent */;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, EXTENSION, "extension");
-  printfield (buf, 2, 2, CARD16, "sequence number");
-  printfield (buf, 4, 4, DVALUE4(n), "event length");
-  PrintField(buf, 2, 8, CARD16, "event type");
-  n = ILong (&buf[4]) + 5;
-  (void) PrintList (&buf[12], n, CARD32, "data");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* GenericEvent */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, EXTENSION, "extension");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "event length");
+    PrintField(buf, 2, 8, CARD16, "event type");
+
+    n = ILong(&buf[4]) + 5;
+    (void) PrintList(&buf[12], n, CARD32, "data");
 }
 
 void
-UnknownEvent (
-    const unsigned char *buf)
+UnknownEvent(const unsigned char *buf)
 {
-  PrintField(buf, 0, 1, EVENT, EVENTHEADER);
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, CARD8, "detail");
-  printfield (buf, 2, 2, CARD16, "sequence number");
-  PrintBytes(&buf[4], 28, "data");
+    PrintField(buf, 0, 1, EVENT, EVENTHEADER);
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, CARD8, "detail");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    PrintBytes(&buf[4], 28, "data");
 }
 
 /* ************************************************************ */
@@ -984,3187 +931,2944 @@ UnknownEvent (
 /* Request and Reply Printing procedures */
 
 void
-ExtendedRequest (
-    int fd,
-    const unsigned char *buf)
+ExtendedRequest(int fd, const unsigned char *buf)
 {
-  short n;
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER);
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-  PrintField(buf, 1, 1, CARD8, "minor opcode");
-  printreqlen(buf, fd, DVALUE2(n-1));
-
-  n = CS[fd].requestLen - 1;
-  (void) PrintList (&buf[4], n, CARD32, "data");
-}
-
-void
-UnknownReply (
-    const unsigned char *buf)
+    short n;
+
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER);
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, CARD8, "minor opcode");
+    printreqlen(buf, fd, DVALUE2(n - 1));
+
+    n = CS[fd].requestLen - 1;
+    (void) PrintList(&buf[4], n, CARD32, "data");
+}
+
+void
+UnknownReply(const unsigned char *buf)
 {
-  long n;
-  
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER);
-  PrintField(buf, 1, 1, CARD8, "data");
-  printfield (buf, 2, 2, CARD16, "sequence number");
-  printfield (buf, 4, 4, DVALUE4(n), "reply length");
-  n = ILong (&buf[4]) + 6;
-  (void) PrintList (&buf[8], n, CARD32, "data");
-}
-
-void
-CreateWindow (
-    FD fd,
-    const unsigned char *buf)
+    long n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER);
+    PrintField(buf, 1, 1, CARD8, "data");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "reply length");
+    n = ILong(&buf[4]) + 6;
+    (void) PrintList(&buf[8], n, CARD32, "data");
+}
+
+void
+CreateWindow(FD fd, const unsigned char *buf)
 {
-  /* Request CreateWindow is opcode 1 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request CreateWindow is opcode 1 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreateWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, CARD8, "depth");
-  printreqlen(buf, fd, DVALUE2(8 + n));
-  PrintField(buf, 4, 4, WINDOW, "wid");
-  PrintField(buf, 8, 4, WINDOW, "parent");
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintField(buf, 16, 2, CARD16, "width");
-  PrintField(buf, 18, 2, CARD16, "height");
-  PrintField(buf, 20, 2, CARD16, "border-width");
-  PrintField(buf, 22, 2, WINDOWCLASS, "class");
-  PrintField(buf, 24, 4, VISUALIDC, "visual");
-  PrintField(buf, 28, 4, WINDOW_BITMASK, "value-mask");
-  PrintValues(&buf[28], 4, WINDOW_BITMASK, &buf[32], "value-list");
+    PrintField(buf, 1, 1, CARD8, "depth");
+    printreqlen(buf, fd, DVALUE2(8 + n));
+    PrintField(buf, 4, 4, WINDOW, "wid");
+    PrintField(buf, 8, 4, WINDOW, "parent");
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintField(buf, 16, 2, CARD16, "width");
+    PrintField(buf, 18, 2, CARD16, "height");
+    PrintField(buf, 20, 2, CARD16, "border-width");
+    PrintField(buf, 22, 2, WINDOWCLASS, "class");
+    PrintField(buf, 24, 4, VISUALIDC, "visual");
+    PrintField(buf, 28, 4, WINDOW_BITMASK, "value-mask");
+    PrintValues(&buf[28], 4, WINDOW_BITMASK, &buf[32], "value-list");
 }
 
 void
-ChangeWindowAttributes (
-    FD fd,
-    const unsigned char *buf)
+ChangeWindowAttributes(FD fd, const unsigned char *buf)
 {
-  /* Request ChangeWindowAttributes is opcode 2 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeWindowAttributes */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangeWindowAttributes is opcode 2 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeWindowAttributes */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, WINDOW_BITMASK, "value-mask");
-  PrintValues(&buf[8], 4, WINDOW_BITMASK, &buf[12], "value-list");
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, WINDOW_BITMASK, "value-mask");
+    PrintValues(&buf[8], 4, WINDOW_BITMASK, &buf[12], "value-list");
 }
 
 void
-GetWindowAttributes (
-    FD fd,
-    const unsigned char *buf)
+GetWindowAttributes(FD fd, const unsigned char *buf)
 {
-  /* Request GetWindowAttributes is opcode 3 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetWindowAttributes */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetWindowAttributes is opcode 3 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetWindowAttributes */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-GetWindowAttributesReply (
-    const unsigned char *buf)
+GetWindowAttributesReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetWindowAttributes */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, BACKSTORE, "backing-store");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(3), "reply length");
-  PrintField(buf, 8, 4, VISUALID, "visual");
-  PrintField(buf, 12, 2, WINDOWCLASS, "class");
-  PrintField(buf, 14, 1, BITGRAVITY, "bit-gravity");
-  PrintField(buf, 15, 1, WINGRAVITY, "win-gravity");
-  PrintField(buf, 16, 4, CARD32, "backing-planes");
-  PrintField(buf, 20, 4, CARD32, "backing-pixel");
-  PrintField(buf, 24, 1, BOOL, "save-under");
-  PrintField(buf, 25, 1, BOOL, "map-is-installed");
-  PrintField(buf, 26, 1, MAPSTATE, "map-state");
-  PrintField(buf, 27, 1, BOOL, "override-redirect");
-  PrintField(buf, 28, 4, COLORMAP, "colormap");
-  PrintField(buf, 32, 4, SETofEVENT, "all-event-masks");
-  PrintField(buf, 36, 4, SETofEVENT, "your-event-mask");
-  PrintField(buf, 40, 2, SETofDEVICEEVENT, "do-not-propagate-mask");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetWindowAttributes */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, BACKSTORE, "backing-store");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(3), "reply length");
+    PrintField(buf, 8, 4, VISUALID, "visual");
+    PrintField(buf, 12, 2, WINDOWCLASS, "class");
+    PrintField(buf, 14, 1, BITGRAVITY, "bit-gravity");
+    PrintField(buf, 15, 1, WINGRAVITY, "win-gravity");
+    PrintField(buf, 16, 4, CARD32, "backing-planes");
+    PrintField(buf, 20, 4, CARD32, "backing-pixel");
+    PrintField(buf, 24, 1, BOOL, "save-under");
+    PrintField(buf, 25, 1, BOOL, "map-is-installed");
+    PrintField(buf, 26, 1, MAPSTATE, "map-state");
+    PrintField(buf, 27, 1, BOOL, "override-redirect");
+    PrintField(buf, 28, 4, COLORMAP, "colormap");
+    PrintField(buf, 32, 4, SETofEVENT, "all-event-masks");
+    PrintField(buf, 36, 4, SETofEVENT, "your-event-mask");
+    PrintField(buf, 40, 2, SETofDEVICEEVENT, "do-not-propagate-mask");
 }
 
 void
-DestroyWindow (
-    FD fd,
-    const unsigned char *buf)
+DestroyWindow(FD fd, const unsigned char *buf)
 {
-  /* Request DestroyWindow is opcode 4 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DestroyWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request DestroyWindow is opcode 4 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* DestroyWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-DestroySubwindows (
-    FD fd,
-    const unsigned char *buf)
+DestroySubwindows(FD fd, const unsigned char *buf)
 {
-  /* Request DestroySubwindows is opcode 5 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DestroySubwindows */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request DestroySubwindows is opcode 5 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* DestroySubwindows */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-ChangeSaveSet (
-    FD fd,
-    const unsigned char *buf)
+ChangeSaveSet(FD fd, const unsigned char *buf)
 {
-  /* Request ChangeSaveSet is opcode 6 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeSaveSet */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangeSaveSet is opcode 6 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeSaveSet */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, INS_DEL, "mode");
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 1, 1, INS_DEL, "mode");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-ReparentWindow (
-    FD fd,
-    const unsigned char *buf)
+ReparentWindow(FD fd, const unsigned char *buf)
 {
-  /* Request ReparentWindow is opcode 7 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ReparentWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ReparentWindow is opcode 7 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ReparentWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, WINDOW, "parent");
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, WINDOW, "parent");
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
 }
 
 void
-MapWindow (
-    FD fd,
-    const unsigned char *buf)
+MapWindow(FD fd, const unsigned char *buf)
 {
-  /* Request MapWindow is opcode 8 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* MapWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request MapWindow is opcode 8 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* MapWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-MapSubwindows (
-    FD fd,
-    const unsigned char *buf)
+MapSubwindows(FD fd, const unsigned char *buf)
 {
-  /* Request MapSubwindows is opcode 9 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* MapSubwindows */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request MapSubwindows is opcode 9 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* MapSubwindows */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-UnmapWindow (
-    FD fd,
-    const unsigned char *buf)
+UnmapWindow(FD fd, const unsigned char *buf)
 {
-  /* Request UnmapWindow is opcode 10 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UnmapWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UnmapWindow is opcode 10 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UnmapWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-UnmapSubwindows (
-    FD fd,
-    const unsigned char *buf)
+UnmapSubwindows(FD fd, const unsigned char *buf)
 {
-  /* Request UnmapSubwindows is opcode 11 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UnmapSubwindows */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UnmapSubwindows is opcode 11 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UnmapSubwindows */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-ConfigureWindow (
-    FD fd,
-    const unsigned char *buf)
+ConfigureWindow(FD fd, const unsigned char *buf)
 {
-  /* Request ConfigureWindow is opcode 12 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ConfigureWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ConfigureWindow is opcode 12 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ConfigureWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 2, CONFIGURE_BITMASK, "value-mask");
-  PrintValues(&buf[8], 2, CONFIGURE_BITMASK, &buf[12], "value-list");
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 2, CONFIGURE_BITMASK, "value-mask");
+    PrintValues(&buf[8], 2, CONFIGURE_BITMASK, &buf[12], "value-list");
 }
 
 void
-CirculateWindow (
-    FD fd,
-    const unsigned char *buf)
+CirculateWindow(FD fd, const unsigned char *buf)
 {
-  /* Request CirculateWindow is opcode 13 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CirculateWindow */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request CirculateWindow is opcode 13 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CirculateWindow */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, CIRMODE, "direction");
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 1, 1, CIRMODE, "direction");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-GetGeometry (
-    FD fd,
-    const unsigned char *buf)
+GetGeometry(FD fd, const unsigned char *buf)
 {
-  /* Request GetGeometry is opcode 14 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetGeometry */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetGeometry is opcode 14 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetGeometry */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
 }
 
 void
-GetGeometryReply (
-    const unsigned char *buf)
+GetGeometryReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetGeometry */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, CARD8, "depth");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintField(buf, 16, 2, CARD16, "width");
-  PrintField(buf, 18, 2, CARD16, "height");
-  PrintField(buf, 20, 2, CARD16, "border-width");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetGeometry */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, CARD8, "depth");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintField(buf, 16, 2, CARD16, "width");
+    PrintField(buf, 18, 2, CARD16, "height");
+    PrintField(buf, 20, 2, CARD16, "border-width");
 }
 
 void
-QueryTree (
-    FD fd,
-    const unsigned char *buf)
+QueryTree(FD fd, const unsigned char *buf)
 {
-  /* Request QueryTree is opcode 15 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryTree */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request QueryTree is opcode 15 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryTree */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-QueryTreeReply (
-    const unsigned char *buf)
+QueryTreeReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryTree */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n), "reply length");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "parent");
-  printfield(buf, 16, 2, DVALUE2(n), "number of children");
-  n = IShort(&buf[16]);
-  PrintList(&buf[32], (long)n, WINDOW, "children");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryTree */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "reply length");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "parent");
+    printfield(buf, 16, 2, DVALUE2(n), "number of children");
+    n = IShort(&buf[16]);
+    PrintList(&buf[32], (long) n, WINDOW, "children");
 }
 
 void
-InternAtom (
-    FD fd,
-    const unsigned char *buf)
+InternAtom(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request InternAtom is opcode 16 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* InternAtom */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request InternAtom is opcode 16 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* InternAtom */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "only-if-exists");
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  printfield(buf, 4, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[4]);
-  PrintString8(&buf[8], n, "name");
+    PrintField(buf, 1, 1, BOOL, "only-if-exists");
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    printfield(buf, 4, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[4]);
+    PrintString8(&buf[8], n, "name");
 }
 
 void
-InternAtomReply (
-    const unsigned char *buf)
+InternAtomReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* InternAtom */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, ATOM, "atom");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* InternAtom */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, ATOM, "atom");
 }
 
 void
-GetAtomName (
-    FD fd,
-    const unsigned char *buf)
+GetAtomName(FD fd, const unsigned char *buf)
 {
-  /* Request GetAtomName is opcode 17 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetAtomName */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetAtomName is opcode 17 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetAtomName */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, ATOM, "atom");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, ATOM, "atom");
 }
 
 void
-GetAtomNameReply (
-    const unsigned char *buf)
-{
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetAtomName */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[8]);
-  PrintString8(&buf[32], n, "name");
+GetAtomNameReply(const unsigned char *buf)
+{
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetAtomName */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[8]);
+    PrintString8(&buf[32], n, "name");
 }
 
 void
-ChangeProperty (
-    FD fd,
-    const unsigned char *buf)
+ChangeProperty(FD fd, const unsigned char *buf)
 {
-  long    n;
-  short   unit;
-  long    type;
+    long n;
+    short unit;
+    long type;
 
-  /* Request ChangeProperty is opcode 18 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeProperty */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangeProperty is opcode 18 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeProperty */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, CHANGEMODE, "mode");
-  printreqlen(buf, fd, DVALUE2(6 + (n + p) / 4));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, ATOM, "property");
-  PrintField(buf, 12, 4, ATOM, "type");
-  type = ILong(&buf[12]);
-  PrintField(buf, 16, 1, CARD8, "format");
-  unit = IByte(&buf[16]) / 8;
-  printfield(buf, 20, 4, CARD32, "length of data");
-  n = ILong(&buf[20]);
-  if (type == 31 /* string */)
-    PrintString8(&buf[24], n * unit, "data");
-  else
-    PrintBytes(&buf[24], n * unit, "data");
+    PrintField(buf, 1, 1, CHANGEMODE, "mode");
+    printreqlen(buf, fd, DVALUE2(6 + (n + p) / 4));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, ATOM, "property");
+    PrintField(buf, 12, 4, ATOM, "type");
+    type = ILong(&buf[12]);
+    PrintField(buf, 16, 1, CARD8, "format");
+    unit = IByte(&buf[16]) / 8;
+    printfield(buf, 20, 4, CARD32, "length of data");
+    n = ILong(&buf[20]);
+    if (type == 31 /* string */ )
+        PrintString8(&buf[24], n * unit, "data");
+    else
+        PrintBytes(&buf[24], n * unit, "data");
 }
 
 void
-DeleteProperty (
-    FD fd,
-    const unsigned char *buf)
+DeleteProperty(FD fd, const unsigned char *buf)
 {
-  /* Request DeleteProperty is opcode 19 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DeleteProperty */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request DeleteProperty is opcode 19 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* DeleteProperty */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, ATOM, "property");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, ATOM, "property");
 }
 
 void
-GetProperty (
-    FD fd,
-    const unsigned char *buf)
+GetProperty(FD fd, const unsigned char *buf)
 {
-  /* Request GetProperty is opcode 20 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetProperty */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetProperty is opcode 20 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetProperty */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "delete");
-  printreqlen(buf, fd, CONST2(6));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, ATOM, "property");
-  PrintField(buf, 12, 4, ATOMT, "type");
-  PrintField(buf, 16, 4, CARD32, "long-offset");
-  printfield(buf, 20, 4, CARD32, "long-length");
+    PrintField(buf, 1, 1, BOOL, "delete");
+    printreqlen(buf, fd, CONST2(6));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, ATOM, "property");
+    PrintField(buf, 12, 4, ATOMT, "type");
+    PrintField(buf, 16, 4, CARD32, "long-offset");
+    printfield(buf, 20, 4, CARD32, "long-length");
 }
 
 void
-GetPropertyReply (
-    const unsigned char *buf)
+GetPropertyReply(const unsigned char *buf)
 {
-  long    n;
-  short   unit;
-  long    type;
+    long n;
+    short unit;
+    long type;
 
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetProperty */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, CARD8, "format");
-  unit = IByte(&buf[1]) / 8;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  PrintField(buf, 8, 4, ATOM, "type");
-  type = ILong(&buf[8]);
-  PrintField(buf, 12, 4, CARD32, "bytes-after");
-  printfield(buf, 16, 4, CARD32, "length of value");
-  n = ILong(&buf[16]);
-  if (type == 31 /* string */)
-    PrintString8(&buf[32], n * unit, "value");
-  else
-    PrintBytes(&buf[32], n * unit, "value");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetProperty */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, CARD8, "format");
+    unit = IByte(&buf[1]) / 8;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    PrintField(buf, 8, 4, ATOM, "type");
+    type = ILong(&buf[8]);
+    PrintField(buf, 12, 4, CARD32, "bytes-after");
+    printfield(buf, 16, 4, CARD32, "length of value");
+    n = ILong(&buf[16]);
+    if (type == 31 /* string */ )
+        PrintString8(&buf[32], n * unit, "value");
+    else
+        PrintBytes(&buf[32], n * unit, "value");
 }
 
 void
-ListProperties (
-    FD fd,
-    const unsigned char *buf)
+ListProperties(FD fd, const unsigned char *buf)
 {
-  /* Request ListProperties is opcode 21 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListProperties */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ListProperties is opcode 21 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListProperties */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-ListPropertiesReply (
-    const unsigned char *buf)
+ListPropertiesReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListProperties */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "number of atoms");
-  n = IShort(&buf[8]);
-  PrintList(&buf[32], (long)n, ATOM, "atoms");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListProperties */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "number of atoms");
+    n = IShort(&buf[8]);
+    PrintList(&buf[32], (long) n, ATOM, "atoms");
 }
 
 void
-SetSelectionOwner (
-    FD fd,
-    const unsigned char *buf)
+SetSelectionOwner(FD fd, const unsigned char *buf)
 {
-  /* Request SetSelectionOwner is opcode 22 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetSelectionOwner */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SetSelectionOwner is opcode 22 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetSelectionOwner */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "owner");
-  PrintField(buf, 8, 4, ATOM, "selection");
-  PrintField(buf, 12, 4, TIMESTAMP, "time");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "owner");
+    PrintField(buf, 8, 4, ATOM, "selection");
+    PrintField(buf, 12, 4, TIMESTAMP, "time");
 }
 
 void
-GetSelectionOwner (
-    FD fd,
-    const unsigned char *buf)
+GetSelectionOwner(FD fd, const unsigned char *buf)
 {
-  /* Request GetSelectionOwner is opcode 23 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetSelectionOwner */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetSelectionOwner is opcode 23 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetSelectionOwner */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, ATOM, "selection");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, ATOM, "selection");
 }
 
 void
-GetSelectionOwnerReply (
-    const unsigned char *buf)
+GetSelectionOwnerReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetSelectionOwner */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, WINDOW, "owner");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetSelectionOwner */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, WINDOW, "owner");
 }
 
 void
-ConvertSelection (
-    FD fd,
-    const unsigned char *buf)
+ConvertSelection(FD fd, const unsigned char *buf)
 {
-  /* Request ConvertSelection is opcode 24 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ConvertSelection */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ConvertSelection is opcode 24 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ConvertSelection */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(6));
-  PrintField(buf, 4, 4, WINDOW, "requestor");
-  PrintField(buf, 8, 4, ATOM, "selection");
-  PrintField(buf, 12, 4, ATOM, "target");
-  PrintField(buf, 16, 4, ATOM, "property");
-  PrintField(buf, 20, 4, TIMESTAMP, "time");
+    printreqlen(buf, fd, CONST2(6));
+    PrintField(buf, 4, 4, WINDOW, "requestor");
+    PrintField(buf, 8, 4, ATOM, "selection");
+    PrintField(buf, 12, 4, ATOM, "target");
+    PrintField(buf, 16, 4, ATOM, "property");
+    PrintField(buf, 20, 4, TIMESTAMP, "time");
 }
 
 void
-SendEvent (
-    FD fd,
-    const unsigned char *buf)
+SendEvent(FD fd, const unsigned char *buf)
 {
-  /* Request SendEvent is opcode 25 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SendEvent */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SendEvent is opcode 25 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SendEvent */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "propagate");
-  printreqlen(buf, fd, CONST2(11));
-  PrintField(buf, 4, 4, WINDOWD, "destination");
-  PrintField(buf, 8, 4, SETofEVENT, "event-mask");
-  PrintField(buf, 12, 32, EVENTFORM, "event");
+    PrintField(buf, 1, 1, BOOL, "propagate");
+    printreqlen(buf, fd, CONST2(11));
+    PrintField(buf, 4, 4, WINDOWD, "destination");
+    PrintField(buf, 8, 4, SETofEVENT, "event-mask");
+    PrintField(buf, 12, 32, EVENTFORM, "event");
 }
 
 void
-GrabPointer (
-    FD fd,
-    const unsigned char *buf)
+GrabPointer(FD fd, const unsigned char *buf)
 {
-  /* Request GrabPointer is opcode 26 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabPointer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GrabPointer is opcode 26 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GrabPointer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "owner-events");
-  printreqlen(buf, fd, CONST2(6));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 2, SETofPOINTEREVENT, "event-mask");
-  PrintField(buf, 10, 1, PK_MODE, "pointer-mode");
-  PrintField(buf, 11, 1, PK_MODE, "keyboard-mode");
-  PrintField(buf, 12, 4, WINDOW, "confine-to");
-  PrintField(buf, 16, 4, CURSOR, "cursor");
-  PrintField(buf, 20, 4, TIMESTAMP, "time");
+    PrintField(buf, 1, 1, BOOL, "owner-events");
+    printreqlen(buf, fd, CONST2(6));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 2, SETofPOINTEREVENT, "event-mask");
+    PrintField(buf, 10, 1, PK_MODE, "pointer-mode");
+    PrintField(buf, 11, 1, PK_MODE, "keyboard-mode");
+    PrintField(buf, 12, 4, WINDOW, "confine-to");
+    PrintField(buf, 16, 4, CURSOR, "cursor");
+    PrintField(buf, 20, 4, TIMESTAMP, "time");
 }
 
 void
-GrabPointerReply (
-    const unsigned char *buf)
+GrabPointerReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GrabPointer */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, GRABSTAT, "status");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GrabPointer */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, GRABSTAT, "status");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
 }
 
 void
-UngrabPointer (
-    FD fd,
-    const unsigned char *buf)
+UngrabPointer(FD fd, const unsigned char *buf)
 {
-  /* Request UngrabPointer is opcode 27 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabPointer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UngrabPointer is opcode 27 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UngrabPointer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
 }
 
 void
-GrabButton (
-    FD fd,
-    const unsigned char *buf)
+GrabButton(FD fd, const unsigned char *buf)
 {
-  /* Request GrabButton is opcode 28 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabButton */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GrabButton is opcode 28 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GrabButton */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "owner-events");
-  printreqlen(buf, fd, CONST2(6));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 2, SETofPOINTEREVENT, "event-mask");
-  PrintField(buf, 10, 1, PK_MODE, "pointer-mode");
-  PrintField(buf, 11, 1, PK_MODE, "keyboard-mode");
-  PrintField(buf, 12, 4, WINDOW, "confine-to");
-  PrintField(buf, 16, 4, CURSOR, "cursor");
-  PrintField(buf, 20, 1, BUTTONA, "button");
-  PrintField(buf, 22, 2, SETofKEYMASK, "modifiers");
+    PrintField(buf, 1, 1, BOOL, "owner-events");
+    printreqlen(buf, fd, CONST2(6));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 2, SETofPOINTEREVENT, "event-mask");
+    PrintField(buf, 10, 1, PK_MODE, "pointer-mode");
+    PrintField(buf, 11, 1, PK_MODE, "keyboard-mode");
+    PrintField(buf, 12, 4, WINDOW, "confine-to");
+    PrintField(buf, 16, 4, CURSOR, "cursor");
+    PrintField(buf, 20, 1, BUTTONA, "button");
+    PrintField(buf, 22, 2, SETofKEYMASK, "modifiers");
 }
 
 void
-UngrabButton (
-    FD fd,
-    const unsigned char *buf)
+UngrabButton(FD fd, const unsigned char *buf)
 {
-  /* Request UngrabButton is opcode 29 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabButton */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UngrabButton is opcode 29 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UngrabButton */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BUTTONA, "button");
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
+    PrintField(buf, 1, 1, BUTTONA, "button");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
 }
 
 void
-ChangeActivePointerGrab (
-    FD fd,
-    const unsigned char *buf)
+ChangeActivePointerGrab(FD fd, const unsigned char *buf)
 {
-  /* Request ChangeActivePointerGrab is opcode 30 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeActivePointerGrab */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangeActivePointerGrab is opcode 30 */
+    PrintField(buf, 0, 1, REQUEST,
+               REQUESTHEADER); /* ChangeActivePointerGrab */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, CURSOR, "cursor");
-  PrintField(buf, 8, 4, TIMESTAMP, "time");
-  PrintField(buf, 12, 2, SETofPOINTEREVENT, "event-mask");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, CURSOR, "cursor");
+    PrintField(buf, 8, 4, TIMESTAMP, "time");
+    PrintField(buf, 12, 2, SETofPOINTEREVENT, "event-mask");
 }
 
 void
-GrabKeyboard (
-    FD fd,
-    const unsigned char *buf)
+GrabKeyboard(FD fd, const unsigned char *buf)
 {
-  /* Request GrabKeyboard is opcode 31 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabKeyboard */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GrabKeyboard is opcode 31 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GrabKeyboard */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "owner-events");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 4, TIMESTAMP, "time");
-  PrintField(buf, 12, 1, PK_MODE, "pointer-mode");
-  PrintField(buf, 13, 1, PK_MODE, "keyboard-mode");
+    PrintField(buf, 1, 1, BOOL, "owner-events");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 4, TIMESTAMP, "time");
+    PrintField(buf, 12, 1, PK_MODE, "pointer-mode");
+    PrintField(buf, 13, 1, PK_MODE, "keyboard-mode");
 }
 
 void
-GrabKeyboardReply (
-    const unsigned char *buf)
+GrabKeyboardReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GrabKeyboard */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, GRABSTAT, "status");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GrabKeyboard */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, GRABSTAT, "status");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
 }
 
 void
-UngrabKeyboard (
-    FD fd,
-    const unsigned char *buf)
+UngrabKeyboard(FD fd, const unsigned char *buf)
 {
-  /* Request UngrabKeyboard is opcode 32 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabKeyboard */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UngrabKeyboard is opcode 32 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UngrabKeyboard */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
 }
 
 void
-GrabKey (
-    FD fd,
-    const unsigned char *buf)
+GrabKey(FD fd, const unsigned char *buf)
 {
-  /* Request GrabKey is opcode 33 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabKey */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GrabKey is opcode 33 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GrabKey */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "owner-events");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
-  PrintField(buf, 10, 1, KEYCODEA, "key");
-  PrintField(buf, 11, 1, PK_MODE, "pointer-mode");
-  PrintField(buf, 12, 1, PK_MODE, "keyboard-mode");
+    PrintField(buf, 1, 1, BOOL, "owner-events");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
+    PrintField(buf, 10, 1, KEYCODEA, "key");
+    PrintField(buf, 11, 1, PK_MODE, "pointer-mode");
+    PrintField(buf, 12, 1, PK_MODE, "keyboard-mode");
 }
 
 void
-UngrabKey (
-    FD fd,
-    const unsigned char *buf)
+UngrabKey(FD fd, const unsigned char *buf)
 {
-  /* Request UngrabKey is opcode 34 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabKey */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UngrabKey is opcode 34 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UngrabKey */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, KEYCODEA, "key");
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, WINDOW, "grab-window");
-  PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
+    PrintField(buf, 1, 1, KEYCODEA, "key");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, WINDOW, "grab-window");
+    PrintField(buf, 8, 2, SETofKEYMASK, "modifiers");
 }
 
 void
-AllowEvents (
-    FD fd,
-    const unsigned char *buf)
+AllowEvents(FD fd, const unsigned char *buf)
 {
-  /* Request AllowEvents is opcode 35 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllowEvents */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request AllowEvents is opcode 35 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* AllowEvents */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, EVENTMODE, "mode");
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, TIMESTAMP, "time");
+    PrintField(buf, 1, 1, EVENTMODE, "mode");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, TIMESTAMP, "time");
 }
 
 void
-GrabServer (
-    FD fd,
-    const unsigned char *buf)
+GrabServer(FD fd, const unsigned char *buf)
 {
-  /* Request GrabServer is opcode 36 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabServer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GrabServer is opcode 36 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GrabServer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-UngrabServer (
-    FD fd,
-    const unsigned char *buf)
+UngrabServer(FD fd, const unsigned char *buf)
 {
-  /* Request UngrabServer is opcode 37 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabServer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UngrabServer is opcode 37 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UngrabServer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-QueryPointer (
-    FD fd,
-    const unsigned char *buf)
+QueryPointer(FD fd, const unsigned char *buf)
 {
-  /* Request QueryPointer is opcode 38 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryPointer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request QueryPointer is opcode 38 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryPointer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
 }
 
 void
-QueryPointerReply (
-    const unsigned char *buf)
+QueryPointerReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryPointer */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, BOOL, "same-screen");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, WINDOW, "root");
-  PrintField(buf, 12, 4, WINDOW, "child");
-  PrintField(buf, 16, 2, INT16, "root-x");
-  PrintField(buf, 18, 2, INT16, "root-y");
-  PrintField(buf, 20, 2, INT16, "win-x");
-  PrintField(buf, 22, 2, INT16, "win-y");
-  PrintField(buf, 24, 2, SETofKEYBUTMASK, "mask");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryPointer */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, BOOL, "same-screen");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, WINDOW, "root");
+    PrintField(buf, 12, 4, WINDOW, "child");
+    PrintField(buf, 16, 2, INT16, "root-x");
+    PrintField(buf, 18, 2, INT16, "root-y");
+    PrintField(buf, 20, 2, INT16, "win-x");
+    PrintField(buf, 22, 2, INT16, "win-y");
+    PrintField(buf, 24, 2, SETofKEYBUTMASK, "mask");
 }
 
 void
-GetMotionEvents (
-    FD fd,
-    const unsigned char *buf)
+GetMotionEvents(FD fd, const unsigned char *buf)
 {
-  /* Request GetMotionEvents is opcode 39 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetMotionEvents */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetMotionEvents is opcode 39 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetMotionEvents */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 4, TIMESTAMP, "start");
-  PrintField(buf, 12, 4, TIMESTAMP, "stop");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 4, TIMESTAMP, "start");
+    PrintField(buf, 12, 4, TIMESTAMP, "stop");
 }
 
 void
-GetMotionEventsReply (
-    const unsigned char *buf)
+GetMotionEventsReply(const unsigned char *buf)
 {
-  long   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetMotionEvents */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(2*n), "reply length");
-  printfield(buf, 8, 4, DVALUE4(n), "number of events");
-  n = ILong(&buf[8]);
-  PrintList(&buf[32], n, TIMECOORD, "events");
+    long n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetMotionEvents */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(2 * n), "reply length");
+    printfield(buf, 8, 4, DVALUE4(n), "number of events");
+    n = ILong(&buf[8]);
+    PrintList(&buf[32], n, TIMECOORD, "events");
 }
 
 void
-TranslateCoordinates (
-    FD fd,
-    const unsigned char *buf)
+TranslateCoordinates(FD fd, const unsigned char *buf)
 {
-  /* Request TranslateCoordinates is opcode 40 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* TranslateCoordinates */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request TranslateCoordinates is opcode 40 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* TranslateCoordinates */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "src-window");
-  PrintField(buf, 8, 4, WINDOW, "dst-window");
-  PrintField(buf, 12, 2, INT16, "src-x");
-  PrintField(buf, 14, 2, INT16, "src-y");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "src-window");
+    PrintField(buf, 8, 4, WINDOW, "dst-window");
+    PrintField(buf, 12, 2, INT16, "src-x");
+    PrintField(buf, 14, 2, INT16, "src-y");
 }
 
 void
-TranslateCoordinatesReply (
-    const unsigned char *buf)
+TranslateCoordinatesReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* TranslateCoordinates */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, BOOL, "same-screen");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, WINDOW, "child");
-  PrintField(buf, 12, 2, INT16, "dst-x");
-  PrintField(buf, 14, 2, INT16, "dst-y");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* TranslateCoordinates */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, BOOL, "same-screen");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, WINDOW, "child");
+    PrintField(buf, 12, 2, INT16, "dst-x");
+    PrintField(buf, 14, 2, INT16, "dst-y");
 }
 
 void
-WarpPointer (
-    FD fd,
-    const unsigned char *buf)
+WarpPointer(FD fd, const unsigned char *buf)
 {
-  /* Request WarpPointer is opcode 41 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* WarpPointer */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request WarpPointer is opcode 41 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* WarpPointer */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(6));
-  PrintField(buf, 4, 4, WINDOW, "src-window");
-  PrintField(buf, 8, 4, WINDOW, "dst-window");
-  PrintField(buf, 12, 2, INT16, "src-x");
-  PrintField(buf, 14, 2, INT16, "src-y");
-  PrintField(buf, 16, 2, CARD16, "src-width");
-  PrintField(buf, 18, 2, CARD16, "src-height");
-  PrintField(buf, 20, 2, INT16, "dst-x");
-  PrintField(buf, 22, 2, INT16, "dst-y");
+    printreqlen(buf, fd, CONST2(6));
+    PrintField(buf, 4, 4, WINDOW, "src-window");
+    PrintField(buf, 8, 4, WINDOW, "dst-window");
+    PrintField(buf, 12, 2, INT16, "src-x");
+    PrintField(buf, 14, 2, INT16, "src-y");
+    PrintField(buf, 16, 2, CARD16, "src-width");
+    PrintField(buf, 18, 2, CARD16, "src-height");
+    PrintField(buf, 20, 2, INT16, "dst-x");
+    PrintField(buf, 22, 2, INT16, "dst-y");
 }
 
 void
-SetInputFocus (
-    FD fd,
-    const unsigned char *buf)
+SetInputFocus(FD fd, const unsigned char *buf)
 {
-  /* Request SetInputFocus is opcode 42 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetInputFocus */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SetInputFocus is opcode 42 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetInputFocus */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, FOCUSAGENT, "revert-to");
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, WINDOWNR, "focus");
-  PrintField(buf, 8, 4, TIMESTAMP, "time");
+    PrintField(buf, 1, 1, FOCUSAGENT, "revert-to");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, WINDOWNR, "focus");
+    PrintField(buf, 8, 4, TIMESTAMP, "time");
 }
 
 void
-GetInputFocus (
-    FD fd,
-    const unsigned char *buf)
+GetInputFocus(FD fd, const unsigned char *buf)
 {
-  /* Request GetInputFocus is opcode 43 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetInputFocus */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetInputFocus is opcode 43 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetInputFocus */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetInputFocusReply (
-    const unsigned char *buf)
+GetInputFocusReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetInputFocus */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, FOCUSAGENT, "revert-to");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, WINDOWNR, "focus");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetInputFocus */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, FOCUSAGENT, "revert-to");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, WINDOWNR, "focus");
 }
 
 void
-QueryKeymap (
-    FD fd,
-    const unsigned char *buf)
+QueryKeymap(FD fd, const unsigned char *buf)
 {
-  /* Request QueryKeymap is opcode 44 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryKeymap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request QueryKeymap is opcode 44 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryKeymap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-QueryKeymapReply (
-    const unsigned char *buf)
+QueryKeymapReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryKeymap */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(2), "reply length");
-  PrintBytes(&buf[8], 32L, "keys");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryKeymap */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(2), "reply length");
+    PrintBytes(&buf[8], 32L, "keys");
 }
 
 void
-OpenFont (
-    FD fd,
-    const unsigned char *buf)
+OpenFont(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request OpenFont is opcode 45 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* OpenFont */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request OpenFont is opcode 45 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* OpenFont */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
-  PrintField(buf, 4, 4, FONT, "font-id");
-  printfield(buf, 8, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[8]);
-  PrintString8(&buf[12], n, "name");
+    printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
+    PrintField(buf, 4, 4, FONT, "font-id");
+    printfield(buf, 8, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[8]);
+    PrintString8(&buf[12], n, "name");
 }
 
 void
-CloseFont (
-    FD fd,
-    const unsigned char *buf)
+CloseFont(FD fd, const unsigned char *buf)
 {
-  /* Request CloseFont is opcode 46 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CloseFont */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request CloseFont is opcode 46 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CloseFont */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, FONT, "font");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, FONT, "font");
 }
 
 void
-QueryFont (
-    FD fd,
-    const unsigned char *buf)
+QueryFont(FD fd, const unsigned char *buf)
 {
-  /* Request QueryFont is opcode 47 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryFont */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request QueryFont is opcode 47 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryFont */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, FONTABLE, "font");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, FONTABLE, "font");
 }
 
 void
-QueryFontReply (
-    const unsigned char *buf)
+QueryFontReply(const unsigned char *buf)
 {
-  short   n;
-  long    m;
-  long   k;
+    short n;
+    long m;
+    long k;
 
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryFont */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(7 + 2*n + 3*m), "reply length");
-  PrintField(buf, 8, 12, CHARINFO, "min-bounds");
-  PrintField(buf, 24, 12, CHARINFO, "max-bounds");
-  PrintField(buf, 40, 2, CARD16, "min-char-or-byte2");
-  PrintField(buf, 42, 2, CARD16, "max-char-or-byte2");
-  PrintField(buf, 44, 2, CARD16, "default-char");
-  printfield(buf, 46, 2, DVALUE2(n), "number of FONTPROPs");
-  n = IShort(&buf[46]);
-  PrintField(buf, 48, 1, DIRECT, "draw-direction");
-  PrintField(buf, 49, 1, CARD8, "min-byte1");
-  PrintField(buf, 50, 1, CARD8, "max-byte1");
-  PrintField(buf, 51, 1, BOOL, "all-chars-exist");
-  PrintField(buf, 52, 2, INT16, "font-ascent");
-  PrintField(buf, 54, 2, INT16, "font-descent");
-  printfield(buf, 56, 4, DVALUE4(m), "number of CHARINFOs");
-  m = ILong(&buf[56]);
-  k = PrintList(&buf[60], (long)n, FONTPROP, "properties");
-  PrintList(&buf[60 + k], (long)m, CHARINFO, "char-infos");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryFont */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(7 + 2 * n + 3 * m), "reply length");
+    PrintField(buf, 8, 12, CHARINFO, "min-bounds");
+    PrintField(buf, 24, 12, CHARINFO, "max-bounds");
+    PrintField(buf, 40, 2, CARD16, "min-char-or-byte2");
+    PrintField(buf, 42, 2, CARD16, "max-char-or-byte2");
+    PrintField(buf, 44, 2, CARD16, "default-char");
+    printfield(buf, 46, 2, DVALUE2(n), "number of FONTPROPs");
+    n = IShort(&buf[46]);
+    PrintField(buf, 48, 1, DIRECT, "draw-direction");
+    PrintField(buf, 49, 1, CARD8, "min-byte1");
+    PrintField(buf, 50, 1, CARD8, "max-byte1");
+    PrintField(buf, 51, 1, BOOL, "all-chars-exist");
+    PrintField(buf, 52, 2, INT16, "font-ascent");
+    PrintField(buf, 54, 2, INT16, "font-descent");
+    printfield(buf, 56, 4, DVALUE4(m), "number of CHARINFOs");
+    m = ILong(&buf[56]);
+    k = PrintList(&buf[60], (long) n, FONTPROP, "properties");
+    PrintList(&buf[60 + k], (long) m, CHARINFO, "char-infos");
 }
 
 void
-QueryTextExtents (
-    FD fd,
-    const unsigned char *buf)
+QueryTextExtents(FD fd, const unsigned char *buf)
 {
-  int   n;
+    int n;
 
-  /* Request QueryTextExtents is opcode 48 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryTextExtents */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request QueryTextExtents is opcode 48 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryTextExtents */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printfield(buf, 1, 1, BOOL, "odd length?");
-  printreqlen(buf, fd, DVALUE2(2 + (2*n + p) / 4));
-  n = (IShort(&buf[2]) - 2) * 4 / 2;
-  if (IBool(&buf[1]))
-    n -= 1;
-  PrintField(buf, 4, 4, FONTABLE, "font");
-  PrintString16(&buf[8], n, "string");
-}
-
-void
-QueryTextExtentsReply (
-    const unsigned char *buf)
+    printfield(buf, 1, 1, BOOL, "odd length?");
+    printreqlen(buf, fd, DVALUE2(2 + (2 * n + p) / 4));
+    n = (IShort(&buf[2]) - 2) * 4 / 2;
+    if (IBool(&buf[1]))
+        n -= 1;
+    PrintField(buf, 4, 4, FONTABLE, "font");
+    PrintString16(&buf[8], n, "string");
+}
+
+void
+QueryTextExtentsReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryTextExtents */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, DIRECT, "draw-direction");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, INT16, "font-ascent");
-  PrintField(buf, 10, 2, INT16, "font-descent");
-  PrintField(buf, 12, 2, INT16, "overall-ascent");
-  PrintField(buf, 14, 2, INT16, "overall-descent");
-  PrintField(buf, 16, 4, INT32, "overall-width");
-  PrintField(buf, 20, 4, INT32, "overall-left");
-  PrintField(buf, 24, 4, INT32, "overall-right");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryTextExtents */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, DIRECT, "draw-direction");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, INT16, "font-ascent");
+    PrintField(buf, 10, 2, INT16, "font-descent");
+    PrintField(buf, 12, 2, INT16, "overall-ascent");
+    PrintField(buf, 14, 2, INT16, "overall-descent");
+    PrintField(buf, 16, 4, INT32, "overall-width");
+    PrintField(buf, 20, 4, INT32, "overall-left");
+    PrintField(buf, 24, 4, INT32, "overall-right");
 }
-
-void
-ListFonts (
-    FD fd,
-    const unsigned char *buf)
+
+void
+ListFonts(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request ListFonts is opcode 49 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListFonts */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  PrintField(buf, 4, 2, CARD16, "max-names");
-  printfield(buf, 6, 2, DVALUE2(n), "length of pattern");
-  n = IShort(&buf[6]);
-  PrintString8(&buf[8], n, "pattern");
-}
-
-void
-ListFontsReply (
-    const unsigned char *buf)
-{
-  short   n;
-
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListFonts */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  printfield(buf, 8, 2, CARD16, "number of names");
-  n = IShort(&buf[8]);
-  PrintListSTR(&buf[32], (long)n, "names");
-}
-
-void
-ListFontsWithInfo (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request ListFontsWithInfo is opcode 50 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListFontsWithInfo */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request ListFonts is opcode 49 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListFonts */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  PrintField(buf, 4, 2, CARD16, "max-names");
-  printfield(buf, 6, 2, DVALUE2(n), "length of pattern");
-  n = IShort(&buf[6]);
-  PrintString8(&buf[8], n, "pattern");
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    PrintField(buf, 4, 2, CARD16, "max-names");
+    printfield(buf, 6, 2, DVALUE2(n), "length of pattern");
+    n = IShort(&buf[6]);
+    PrintString8(&buf[8], n, "pattern");
 }
 
 void
-ListFontsWithInfoReply (
-    const unsigned char *buf)
+ListFontsReply(const unsigned char *buf)
 {
-  short which;
+    short n;
 
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListFontsWithInfo */ ;
-  if (Verbose < 1) return;
-  which = IByte(&buf[1]);
-  if (which != 0)
-    {
-      ListFontsWithInfoReply1(buf);
-      KeepLastReplyExpected();
-    }
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListFonts */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    printfield(buf, 8, 2, CARD16, "number of names");
+    n = IShort(&buf[8]);
+    PrintListSTR(&buf[32], (long) n, "names");
+}
+
+void
+ListFontsWithInfo(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request ListFontsWithInfo is opcode 50 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListFontsWithInfo */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    PrintField(buf, 4, 2, CARD16, "max-names");
+    printfield(buf, 6, 2, DVALUE2(n), "length of pattern");
+    n = IShort(&buf[6]);
+    PrintString8(&buf[8], n, "pattern");
+}
+
+void
+ListFontsWithInfoReply(const unsigned char *buf)
+{
+    short which;
 
-  else
-    ListFontsWithInfoReply2(buf);
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListFontsWithInfo */
+    if (Verbose < 1)
+        return;
+    which = IByte(&buf[1]);
+    if (which != 0) {
+        ListFontsWithInfoReply1(buf);
+        KeepLastReplyExpected();
+    }
+    else
+        ListFontsWithInfoReply2(buf);
 }
 
 static void
-ListFontsWithInfoReply1 (
-    const unsigned char *buf)
-{
-  short   n;
-  short   m;
-  printfield(buf, 1, 1, DVALUE1(n), "length of name in bytes");
-  n = IByte(&buf[1]);
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(7 + 2*m + (n + p) / 4), "reply length");
-  PrintField(buf, 8, 12, CHARINFO, "min-bounds");
-  PrintField(buf, 24, 12, CHARINFO, "max-bounds");
-  PrintField(buf, 40, 2, CARD16, "min-char-or-byte2");
-  PrintField(buf, 42, 2, CARD16, "max-char-or-byte2");
-  PrintField(buf, 44, 2, CARD16, "default-char");
-  printfield(buf, 46, 2, DVALUE2(m), "number of FONTPROPs");
-  m = IShort(&buf[46]);
-  PrintField(buf, 48, 1, DIRECT, "draw-direction");
-  PrintField(buf, 49, 1, CARD8, "min-byte1");
-  PrintField(buf, 50, 1, CARD8, "max-byte1");
-  PrintField(buf, 51, 1, BOOL, "all-chars-exist");
-  PrintField(buf, 52, 2, INT16, "font-ascent");
-  PrintField(buf, 54, 2, INT16, "font-descent");
-  PrintField(buf, 56, 4, CARD32, "replies-hint");
-  PrintList(&buf[60], (long)m, FONTPROP, "properties");
-  PrintString8(&buf[60 + 8 * m], n, "name");
+ListFontsWithInfoReply1(const unsigned char *buf)
+{
+    short n;
+    short m;
+
+    printfield(buf, 1, 1, DVALUE1(n), "length of name in bytes");
+    n = IByte(&buf[1]);
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(7 + 2 * m + (n + p) / 4), "reply length");
+    PrintField(buf, 8, 12, CHARINFO, "min-bounds");
+    PrintField(buf, 24, 12, CHARINFO, "max-bounds");
+    PrintField(buf, 40, 2, CARD16, "min-char-or-byte2");
+    PrintField(buf, 42, 2, CARD16, "max-char-or-byte2");
+    PrintField(buf, 44, 2, CARD16, "default-char");
+    printfield(buf, 46, 2, DVALUE2(m), "number of FONTPROPs");
+    m = IShort(&buf[46]);
+    PrintField(buf, 48, 1, DIRECT, "draw-direction");
+    PrintField(buf, 49, 1, CARD8, "min-byte1");
+    PrintField(buf, 50, 1, CARD8, "max-byte1");
+    PrintField(buf, 51, 1, BOOL, "all-chars-exist");
+    PrintField(buf, 52, 2, INT16, "font-ascent");
+    PrintField(buf, 54, 2, INT16, "font-descent");
+    PrintField(buf, 56, 4, CARD32, "replies-hint");
+    PrintList(&buf[60], (long) m, FONTPROP, "properties");
+    PrintString8(&buf[60 + 8 * m], n, "name");
 }
 
 static void
-ListFontsWithInfoReply2 (
-    const unsigned char *buf)
+ListFontsWithInfoReply2(const unsigned char *buf)
+{
+    PrintField(buf, 1, 1, CONST1(0), "last-reply indicator");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(7), "reply length");
+}
+
+void
+SetFontPath(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request SetFontPath is opcode 51 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetFontPath */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    printfield(buf, 4, 2, CARD16, "number of paths");
+    n = IShort(&buf[4]);
+    PrintListSTR(&buf[8], (long) n, "paths");
+}
+
+void
+GetFontPath(FD fd, const unsigned char *buf)
 {
-  PrintField(buf, 1, 1, CONST1(0), "last-reply indicator");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(7), "reply length");
+    /* Request GetFontPath is opcode 52 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetFontPath */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 2, 2, CONST2(1), "request list");
 }
 
 void
-SetFontPath (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request SetFontPath is opcode 51 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetFontPath */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  printfield(buf, 4, 2, CARD16, "number of paths");
-  n = IShort(&buf[4]);
-  PrintListSTR(&buf[8], (long)n, "paths");
-}
-
-void
-GetFontPath (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request GetFontPath is opcode 52 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetFontPath */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 2, 2, CONST2(1), "request list");
-}
-
-void
-GetFontPathReply (
-    const unsigned char *buf)
-{
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetFontPath */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  printfield(buf, 8, 2, CARD16, "number of paths");
-  n = IShort(&buf[8]);
-  PrintListSTR(&buf[32], (long)n, "paths");
-}
-
-void
-CreatePixmap (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request CreatePixmap is opcode 53 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreatePixmap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, CARD8, "depth");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, PIXMAP, "pixmap-id");
-  PrintField(buf, 8, 4, DRAWABLE, "drawable");
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-}
-
-void
-FreePixmap (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request FreePixmap is opcode 54 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreePixmap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, PIXMAP, "pixmap");
-}
-
-static const unsigned long	GCDefaults[] = {
-    3,	    /* function GXcopy */
-    ~0,	    /* planemask */
-    0,	    /* foreground */
-    1,	    /* background */
-    0,	    /* line width */
-    0,	    /* line style Solid */
-    1,	    /* cap style Butt */
-    0,	    /* join style Miter */
-    0,	    /* fill style Solid */
-    0,	    /* fill rule EvenOdd */
-    0,	    /* tile */
-    0,	    /* stipple */
-    0,	    /* ts org x */
-    0,	    /* ts org y */
-    0,	    /* font */
-    0,	    /* sub window mode ClipByChildren */
-    1,	    /* graphics expose True */
-    0,	    /* clip x org */
-    0,	    /* clip y org */
-    0,	    /* clip mask */
-    0,	    /* dash offset */
-    4,	    /* dashes */
-    1,	    /* arc mode PieSlice */
+GetFontPathReply(const unsigned char *buf)
+{
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetFontPath */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    printfield(buf, 8, 2, CARD16, "number of paths");
+
+    n = IShort(&buf[8]);
+    PrintListSTR(&buf[32], (long) n, "paths");
+}
+
+void
+CreatePixmap(FD fd, const unsigned char *buf)
+{
+    /* Request CreatePixmap is opcode 53 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreatePixmap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, CARD8, "depth");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, PIXMAP, "pixmap-id");
+    PrintField(buf, 8, 4, DRAWABLE, "drawable");
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
+}
+
+void
+FreePixmap(FD fd, const unsigned char *buf)
+{
+    /* Request FreePixmap is opcode 54 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FreePixmap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, PIXMAP, "pixmap");
+}
+
+static const unsigned long GCDefaults[] = {
+    3,                          /* function GXcopy */
+    ~0,                         /* planemask */
+    0,                          /* foreground */
+    1,                          /* background */
+    0,                          /* line width */
+    0,                          /* line style Solid */
+    1,                          /* cap style Butt */
+    0,                          /* join style Miter */
+    0,                          /* fill style Solid */
+    0,                          /* fill rule EvenOdd */
+    0,                          /* tile */
+    0,                          /* stipple */
+    0,                          /* ts org x */
+    0,                          /* ts org y */
+    0,                          /* font */
+    0,                          /* sub window mode ClipByChildren */
+    1,                          /* graphics expose True */
+    0,                          /* clip x org */
+    0,                          /* clip y org */
+    0,                          /* clip mask */
+    0,                          /* dash offset */
+    4,                          /* dashes */
+    1,                          /* arc mode PieSlice */
 };
 
 void
-CreateGC (
-    FD fd,
-    const unsigned char *buf)
+CreateGC(FD fd, const unsigned char *buf)
+{
+    CreateValueRec(ILong(buf + 4), 23, GCDefaults);
+    SetValueRec(ILong(buf + 4), &buf[12], 4, GC_BITMASK, &buf[16]);
+
+    /* Request CreateGC is opcode 55 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreateGC */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(4 + n));
+    PrintField(buf, 4, 4, GCONTEXT, "graphic-context-id");
+    PrintField(buf, 8, 4, DRAWABLE, "drawable");
+    PrintField(buf, 12, 4, GC_BITMASK, "value-mask");
+    PrintValues(&buf[12], 4, GC_BITMASK, &buf[16], "value-list");
+}
+
+void
+ChangeGC(FD fd, const unsigned char *buf)
+{
+    SetValueRec(ILong(buf + 4), &buf[8], 4, GC_BITMASK, &buf[12]);
+
+    /* Request ChangeGC is opcode 56 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeGC */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    PrintField(buf, 4, 4, GCONTEXT, "gc");
+    PrintField(buf, 8, 4, GC_BITMASK, "value-mask");
+    PrintValues(&buf[8], 4, GC_BITMASK, &buf[12], "value-list");
+}
+
+void
+CopyGC(FD fd, const unsigned char *buf)
+{
+    /* Request CopyGC is opcode 57 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CopyGC */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, GCONTEXT, "src-gc");
+    PrintField(buf, 8, 4, GCONTEXT, "dst-gc");
+    PrintField(buf, 12, 4, GC_BITMASK, "value-mask");
+}
+
+void
+SetDashes(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request SetDashes is opcode 58 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetDashes */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
+    PrintField(buf, 4, 4, GCONTEXT, "gc");
+    PrintField(buf, 8, 2, CARD16, "dash-offset");
+    printfield(buf, 10, 2, DVALUE2(n), "length of dashes");
+    n = IShort(&buf[10]);
+    PrintBytes(&buf[12], (long) n, "dashes");
+}
+
+void
+SetClipRectangles(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request SetClipRectangles is opcode 59 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetClipRectangles */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, RECTORDER, "ordering");
+    printreqlen(buf, fd, DVALUE2(3 + 2 * n));
+    n = (IShort(&buf[2]) - 3) / 2;
+    PrintField(buf, 4, 4, GCONTEXT, "gc");
+    PrintField(buf, 8, 2, INT16, "clip-x-origin");
+    PrintField(buf, 10, 2, INT16, "clip-y-origin");
+    PrintList(&buf[12], (long) n, RECTANGLE, "rectangles");
+}
+
+void
+FreeGC(FD fd, const unsigned char *buf)
 {
-    CreateValueRec (ILong(buf+4), 23, GCDefaults);
-    SetValueRec (ILong(buf+4), &buf[12], 4, GC_BITMASK, &buf[16]);
-    
-  /* Request CreateGC is opcode 55 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateGC */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    DeleteValueRec(ILong(&buf[4]));
 
-  printreqlen(buf, fd, DVALUE2(4 + n));
-  PrintField(buf, 4, 4, GCONTEXT, "graphic-context-id");
-  PrintField(buf, 8, 4, DRAWABLE, "drawable");
-  PrintField(buf, 12, 4, GC_BITMASK, "value-mask");
-  PrintValues(&buf[12], 4, GC_BITMASK, &buf[16], "value-list");
+    /* Request FreeGC is opcode 60 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FreeGC */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, GCONTEXT, "gc");
 }
 
 void
-ChangeGC (
-    FD fd,
-    const unsigned char *buf)
+ClearArea(FD fd, const unsigned char *buf)
 {
-    SetValueRec (ILong(buf+4), &buf[8], 4, GC_BITMASK, &buf[12]);
-    
-  /* Request ChangeGC is opcode 56 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeGC */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ClearArea is opcode 61 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ClearArea */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  PrintField(buf, 4, 4, GCONTEXT, "gc");
-  PrintField(buf, 8, 4, GC_BITMASK, "value-mask");
-  PrintValues(&buf[8], 4, GC_BITMASK, &buf[12], "value-list");
+    PrintField(buf, 1, 1, BOOL, "exposures");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    PrintField(buf, 8, 2, INT16, "x");
+    PrintField(buf, 10, 2, INT16, "y");
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
 }
 
 void
-CopyGC (
-    FD fd,
-    const unsigned char *buf)
+CopyArea(FD fd, const unsigned char *buf)
+{
+    /* Request CopyArea is opcode 62 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CopyArea */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(7));
+    PrintField(buf, 4, 4, DRAWABLE, "src-drawable");
+    PrintField(buf, 8, 4, DRAWABLE, "dst-drawable");
+    PrintField(buf, 12, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[12]),
+                      GC_function | GC_plane_mask | GC_graphics_exposures,
+                      GC_BITMASK);
+    PrintField(buf, 16, 2, INT16, "src-x");
+    PrintField(buf, 18, 2, INT16, "src-y");
+    PrintField(buf, 20, 2, INT16, "dst-x");
+    PrintField(buf, 22, 2, INT16, "dst-y");
+    PrintField(buf, 24, 2, CARD16, "width");
+    PrintField(buf, 26, 2, CARD16, "height");
+}
+
+void
+CopyPlane(FD fd, const unsigned char *buf)
+{
+    /* Request CopyPlane is opcode 63 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CopyPlane */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(8));
+    PrintField(buf, 4, 4, DRAWABLE, "src-drawable");
+    PrintField(buf, 8, 4, DRAWABLE, "dst-drawable");
+    PrintField(buf, 12, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[12]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_foreground |
+                      GC_background |
+                      GC_graphics_exposures,
+                      GC_BITMASK);
+    PrintField(buf, 16, 2, INT16, "src-x");
+    PrintField(buf, 18, 2, INT16, "src-y");
+    PrintField(buf, 20, 2, INT16, "dst-x");
+    PrintField(buf, 22, 2, INT16, "dst-y");
+    PrintField(buf, 24, 2, CARD16, "width");
+    PrintField(buf, 26, 2, CARD16, "height");
+    PrintField(buf, 28, 4, CARD32, "bit-plane");
+}
+
+void
+PolyPoint(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyPoint is opcode 64 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyPoint */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, COORMODE, "coordinate-mode");
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    n = (IShort(&buf[2]) - 3);
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function | GC_plane_mask | GC_foreground, GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, POINT, "points");
+}
+
+void
+PolyLine(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyLine is opcode 65 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyLine */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, COORMODE, "coordinate-mode");
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    n = (IShort(&buf[2]) - 3);
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_line_width |
+                      GC_line_style |
+                      GC_cap_style |
+                      GC_join_style |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, POINT, "points");
+}
+
+void
+PolySegment(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolySegment is opcode 66 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolySegment */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + 2 * n));
+    n = (IShort(&buf[2]) - 3) / 2;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_line_width |
+                      GC_line_style |
+                      GC_cap_style |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, SEGMENT, "segments");
+}
+
+void
+PolyRectangle(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyRectangle is opcode 67 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyRectangle */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + 2 * n));
+    n = (IShort(&buf[2]) - 3) / 2;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_line_width |
+                      GC_line_style |
+                      GC_cap_style |
+                      GC_join_style |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, RECTANGLE, "rectangles");
+}
+
+void
+PolyArc(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyArc is opcode 68 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyArc */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + 3 * n));
+    n = (IShort(&buf[2]) - 3) / 3;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_line_width |
+                      GC_line_style |
+                      GC_cap_style |
+                      GC_join_style |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, ARC, "arcs");
+}
+
+void
+FillPoly(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request FillPoly is opcode 69 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FillPoly */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(4 + n));
+    n = (IShort(&buf[2]) - 4);
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(buf + 8),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_fill_style |
+                      GC_fill_rule |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    PrintField(buf, 12, 1, POLYSHAPE, "shape");
+    PrintField(buf, 13, 1, COORMODE, "coordinate-mode");
+    PrintList(&buf[16], (long) n, POINT, "points");
+}
+
+void
+PolyFillRectangle(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyFillRectangle is opcode 70 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyFillRectangle */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + 2 * n));
+    n = (IShort(&buf[2]) - 3) / 2;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(buf + 8),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, RECTANGLE, "rectangles");
+}
+
+void
+PolyFillArc(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request PolyFillArc is opcode 71 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyFillArc */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + 3 * n));
+    n = (IShort(&buf[2]) - 3) / 3;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_arc_mode |
+                      GC_fill_style |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    (void) PrintList(&buf[12], (long) n, ARC, "arcs");
+}
+
+void
+PutImage(FD fd, const unsigned char *buf)
+{
+    int n;
+
+    /* Request PutImage is opcode 72 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PutImage */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, IMAGEMODE, "format");
+    printreqlen(buf, fd, DVALUE2(6 + (n + p) / 4));
+
+    /* the size of the Image is overestimated by the following computation of n,
+       because we ignore that padding of the request to a multiple of 4 bytes.
+       The image may not be a multiple of 4 bytes.  The actual size of the image
+       is determined as follows: for format = Bitmap or format = XYPixmap, the
+       size is (left-pad + width) [ pad to multiple of bitmap-scanline-pad from
+       SetUpReply ] divide by 8 to get bytes times height times depth for format
+       = ZPixmap, take the depth and use it to find the bits-per-pixel and
+       scanline-pad given in one of the SetUpReply DEPTH records. width *
+       bits-per-pixel pad to multiple of scanline-pad divide by 8 to get bytes
+       times height times depth For simplicity, we ignore all this and just use
+       the request length to (over)estimate the size of the image */
+
+    n = (IShort(&buf[2]) - 6) * 4;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_foreground |
+                      GC_background,
+                      GC_BITMASK);
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
+    PrintField(buf, 16, 2, INT16, "dst-x");
+    PrintField(buf, 18, 2, INT16, "dst-y");
+    PrintField(buf, 20, 1, CARD8, "left-pad");
+    PrintField(buf, 21, 1, CARD8, "depth");
+
+    if (Verbose > 3)
+        PrintBytes(&buf[24], (long) n, "data");
+}
+
+void
+GetImage(FD fd, const unsigned char *buf)
+{
+    /* Request GetImage is opcode 73 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetImage */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, IMAGEMODE, "format");
+    printreqlen(buf, fd, CONST2(5));
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 2, INT16, "x");
+    PrintField(buf, 10, 2, INT16, "y");
+    PrintField(buf, 12, 2, CARD16, "width");
+    PrintField(buf, 14, 2, CARD16, "height");
+    PrintField(buf, 16, 4, CARD32, "plane-mask");
+}
+
+void
+GetImageReply(const unsigned char *buf)
+{
+    long n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetImage */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, CARD8, "depth");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+
+    /* to properly compute the actual size of the image, we have to remember the
+       width and height values from the request.  Again, we (over)estimate its
+       length from the length of the reply */
+    n = ILong(&buf[4]) * 4;
+    PrintField(buf, 8, 4, VISUALID, "visual");
+    if (Verbose > 3)
+        PrintBytes(&buf[32], n, "data");
+}
+
+void
+PolyText8(FD fd, const unsigned char *buf)
+{
+    int n;
+
+    /* Request PolyText8 is opcode 74 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyText8 */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
+    n = (IShort(&buf[2]) - 4) * 4;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_fill_style |
+                      GC_font |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintTextList8(&buf[16], n, "items");
+}
+
+void
+PolyText16(FD fd, const unsigned char *buf)
+{
+    int n;
+
+    /* Request PolyText16 is opcode 75 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* PolyText16 */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
+    n = (IShort(&buf[2]) - 4) * 4;
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_function |
+                      GC_plane_mask |
+                      GC_fill_style |
+                      GC_font |
+                      GC_foreground |
+                      GC_background |
+                      GC_tile |
+                      GC_stipple,
+                      GC_BITMASK);
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintTextList16(&buf[16], n, "items");
+}
+
+void
+ImageText8(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request ImageText8 is opcode 76 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ImageText8 */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printfield(buf, 1, 1, DVALUE1(n), "length of string");
+    n = IByte(&buf[1]);
+    printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_plane_mask |
+                      GC_font |
+                      GC_foreground |
+                      GC_background,
+                      GC_BITMASK);
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintTString8(&buf[16], (long) n, "string");
+}
+
+void
+ImageText16(FD fd, const unsigned char *buf)
 {
-  /* Request CopyGC is opcode 57 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyGC */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, GCONTEXT, "src-gc");
-  PrintField(buf, 8, 4, GCONTEXT, "dst-gc");
-  PrintField(buf, 12, 4, GC_BITMASK, "value-mask");
+    /* Request ImageText16 is opcode 77 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ImageText16 */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printfield(buf, 1, 1, DVALUE1(n), "length of string");
+    n = IByte(&buf[1]);
+    printreqlen(buf, fd, DVALUE2(4 + (2 * n + p) / 4));
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 4, GCONTEXT, "gc");
+    if (Verbose > 2)
+        PrintValueRec(ILong(&buf[8]),
+                      GC_plane_mask |
+                      GC_font |
+                      GC_foreground |
+                      GC_background,
+                      GC_BITMASK);
+    PrintField(buf, 12, 2, INT16, "x");
+    PrintField(buf, 14, 2, INT16, "y");
+    PrintTString16(&buf[16], (long) n, "string");
 }
 
 void
-SetDashes (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request SetDashes is opcode 58 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetDashes */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
-  PrintField(buf, 4, 4, GCONTEXT, "gc");
-  PrintField(buf, 8, 2, CARD16, "dash-offset");
-  printfield(buf, 10, 2, DVALUE2(n), "length of dashes");
-  n = IShort(&buf[10]);
-  PrintBytes(&buf[12], (long)n, "dashes");
-}
-
-void
-SetClipRectangles (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-
-  /* Request SetClipRectangles is opcode 59 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetClipRectangles */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, RECTORDER, "ordering");
-  printreqlen(buf, fd, DVALUE2(3 + 2*n));
-  n = (IShort(&buf[2]) - 3) / 2;
-  PrintField(buf, 4, 4, GCONTEXT, "gc");
-  PrintField(buf, 8, 2, INT16, "clip-x-origin");
-  PrintField(buf, 10, 2, INT16, "clip-y-origin");
-  PrintList(&buf[12], (long)n, RECTANGLE, "rectangles");
-}
-
-void
-FreeGC (
-    FD fd,
-    const unsigned char *buf)
-{
-  DeleteValueRec (ILong (&buf[4]));
-  
-  /* Request FreeGC is opcode 60 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeGC */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, GCONTEXT, "gc");
-}
-
-void
-ClearArea (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request ClearArea is opcode 61 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ClearArea */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, BOOL, "exposures");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  PrintField(buf, 8, 2, INT16, "x");
-  PrintField(buf, 10, 2, INT16, "y");
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-}
-
-void
-CopyArea (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request CopyArea is opcode 62 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyArea */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(7));
-  PrintField(buf, 4, 4, DRAWABLE, "src-drawable");
-  PrintField(buf, 8, 4, DRAWABLE, "dst-drawable");
-  PrintField(buf, 12, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[12]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_graphics_exposures,
-		   GC_BITMASK);
-  PrintField(buf, 16, 2, INT16, "src-x");
-  PrintField(buf, 18, 2, INT16, "src-y");
-  PrintField(buf, 20, 2, INT16, "dst-x");
-  PrintField(buf, 22, 2, INT16, "dst-y");
-  PrintField(buf, 24, 2, CARD16, "width");
-  PrintField(buf, 26, 2, CARD16, "height");
-}
-
-void
-CopyPlane (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request CopyPlane is opcode 63 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyPlane */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(8));
-  PrintField(buf, 4, 4, DRAWABLE, "src-drawable");
-  PrintField(buf, 8, 4, DRAWABLE, "dst-drawable");
-  PrintField(buf, 12, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[12]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_foreground|
-		   GC_background|
-		   GC_graphics_exposures,
-		   GC_BITMASK);
-  PrintField(buf, 16, 2, INT16, "src-x");
-  PrintField(buf, 18, 2, INT16, "src-y");
-  PrintField(buf, 20, 2, INT16, "dst-x");
-  PrintField(buf, 22, 2, INT16, "dst-y");
-  PrintField(buf, 24, 2, CARD16, "width");
-  PrintField(buf, 26, 2, CARD16, "height");
-  PrintField(buf, 28, 4, CARD32, "bit-plane");
-}
-
-void
-PolyPoint (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyPoint is opcode 64 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyPoint */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, COORMODE, "coordinate-mode");
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  n = (IShort(&buf[2]) - 3);
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_foreground,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, POINT, "points");
-}
-
-void
-PolyLine (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyLine is opcode 65 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyLine */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, COORMODE, "coordinate-mode");
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  n = (IShort(&buf[2]) - 3);
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_line_width|
-		   GC_line_style|
-		   GC_cap_style|
-		   GC_join_style|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, POINT, "points");
-}
-
-void
-PolySegment (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolySegment is opcode 66 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolySegment */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + 2*n));
-  n = (IShort(&buf[2]) - 3) / 2;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_line_width|
-		   GC_line_style|
-		   GC_cap_style|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, SEGMENT, "segments");
-}
-
-void
-PolyRectangle (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyRectangle is opcode 67 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyRectangle */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + 2*n));
-  n = (IShort(&buf[2]) - 3) / 2;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_line_width|
-		   GC_line_style|
-		   GC_cap_style|
-		   GC_join_style|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, RECTANGLE, "rectangles");
-}
-
-void
-PolyArc (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyArc is opcode 68 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyArc */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + 3*n));
-  n = (IShort(&buf[2]) - 3) / 3;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_line_width|
-		   GC_line_style|
-		   GC_cap_style|
-		   GC_join_style|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, ARC, "arcs");
-}
-
-void
-FillPoly (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request FillPoly is opcode 69 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FillPoly */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(4 + n));
-  n = (IShort(&buf[2]) - 4);
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong(buf+8), 
-		   GC_function|
-		   GC_plane_mask|
-		   GC_fill_style|
-		   GC_fill_rule|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  PrintField(buf, 12, 1, POLYSHAPE, "shape");
-  PrintField(buf, 13, 1, COORMODE, "coordinate-mode");
-  PrintList(&buf[16], (long)n, POINT, "points");
-}
-
-void
-PolyFillRectangle (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyFillRectangle is opcode 70 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyFillRectangle */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + 2*n));
-  n = (IShort(&buf[2]) - 3) / 2;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong(buf+8), 
-		   GC_function|
-		   GC_plane_mask|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, RECTANGLE, "rectangles");
-}
-
-void
-PolyFillArc (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request PolyFillArc is opcode 71 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyFillArc */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + 3*n));
-  n = (IShort(&buf[2]) - 3) / 3;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_arc_mode|
-		   GC_fill_style|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  (void)PrintList(&buf[12], (long)n, ARC, "arcs");
-}
-
-void
-PutImage (
-    FD fd,
-    const unsigned char *buf)
-{
-  int   n;
-  /* Request PutImage is opcode 72 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PutImage */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, IMAGEMODE, "format");
-  printreqlen(buf, fd, DVALUE2(6 + (n + p) / 4));
-
-  /* the size of the Image is overestimated by the following computation of n,
-     because we ignore that padding of the request to a multiple of 4 bytes.
-     The image may not be a multiple of 4 bytes.  The actual size of the image
-     is determined as follows: for format = Bitmap or format = XYPixmap, the
-     size is (left-pad + width) [ pad to multiple of bitmap-scanline-pad from
-     SetUpReply ] divide by 8 to get bytes times height times depth for format
-     = ZPixmap, take the depth and use it to find the bits-per-pixel and
-     scanline-pad given in one of the SetUpReply DEPTH records. width *
-     bits-per-pixel pad to multiple of scanline-pad divide by 8 to get bytes
-     times height times depth For simplicity, we ignore all this and just use
-     the request length to (over)estimate the size of the image */
-
-  n = (IShort(&buf[2]) - 6) * 4;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_foreground|
-		   GC_background,
-		   GC_BITMASK);
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-  PrintField(buf, 16, 2, INT16, "dst-x");
-  PrintField(buf, 18, 2, INT16, "dst-y");
-  PrintField(buf, 20, 1, CARD8, "left-pad");
-  PrintField(buf, 21, 1, CARD8, "depth");
-  if (Verbose >  3)
-    PrintBytes(&buf[24], (long)n, "data");
-}
-
-void
-GetImage (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request GetImage is opcode 73 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetImage */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, IMAGEMODE, "format");
-  printreqlen(buf, fd, CONST2(5));
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 2, INT16, "x");
-  PrintField(buf, 10, 2, INT16, "y");
-  PrintField(buf, 12, 2, CARD16, "width");
-  PrintField(buf, 14, 2, CARD16, "height");
-  PrintField(buf, 16, 4, CARD32, "plane-mask");
-}
-
-void
-GetImageReply (
-    const unsigned char *buf)
-{
-  long    n;
-
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetImage */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, CARD8, "depth");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-
-  /* to properly compute the actual size of the image, we have to remember the
-     width and height values from the request.  Again, we (over)estimate its
-     length from the length of the reply */
-  n = ILong(&buf[4]) * 4;
-  PrintField(buf, 8, 4, VISUALID, "visual");
-  if (Verbose > 3)
-    PrintBytes(&buf[32], n, "data");
-}
-
-void
-PolyText8 (
-    FD fd,
-    const unsigned char *buf)
-{
-  int   n;
-
-  /* Request PolyText8 is opcode 74 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyText8 */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
-  n = (IShort(&buf[2]) - 4) * 4;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_fill_style|
-		   GC_font|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintTextList8(&buf[16], n, "items");
-}
-
-void
-PolyText16 (
-    FD fd,
-    const unsigned char *buf)
-{
-  int   n;
-
-  /* Request PolyText16 is opcode 75 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* PolyText16 */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
-  n = (IShort(&buf[2]) - 4) * 4;
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_function|
-		   GC_plane_mask|
-		   GC_fill_style|
-		   GC_font|
-		   GC_foreground|
-		   GC_background|
-		   GC_tile|
-		   GC_stipple,
-		   GC_BITMASK);
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintTextList16(&buf[16], n, "items");
-}
-
-void
-ImageText8 (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request ImageText8 is opcode 76 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ImageText8 */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printfield(buf, 1, 1, DVALUE1(n), "length of string");
-  n = IByte(&buf[1]);
-  printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_plane_mask|
-		   GC_font|
-		   GC_foreground|
-		   GC_background,
-		   GC_BITMASK);
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintTString8(&buf[16], (long)n, "string");
-}
-
-void
-ImageText16 (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request ImageText16 is opcode 77 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ImageText16 */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printfield(buf, 1, 1, DVALUE1(n), "length of string");
-  n = IByte(&buf[1]);
-  printreqlen(buf, fd, DVALUE2(4 + (2*n + p) / 4));
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 4, GCONTEXT, "gc");
-  if (Verbose > 2)
-    PrintValueRec (ILong (&buf[8]),
-		   GC_plane_mask|
-		   GC_font|
-		   GC_foreground|
-		   GC_background,
-		   GC_BITMASK);
-  PrintField(buf, 12, 2, INT16, "x");
-  PrintField(buf, 14, 2, INT16, "y");
-  PrintTString16(&buf[16], (long)n, "string");
-}
-
-void
-CreateColormap (
-    FD fd,
-    const unsigned char *buf)
+CreateColormap(FD fd, const unsigned char *buf)
 {
-  /* Request CreateColormap is opcode 78 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateColormap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, ALLORNONE, "alloc");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, COLORMAP, "color-map-id");
-  PrintField(buf, 8, 4, WINDOW, "window");
-  PrintField(buf, 12, 4, VISUALID, "visual");
-}
-
-void
-FreeColormap (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request FreeColormap is opcode 79 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeColormap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
+    /* Request CreateColormap is opcode 78 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreateColormap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, ALLORNONE, "alloc");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, COLORMAP, "color-map-id");
+    PrintField(buf, 8, 4, WINDOW, "window");
+    PrintField(buf, 12, 4, VISUALID, "visual");
 }
 
 void
-CopyColormapAndFree (
-    FD fd,
-    const unsigned char *buf)
+FreeColormap(FD fd, const unsigned char *buf)
 {
-  /* Request CopyColormapAndFree is opcode 80 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyColormapAndFree */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, COLORMAP, "color-map-id");
-  PrintField(buf, 8, 4, COLORMAP, "src-cmap");
+    /* Request FreeColormap is opcode 79 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FreeColormap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
 }
 
 void
-InstallColormap (
-    FD fd,
-    const unsigned char *buf)
+CopyColormapAndFree(FD fd, const unsigned char *buf)
 {
-  /* Request InstallColormap is opcode 81 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* InstallColormap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request CopyColormapAndFree is opcode 80 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CopyColormapAndFree */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, COLORMAP, "color-map-id");
+    PrintField(buf, 8, 4, COLORMAP, "src-cmap");
 }
 
 void
-UninstallColormap (
-    FD fd,
-    const unsigned char *buf)
+InstallColormap(FD fd, const unsigned char *buf)
 {
-  /* Request UninstallColormap is opcode 82 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UninstallColormap */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request InstallColormap is opcode 81 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* InstallColormap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
 }
 
 void
-ListInstalledColormaps (
-    FD fd,
-    const unsigned char *buf)
+UninstallColormap(FD fd, const unsigned char *buf)
 {
-  /* Request ListInstalledColormaps is opcode 83 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListInstalledColormaps */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request UninstallColormap is opcode 82 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* UninstallColormap */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+}
+
+void
+ListInstalledColormaps(FD fd, const unsigned char *buf)
+{
+    /* Request ListInstalledColormaps is opcode 83 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListInstalledColormaps */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, WINDOW, "window");
+}
+
+void
+ListInstalledColormapsReply(const unsigned char *buf)
+{
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListInstalledColormaps */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "number of cmaps");
+    n = IShort(&buf[8]);
+    PrintList(&buf[32], (long) n, COLORMAP, "cmaps");
+}
+
+void
+AllocColor(FD fd, const unsigned char *buf)
+{
+    /* Request AllocColor is opcode 84 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* AllocColor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintField(buf, 8, 2, CARD16, "red");
+    PrintField(buf, 10, 2, CARD16, "green");
+    PrintField(buf, 12, 2, CARD16, "blue");
+}
+
+void
+AllocColorReply(const unsigned char *buf)
+{
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* AllocColor */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, CARD16, "red");
+    PrintField(buf, 10, 2, CARD16, "green");
+    PrintField(buf, 12, 2, CARD16, "blue");
+    PrintField(buf, 16, 4, CARD32, "pixel");
+}
+
+void
+AllocNamedColor(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request AllocNamedColor is opcode 85 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* AllocNamedColor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, WINDOW, "window");
+    printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    printfield(buf, 8, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[8]);
+    PrintString8(&buf[12], n, "name");
 }
 
 void
-ListInstalledColormapsReply (
-    const unsigned char *buf)
+AllocNamedColorReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListInstalledColormaps */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "number of cmaps");
-  n = IShort(&buf[8]);
-  PrintList(&buf[32], (long)n, COLORMAP, "cmaps");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* AllocNamedColor */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 4, CARD32, "pixel");
+    PrintField(buf, 12, 2, CARD16, "exact-red");
+    PrintField(buf, 14, 2, CARD16, "exact-green");
+    PrintField(buf, 16, 2, CARD16, "exact-blue");
+    PrintField(buf, 18, 2, CARD16, "visual-red");
+    PrintField(buf, 20, 2, CARD16, "visual-green");
+    PrintField(buf, 22, 2, CARD16, "visual-blue");
 }
 
 void
-AllocColor (
-    FD fd,
-    const unsigned char *buf)
+AllocColorCells(FD fd, const unsigned char *buf)
 {
-  /* Request AllocColor is opcode 84 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request AllocColorCells is opcode 86 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* AllocColorCells */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintField(buf, 8, 2, CARD16, "red");
-  PrintField(buf, 10, 2, CARD16, "green");
-  PrintField(buf, 12, 2, CARD16, "blue");
+    PrintField(buf, 1, 1, BOOL, "contiguous");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintField(buf, 8, 2, CARD16, "colors");
+    PrintField(buf, 10, 2, CARD16, "planes");
 }
 
 void
-AllocColorReply (
-    const unsigned char *buf)
+AllocColorCellsReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocColor */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, CARD16, "red");
-  PrintField(buf, 10, 2, CARD16, "green");
-  PrintField(buf, 12, 2, CARD16, "blue");
-  PrintField(buf, 16, 4, CARD32, "pixel");
+    short n;
+    short m;
+    short k;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* AllocColorCells */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n + m), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "number of pixels");
+    n = IShort(&buf[8]);
+    printfield(buf, 10, 2, DVALUE2(m), "number of masks");
+    m = IShort(&buf[10]);
+    k = PrintList(&buf[32], (long) n, CARD32, "pixels");
+    PrintList(&buf[32 + k], (long) m, CARD32, "masks");
 }
 
 void
-AllocNamedColor (
-    FD fd,
-    const unsigned char *buf)
+AllocColorPlanes(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request AllocNamedColor is opcode 85 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocNamedColor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request AllocColorPlanes is opcode 87 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* AllocColorPlanes */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  printfield(buf, 8, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[8]);
-  PrintString8(&buf[12], n, "name");
+    PrintField(buf, 1, 1, BOOL, "contiguous");
+    printreqlen(buf, fd, CONST2(4));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintField(buf, 8, 2, CARD16, "colors");
+    PrintField(buf, 10, 2, CARD16, "reds");
+    PrintField(buf, 12, 2, CARD16, "greens");
+    PrintField(buf, 14, 2, CARD16, "blues");
 }
 
 void
-AllocNamedColorReply (
-    const unsigned char *buf)
+AllocColorPlanesReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocNamedColor */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 4, CARD32, "pixel");
-  PrintField(buf, 12, 2, CARD16, "exact-red");
-  PrintField(buf, 14, 2, CARD16, "exact-green");
-  PrintField(buf, 16, 2, CARD16, "exact-blue");
-  PrintField(buf, 18, 2, CARD16, "visual-red");
-  PrintField(buf, 20, 2, CARD16, "visual-green");
-  PrintField(buf, 22, 2, CARD16, "visual-blue");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* AllocColorPlanes */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "number of pixels");
+    n = IShort(&buf[8]);
+    PrintField(buf, 12, 4, CARD32, "red-mask");
+    PrintField(buf, 16, 4, CARD32, "green-mask");
+    PrintField(buf, 20, 4, CARD32, "blue-mask");
+    PrintList(&buf[32], (long) n, CARD32, "pixels");
 }
 
 void
-AllocColorCells (
-    FD fd,
-    const unsigned char *buf)
+FreeColors(FD fd, const unsigned char *buf)
 {
-  /* Request AllocColorCells is opcode 86 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColorCells */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request FreeColors is opcode 88 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FreeColors */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, BOOL, "contiguous");
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintField(buf, 8, 2, CARD16, "colors");
-  PrintField(buf, 10, 2, CARD16, "planes");
-}
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    n = IShort(&buf[2]) - 3;
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintField(buf, 8, 4, CARD32, "plane-mask");
+    PrintList(&buf[12], (long) n, CARD32, "pixels");
+}
 
 void
-AllocColorCellsReply (
-    const unsigned char *buf)
+StoreColors(FD fd, const unsigned char *buf)
 {
-  short   n;
-  short   m;
-  short   k;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocColorCells */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n + m), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "number of pixels");
-  n = IShort(&buf[8]);
-  printfield(buf, 10, 2, DVALUE2(m), "number of masks");
-  m = IShort(&buf[10]);
-  k = PrintList(&buf[32], (long)n, CARD32, "pixels");
-  PrintList(&buf[32 + k], (long)m, CARD32, "masks");
-}
-
+    short n;
+
+    /* Request StoreColors is opcode 89 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* StoreColors */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(2 + 3 * n));
+    n = (IShort(&buf[2]) - 2) / 3;
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintList(&buf[8], (long) n, COLORITEM, "items");
+}
+
 void
-AllocColorPlanes (
-    FD fd,
-    const unsigned char *buf)
+StoreNamedColor(FD fd, const unsigned char *buf)
 {
-  /* Request AllocColorPlanes is opcode 87 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColorPlanes */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, BOOL, "contiguous");
-  printreqlen(buf, fd, CONST2(4));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintField(buf, 8, 2, CARD16, "colors");
-  PrintField(buf, 10, 2, CARD16, "reds");
-  PrintField(buf, 12, 2, CARD16, "greens");
-  PrintField(buf, 14, 2, CARD16, "blues");
+    short n;
+
+    /* Request StoreNamedColor is opcode 90 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* StoreNamedColor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, COLORMASK, "which colors?");
+    printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintField(buf, 8, 4, CARD32, "pixel");
+    printfield(buf, 12, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[12]);
+    PrintString8(&buf[16], n, "name");
 }
 
 void
-AllocColorPlanesReply (
-    const unsigned char *buf)
-{
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocColorPlanes */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "number of pixels");
-  n = IShort(&buf[8]);
-  PrintField(buf, 12, 4, CARD32, "red-mask");
-  PrintField(buf, 16, 4, CARD32, "green-mask");
-  PrintField(buf, 20, 4, CARD32, "blue-mask");
-  PrintList(&buf[32], (long)n, CARD32, "pixels");
+QueryColors(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request QueryColors is opcode 91 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryColors */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(2 + n));
+    n = IShort(&buf[2]) - 2;
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    PrintList(&buf[8], (long) n, CARD32, "pixels");
 }
 
 void
-FreeColors (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-
-  /* Request FreeColors is opcode 88 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeColors */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  n = IShort(&buf[2]) - 3;
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintField(buf, 8, 4, CARD32, "plane-mask");
-  PrintList(&buf[12], (long)n, CARD32, "pixels");
+QueryColorsReply(const unsigned char *buf)
+{
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryColors */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(2 * n), "reply length");
+    printfield(buf, 8, 2, DVALUE2(n), "number of colors");
+    n = IShort(&buf[8]);
+    PrintList(&buf[32], (long) n, RGB, "colors");
 }
 
 void
-StoreColors (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request StoreColors is opcode 89 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* StoreColors */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+LookupColor(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request LookupColor is opcode 92 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* LookupColor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(2 + 3*n));
-  n = (IShort(&buf[2]) - 2) / 3;
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintList(&buf[8], (long)n, COLORITEM, "items");
+    printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
+    PrintField(buf, 4, 4, COLORMAP, "cmap");
+    printfield(buf, 8, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[8]);
+    PrintString8(&buf[12], n, "name");
 }
 
 void
-StoreNamedColor (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request StoreNamedColor is opcode 90 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* StoreNamedColor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  PrintField(buf, 1, 1, COLORMASK, "which colors?");
-  printreqlen(buf, fd, DVALUE2(4 + (n + p) / 4));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintField(buf, 8, 4, CARD32, "pixel");
-  printfield(buf, 12, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[12]);
-  PrintString8(&buf[16], n, "name");
+LookupColorReply(const unsigned char *buf)
+{
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* LookupColor */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, CARD16, "exact-red");
+    PrintField(buf, 10, 2, CARD16, "exact-green");
+    PrintField(buf, 12, 2, CARD16, "exact-blue");
+    PrintField(buf, 14, 2, CARD16, "visual-red");
+    PrintField(buf, 16, 2, CARD16, "visual-green");
+    PrintField(buf, 18, 2, CARD16, "visual-blue");
 }
-
-void
-QueryColors (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request QueryColors is opcode 91 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryColors */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(2 + n));
-  n = IShort(&buf[2]) - 2;
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  PrintList(&buf[8], (long)n, CARD32, "pixels");
-}
-
-void
-QueryColorsReply (
-    const unsigned char *buf)
-{
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryColors */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(2*n), "reply length");
-  printfield(buf, 8, 2, DVALUE2(n), "number of colors");
-  n = IShort(&buf[8]);
-  PrintList(&buf[32], (long)n, RGB, "colors");
-}
-
-void
-LookupColor (
-    FD fd,
-    const unsigned char *buf)
-{
-  short   n;
-  /* Request LookupColor is opcode 92 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* LookupColor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, DVALUE2(3 + (n + p) / 4));
-  PrintField(buf, 4, 4, COLORMAP, "cmap");
-  printfield(buf, 8, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[8]);
-  PrintString8(&buf[12], n, "name");
-}
-
-void
-LookupColorReply (
-    const unsigned char *buf)
-{
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* LookupColor */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, CARD16, "exact-red");
-  PrintField(buf, 10, 2, CARD16, "exact-green");
-  PrintField(buf, 12, 2, CARD16, "exact-blue");
-  PrintField(buf, 14, 2, CARD16, "visual-red");
-  PrintField(buf, 16, 2, CARD16, "visual-green");
-  PrintField(buf, 18, 2, CARD16, "visual-blue");
-}
-
-void
-CreateCursor (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request CreateCursor is opcode 93 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateCursor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(8));
-  PrintField(buf, 4, 4, CURSOR, "cursor-id");
-  PrintField(buf, 8, 4, PIXMAP, "source");
-  PrintField(buf, 12, 4, PIXMAP, "mask");
-  PrintField(buf, 16, 2, CARD16, "fore-red");
-  PrintField(buf, 18, 2, CARD16, "fore-green");
-  PrintField(buf, 20, 2, CARD16, "fore-blue");
-  PrintField(buf, 22, 2, CARD16, "back-red");
-  PrintField(buf, 24, 2, CARD16, "back-green");
-  PrintField(buf, 26, 2, CARD16, "back-blue");
-  PrintField(buf, 28, 2, CARD16, "x");
-  PrintField(buf, 30, 2, CARD16, "y");
+
+void
+CreateCursor(FD fd, const unsigned char *buf)
+{
+    /* Request CreateCursor is opcode 93 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreateCursor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(8));
+    PrintField(buf, 4, 4, CURSOR, "cursor-id");
+    PrintField(buf, 8, 4, PIXMAP, "source");
+    PrintField(buf, 12, 4, PIXMAP, "mask");
+    PrintField(buf, 16, 2, CARD16, "fore-red");
+    PrintField(buf, 18, 2, CARD16, "fore-green");
+    PrintField(buf, 20, 2, CARD16, "fore-blue");
+    PrintField(buf, 22, 2, CARD16, "back-red");
+    PrintField(buf, 24, 2, CARD16, "back-green");
+    PrintField(buf, 26, 2, CARD16, "back-blue");
+    PrintField(buf, 28, 2, CARD16, "x");
+    PrintField(buf, 30, 2, CARD16, "y");
 }
 
 void
-CreateGlyphCursor (
-    FD fd,
-    const unsigned char *buf)
-{
-  /* Request CreateGlyphCursor is opcode 94 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateGlyphCursor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(8));
-  PrintField(buf, 4, 4, CURSOR, "cursor-id");
-  PrintField(buf, 8, 4, FONT, "source-font");
-  PrintField(buf, 12, 4, FONT, "mask-font");
-  PrintField(buf, 16, 2, CARD16, "source-char");
-  PrintField(buf, 18, 2, CARD16, "mask-char");
-  PrintField(buf, 20, 2, CARD16, "fore-red");
-  PrintField(buf, 22, 2, CARD16, "fore-green");
-  PrintField(buf, 24, 2, CARD16, "fore-blue");
-  PrintField(buf, 26, 2, CARD16, "back-red");
-  PrintField(buf, 28, 2, CARD16, "back-green");
-  PrintField(buf, 30, 2, CARD16, "back-blue");
-}
-
-void
-FreeCursor (
-    FD fd,
-    const unsigned char *buf)
+CreateGlyphCursor(FD fd, const unsigned char *buf)
 {
-  /* Request FreeCursor is opcode 95 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeCursor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
-
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, CURSOR, "cursor");
-}
-
-void
-RecolorCursor (
-    FD fd,
-    const unsigned char *buf)
+    /* Request CreateGlyphCursor is opcode 94 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* CreateGlyphCursor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, CONST2(8));
+    PrintField(buf, 4, 4, CURSOR, "cursor-id");
+    PrintField(buf, 8, 4, FONT, "source-font");
+    PrintField(buf, 12, 4, FONT, "mask-font");
+    PrintField(buf, 16, 2, CARD16, "source-char");
+    PrintField(buf, 18, 2, CARD16, "mask-char");
+    PrintField(buf, 20, 2, CARD16, "fore-red");
+    PrintField(buf, 22, 2, CARD16, "fore-green");
+    PrintField(buf, 24, 2, CARD16, "fore-blue");
+    PrintField(buf, 26, 2, CARD16, "back-red");
+    PrintField(buf, 28, 2, CARD16, "back-green");
+    PrintField(buf, 30, 2, CARD16, "back-blue");
+}
+
+void
+FreeCursor(FD fd, const unsigned char *buf)
 {
-  /* Request RecolorCursor is opcode 96 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* RecolorCursor */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request FreeCursor is opcode 95 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* FreeCursor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(5));
-  PrintField(buf, 4, 4, CURSOR, "cursor");
-  PrintField(buf, 8, 2, CARD16, "fore-red");
-  PrintField(buf, 10, 2, CARD16, "fore-green");
-  PrintField(buf, 12, 2, CARD16, "fore-blue");
-  PrintField(buf, 14, 2, CARD16, "back-red");
-  PrintField(buf, 16, 2, CARD16, "back-green");
-  PrintField(buf, 18, 2, CARD16, "back-blue");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, CURSOR, "cursor");
 }
 
 void
-QueryBestSize (
-    FD fd,
-    const unsigned char *buf)
+RecolorCursor(FD fd, const unsigned char *buf)
 {
-  /* Request QueryBestSize is opcode 97 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryBestSize */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request RecolorCursor is opcode 96 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* RecolorCursor */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, OBJECTCLASS, "class");
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 4, DRAWABLE, "drawable");
-  PrintField(buf, 8, 2, CARD16, "width");
-  PrintField(buf, 10, 2, CARD16, "height");
-}
+    printreqlen(buf, fd, CONST2(5));
+    PrintField(buf, 4, 4, CURSOR, "cursor");
+    PrintField(buf, 8, 2, CARD16, "fore-red");
+    PrintField(buf, 10, 2, CARD16, "fore-green");
+    PrintField(buf, 12, 2, CARD16, "fore-blue");
+    PrintField(buf, 14, 2, CARD16, "back-red");
+    PrintField(buf, 16, 2, CARD16, "back-green");
+    PrintField(buf, 18, 2, CARD16, "back-blue");
+}
 
 void
-QueryBestSizeReply (
-    const unsigned char *buf)
+QueryBestSize(FD fd, const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryBestSize */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, CARD16, "width");
-  PrintField(buf, 10, 2, CARD16, "height");
+    /* Request QueryBestSize is opcode 97 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryBestSize */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, OBJECTCLASS, "class");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 4, DRAWABLE, "drawable");
+    PrintField(buf, 8, 2, CARD16, "width");
+    PrintField(buf, 10, 2, CARD16, "height");
 }
 
 void
-QueryExtension (
-    FD fd,
-    const unsigned char *buf)
+QueryBestSizeReply(const unsigned char *buf)
 {
-  short   n;
-  /* Request QueryExtension is opcode 98 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryExtension */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryBestSize */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, CARD16, "width");
+    PrintField(buf, 10, 2, CARD16, "height");
+}
+
+void
+QueryExtension(FD fd, const unsigned char *buf)
+{
+    short n;
+
+    /* Request QueryExtension is opcode 98 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* QueryExtension */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  printfield(buf, 4, 2, DVALUE2(n), "length of name");
-  n = IShort(&buf[4]);
-  PrintString8(&buf[8], (long)n, "name");
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    printfield(buf, 4, 2, DVALUE2(n), "length of name");
+    n = IShort(&buf[4]);
+    PrintString8(&buf[8], (long) n, "name");
 }
 
 void
-QueryExtensionReply (
-    const unsigned char *buf)
+QueryExtensionReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryExtension */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 1, BOOL, "present");
-  PrintField(buf, 9, 1, CARD8, "major-opcode");
-  PrintField(buf, 10, 1, CARD8, "first-event");
-  PrintField(buf, 11, 1, CARD8, "first-error");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* QueryExtension */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 1, BOOL, "present");
+    PrintField(buf, 9, 1, CARD8, "major-opcode");
+    PrintField(buf, 10, 1, CARD8, "first-event");
+    PrintField(buf, 11, 1, CARD8, "first-error");
 }
 
 void
-ListExtensions (
-    FD fd,
-    const unsigned char *buf)
+ListExtensions(FD fd, const unsigned char *buf)
 {
-  /* Request ListExtensions is opcode 99 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListExtensions */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ListExtensions is opcode 99 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListExtensions */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-ListExtensionsReply (
-    const unsigned char *buf)
+ListExtensionsReply(const unsigned char *buf)
 {
-  short   n;
+    short n;
 
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListExtensions */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 1, 1, CARD8, "number names");
-  n = IByte(&buf[1]);
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  PrintListSTR(&buf[32], (long)n, "names");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListExtensions */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 1, 1, CARD8, "number names");
+    n = IByte(&buf[1]);
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    PrintListSTR(&buf[32], (long) n, "names");
 }
 
 void
-ChangeKeyboardMapping (
-    FD fd,
-    const unsigned char *buf)
+ChangeKeyboardMapping(FD fd, const unsigned char *buf)
 {
-  short   n;
-  short   m;
-  /* Request ChangeKeyboardMapping is opcode 100 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeKeyboardMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+    short m;
 
-  PrintField(buf, 1, 1, DVALUE1(n), "keycode-count");
-  n = IByte(&buf[1]);
-  printreqlen(buf, fd, DVALUE2(2 + nm));
-  PrintField(buf, 4, 1, KEYCODE, "first-keycode");
-  PrintField(buf, 5, 1, DVALUE1(m), "keysyms-per-keycode");
-  m = IByte(&buf[5]);
-  PrintList(&buf[8], (long)(n * m), KEYSYM, "keysyms");
+    /* Request ChangeKeyboardMapping is opcode 100 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeKeyboardMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, DVALUE1(n), "keycode-count");
+    n = IByte(&buf[1]);
+    printreqlen(buf, fd, DVALUE2(2 + nm));
+    PrintField(buf, 4, 1, KEYCODE, "first-keycode");
+    PrintField(buf, 5, 1, DVALUE1(m), "keysyms-per-keycode");
+    m = IByte(&buf[5]);
+    PrintList(&buf[8], (long) (n * m), KEYSYM, "keysyms");
 }
 
 void
-GetKeyboardMapping (
-    FD fd,
-    const unsigned char *buf)
+GetKeyboardMapping(FD fd, const unsigned char *buf)
 {
-  /* Request GetKeyboardMapping is opcode 101 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetKeyboardMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetKeyboardMapping is opcode 101 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetKeyboardMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 1, KEYCODE, "first-keycode");
-  PrintField(buf, 5, 1, CARD8, "count");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 1, KEYCODE, "first-keycode");
+    PrintField(buf, 5, 1, CARD8, "count");
 }
 
 void
-GetKeyboardMappingReply (
-    const unsigned char *buf)
+GetKeyboardMappingReply(const unsigned char *buf)
 {
-  long    n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetKeyboardMapping */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, DVALUE1(n), "keysyms-per-keycode");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n*m), "reply length");
-  n = ILong(&buf[4]);
-  PrintList(&buf[32], n, KEYSYM, "keysyms");
+    long n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetKeyboardMapping */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, DVALUE1(n), "keysyms-per-keycode");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n * m), "reply length");
+    n = ILong(&buf[4]);
+    PrintList(&buf[32], n, KEYSYM, "keysyms");
 }
 
 void
-ChangeKeyboardControl (
-    FD fd,
-    const unsigned char *buf)
+ChangeKeyboardControl(FD fd, const unsigned char *buf)
 {
-  /* Request ChangeKeyboardControl is opcode 102 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeKeyboardControl */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangeKeyboardControl is opcode 102 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeKeyboardControl */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, DVALUE2(2 + n));
-  PrintField(buf, 4, 4, KEYBOARD_BITMASK, "value-mask");
-  PrintValues(&buf[4], 4, KEYBOARD_BITMASK, &buf[8], "value-list");
+    printreqlen(buf, fd, DVALUE2(2 + n));
+    PrintField(buf, 4, 4, KEYBOARD_BITMASK, "value-mask");
+    PrintValues(&buf[4], 4, KEYBOARD_BITMASK, &buf[8], "value-list");
 }
 
 void
-GetKeyboardControl (
-    FD fd,
-    const unsigned char *buf)
+GetKeyboardControl(FD fd, const unsigned char *buf)
 {
-  /* Request GetKeyboardControl is opcode 103 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetKeyboardControl */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetKeyboardControl is opcode 103 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetKeyboardControl */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetKeyboardControlReply (
-    const unsigned char *buf)
+GetKeyboardControlReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetKeyboardControl */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, OFF_ON, "global-auto-repeat");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(5), "reply length");
-  PrintField(buf, 8, 4, CARD32, "led-mask");
-  PrintField(buf, 12, 1, CARD8, "key-click-percent");
-  PrintField(buf, 13, 1, CARD8, "bell-percent");
-  PrintField(buf, 14, 2, CARD16, "bell-pitch");
-  PrintField(buf, 16, 2, CARD16, "bell-duration");
-  PrintBytes(&buf[20], 32L, "auto-repeats");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetKeyboardControl */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, OFF_ON, "global-auto-repeat");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(5), "reply length");
+    PrintField(buf, 8, 4, CARD32, "led-mask");
+    PrintField(buf, 12, 1, CARD8, "key-click-percent");
+    PrintField(buf, 13, 1, CARD8, "bell-percent");
+    PrintField(buf, 14, 2, CARD16, "bell-pitch");
+    PrintField(buf, 16, 2, CARD16, "bell-duration");
+    PrintBytes(&buf[20], 32L, "auto-repeats");
 }
 
 void
-Bell (
-    FD fd,
-    const unsigned char *buf)
+Bell(FD fd, const unsigned char *buf)
 {
-  /* Request Bell is opcode 104 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* Bell */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request Bell is opcode 104 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* Bell */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, INT8, "percent");
-  printreqlen(buf, fd, CONST2(1));
+    PrintField(buf, 1, 1, INT8, "percent");
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-ChangePointerControl (
-    FD fd,
-    const unsigned char *buf)
+ChangePointerControl(FD fd, const unsigned char *buf)
 {
-  /* Request ChangePointerControl is opcode 105 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangePointerControl */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ChangePointerControl is opcode 105 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangePointerControl */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 2, INT16, "acceleration-numerator");
-  PrintField(buf, 6, 2, INT16, "acceleration-denominator");
-  PrintField(buf, 8, 2, INT16, "threshold");
-  PrintField(buf, 10, 1, BOOL, "do-acceleration");
-  PrintField(buf, 11, 1, BOOL, "do-threshold");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 2, INT16, "acceleration-numerator");
+    PrintField(buf, 6, 2, INT16, "acceleration-denominator");
+    PrintField(buf, 8, 2, INT16, "threshold");
+    PrintField(buf, 10, 1, BOOL, "do-acceleration");
+    PrintField(buf, 11, 1, BOOL, "do-threshold");
 }
 
 void
-GetPointerControl (
-    FD fd,
-    const unsigned char *buf)
+GetPointerControl(FD fd, const unsigned char *buf)
 {
-  /* Request GetPointerControl is opcode 106 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetPointerControl */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetPointerControl is opcode 106 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetPointerControl */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetPointerControlReply (
-    const unsigned char *buf)
+GetPointerControlReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetPointerControl */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, CARD16, "acceleration-numerator");
-  PrintField(buf, 10, 2, CARD16, "acceleration-denominator");
-  PrintField(buf, 12, 2, CARD16, "threshold");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetPointerControl */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, CARD16, "acceleration-numerator");
+    PrintField(buf, 10, 2, CARD16, "acceleration-denominator");
+    PrintField(buf, 12, 2, CARD16, "threshold");
 }
 
 void
-SetScreenSaver (
-    FD fd,
-    const unsigned char *buf)
+SetScreenSaver(FD fd, const unsigned char *buf)
 {
-  /* Request SetScreenSaver is opcode 107 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetScreenSaver */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SetScreenSaver is opcode 107 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetScreenSaver */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(3));
-  PrintField(buf, 4, 2, INT16, "timeout");
-  PrintField(buf, 6, 2, INT16, "interval");
-  PrintField(buf, 8, 1, NO_YES, "prefer-blanking");
-  PrintField(buf, 9, 1, NO_YES, "allow-exposures");
+    printreqlen(buf, fd, CONST2(3));
+    PrintField(buf, 4, 2, INT16, "timeout");
+    PrintField(buf, 6, 2, INT16, "interval");
+    PrintField(buf, 8, 1, NO_YES, "prefer-blanking");
+    PrintField(buf, 9, 1, NO_YES, "allow-exposures");
 }
 
 void
-GetScreenSaver (
-    FD fd,
-    const unsigned char *buf)
+GetScreenSaver(FD fd, const unsigned char *buf)
 {
-  /* Request GetScreenSaver is opcode 108 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetScreenSaver */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetScreenSaver is opcode 108 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetScreenSaver */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetScreenSaverReply (
-    const unsigned char *buf)
+GetScreenSaverReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetScreenSaver */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
-  PrintField(buf, 8, 2, CARD16, "timeout");
-  PrintField(buf, 10, 2, CARD16, "interval");
-  PrintField(buf, 12, 1, NO_YES, "prefer-blanking");
-  PrintField(buf, 13, 1, NO_YES, "allow-exposures");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetScreenSaver */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(buf, 8, 2, CARD16, "timeout");
+    PrintField(buf, 10, 2, CARD16, "interval");
+    PrintField(buf, 12, 1, NO_YES, "prefer-blanking");
+    PrintField(buf, 13, 1, NO_YES, "allow-exposures");
 }
 
 void
-ChangeHosts (
-    FD fd,
-    const unsigned char *buf)
+ChangeHosts(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request ChangeHosts is opcode 109 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeHosts */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request ChangeHosts is opcode 109 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ChangeHosts */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, INS_DEL, "mode");
-  printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
-  n = IShort(&buf[6]);
-  PrintField(buf, 4, 4+n, HOST, "host");
+    PrintField(buf, 1, 1, INS_DEL, "mode");
+    printreqlen(buf, fd, DVALUE2(2 + (n + p) / 4));
+    n = IShort(&buf[6]);
+    PrintField(buf, 4, 4 + n, HOST, "host");
 }
 
 void
-ListHosts (
-    FD fd,
-    const unsigned char *buf)
+ListHosts(FD fd, const unsigned char *buf)
 {
-  /* Request ListHosts is opcode 110 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListHosts */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ListHosts is opcode 110 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ListHosts */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-ListHostsReply (
-    const unsigned char *buf)
+ListHostsReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListHosts */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, DIS_EN, "mode");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(n / 4), "reply length");
-  printfield(buf, 8, 2, CARD16, "number of hosts");
-  n = IShort(&buf[8]);
-  PrintList(&buf[32], (long)n, HOST, "hosts");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* ListHosts */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, DIS_EN, "mode");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(n / 4), "reply length");
+    printfield(buf, 8, 2, CARD16, "number of hosts");
+
+    n = IShort(&buf[8]);
+    PrintList(&buf[32], (long) n, HOST, "hosts");
 }
 
 void
-SetAccessControl (
-    FD fd,
-    const unsigned char *buf)
+SetAccessControl(FD fd, const unsigned char *buf)
 {
-  /* Request SetAccessControl is opcode 111 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetAccessControl */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SetAccessControl is opcode 111 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetAccessControl */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, DIS_EN, "mode");
-  printreqlen(buf, fd, CONST2(1));
+    PrintField(buf, 1, 1, DIS_EN, "mode");
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-SetCloseDownMode (
-    FD fd,
-    const unsigned char *buf)
+SetCloseDownMode(FD fd, const unsigned char *buf)
 {
-  /* Request SetCloseDownMode is opcode 112 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetCloseDownMode */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request SetCloseDownMode is opcode 112 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetCloseDownMode */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, CLOSEMODE, "mode");
-  printreqlen(buf, fd, CONST2(1));
+    PrintField(buf, 1, 1, CLOSEMODE, "mode");
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-KillClient (
-    FD fd,
-    const unsigned char *buf)
+KillClient(FD fd, const unsigned char *buf)
 {
-  /* Request KillClient is opcode 113 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* KillClient */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request KillClient is opcode 113 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* KillClient */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(2));
-  PrintField(buf, 4, 4, RESOURCEID, "resource");
+    printreqlen(buf, fd, CONST2(2));
+    PrintField(buf, 4, 4, RESOURCEID, "resource");
 }
 
 void
-RotateProperties (
-    FD fd,
-    const unsigned char *buf)
+RotateProperties(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request RotateProperties is opcode 114 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* RotateProperties */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
 
-  printreqlen(buf, fd, DVALUE2(3 + n));
-  PrintField(buf, 4, 4, WINDOW, "window");
-  printfield(buf, 8, 2, DVALUE2(n), "number of properties");
-  n = IShort(&buf[8]);
-  PrintField(buf, 10, 2, INT16, "delta");
-  PrintList(&buf[12], (long)n, ATOM, "properties");
+    /* Request RotateProperties is opcode 114 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* RotateProperties */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    printreqlen(buf, fd, DVALUE2(3 + n));
+    PrintField(buf, 4, 4, WINDOW, "window");
+    printfield(buf, 8, 2, DVALUE2(n), "number of properties");
+    n = IShort(&buf[8]);
+    PrintField(buf, 10, 2, INT16, "delta");
+    PrintList(&buf[12], (long) n, ATOM, "properties");
 }
 
 void
-ForceScreenSaver (
-    FD fd,
-    const unsigned char *buf)
+ForceScreenSaver(FD fd, const unsigned char *buf)
 {
-  /* Request ForceScreenSaver is opcode 115 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ForceScreenSaver */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request ForceScreenSaver is opcode 115 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* ForceScreenSaver */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  PrintField(buf, 1, 1, SAVEMODE, "mode");
-  printreqlen(buf, fd, CONST2(1));
+    PrintField(buf, 1, 1, SAVEMODE, "mode");
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-SetPointerMapping (
-    FD fd,
-    const unsigned char *buf)
+SetPointerMapping(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request SetPointerMapping is opcode 116 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetPointerMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
+
+    /* Request SetPointerMapping is opcode 116 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetPointerMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printfield(buf, 1, 1, DVALUE1(n), "length of map");
-  n = IByte(&buf[1]);
-  printreqlen(buf, fd, DVALUE2(1 + (n + p) / 4));
-  PrintBytes(&buf[4], (long)n,"map");
+    printfield(buf, 1, 1, DVALUE1(n), "length of map");
+    n = IByte(&buf[1]);
+    printreqlen(buf, fd, DVALUE2(1 + (n + p) / 4));
+    PrintBytes(&buf[4], (long) n, "map");
 }
 
 void
-SetPointerMappingReply (
-    const unsigned char *buf)
+SetPointerMappingReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* SetPointerMapping */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, RSTATUS, "status");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* SetPointerMapping */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, RSTATUS, "status");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
 }
 
 void
-GetPointerMapping (
-    FD fd,
-    const unsigned char *buf)
+GetPointerMapping(FD fd, const unsigned char *buf)
 {
-  /* Request GetPointerMapping is opcode 117 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetPointerMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetPointerMapping is opcode 117 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetPointerMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetPointerMappingReply (
-    const unsigned char *buf)
+GetPointerMappingReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetPointerMapping */ ;
-  if (Verbose < 1)
-    return;
-  printfield(buf, 1, 1, DVALUE1(n), "length of map");
-  n = IByte(&buf[1]);
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
-  PrintBytes(&buf[32], (long)n,"map");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetPointerMapping */
+    if (Verbose < 1)
+        return;
+    printfield(buf, 1, 1, DVALUE1(n), "length of map");
+    n = IByte(&buf[1]);
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length");
+    PrintBytes(&buf[32], (long) n, "map");
 }
 
 void
-SetModifierMapping (
-    FD fd,
-    const unsigned char *buf)
+SetModifierMapping(FD fd, const unsigned char *buf)
 {
-  short   n;
-  /* Request SetModifierMapping is opcode 118 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetModifierMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    short n;
 
-  PrintField(buf, 1, 1, DVALUE1(n), "keycodes-per-modifier");
-  n = IByte(&buf[1]);
-  printreqlen(buf, fd, DVALUE2(1 + 2*n));
-  PrintBytes(&buf[4 + 0 * n], (long)n,"Shift keycodes");
-  PrintBytes(&buf[4 + 1 * n], (long)n,"Lock keycodes");
-  PrintBytes(&buf[4 + 2 * n], (long)n,"Control keycodes");
-  PrintBytes(&buf[4 + 3 * n], (long)n,"Mod1 keycodes");
-  PrintBytes(&buf[4 + 4 * n], (long)n,"Mod2 keycodes");
-  PrintBytes(&buf[4 + 5 * n], (long)n,"Mod3 keycodes");
-  PrintBytes(&buf[4 + 6 * n], (long)n,"Mod4 keycodes");
-  PrintBytes(&buf[4 + 7 * n], (long)n,"Mod5 keycodes");
+    /* Request SetModifierMapping is opcode 118 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* SetModifierMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
+
+    PrintField(buf, 1, 1, DVALUE1(n), "keycodes-per-modifier");
+    n = IByte(&buf[1]);
+    printreqlen(buf, fd, DVALUE2(1 + 2 * n));
+    PrintBytes(&buf[4 + 0 * n], (long) n, "Shift keycodes");
+    PrintBytes(&buf[4 + 1 * n], (long) n, "Lock keycodes");
+    PrintBytes(&buf[4 + 2 * n], (long) n, "Control keycodes");
+    PrintBytes(&buf[4 + 3 * n], (long) n, "Mod1 keycodes");
+    PrintBytes(&buf[4 + 4 * n], (long) n, "Mod2 keycodes");
+    PrintBytes(&buf[4 + 5 * n], (long) n, "Mod3 keycodes");
+    PrintBytes(&buf[4 + 6 * n], (long) n, "Mod4 keycodes");
+    PrintBytes(&buf[4 + 7 * n], (long) n, "Mod5 keycodes");
 }
 
 void
-SetModifierMappingReply (
-    const unsigned char *buf)
+SetModifierMappingReply(const unsigned char *buf)
 {
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* SetModifierMapping */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, RSTATUS, "status");
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, CONST4(0), "reply length");
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* SetModifierMapping */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, RSTATUS, "status");
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, CONST4(0), "reply length");
 }
 
 void
-GetModifierMapping (
-    FD fd,
-    const unsigned char *buf)
+GetModifierMapping(FD fd, const unsigned char *buf)
 {
-  /* Request GetModifierMapping is opcode 119 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetModifierMapping */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request GetModifierMapping is opcode 119 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* GetModifierMapping */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }
 
 void
-GetModifierMappingReply (
-    const unsigned char *buf)
+GetModifierMappingReply(const unsigned char *buf)
 {
-  short   n;
-  PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetModifierMapping */ ;
-  if (Verbose < 1)
-    return;
-  PrintField(buf, 1, 1, DVALUE1(n), "keycodes-per-modifier");
-  n = IByte(&buf[1]);
-  printfield(buf, 2, 2, CARD16, "sequence number");
-  printfield(buf, 4, 4, DVALUE4(2*n), "reply length");
-  PrintList(&buf[32], (long)n, KEYCODE, "keycodes");
+    short n;
+
+    PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetModifierMapping */
+    if (Verbose < 1)
+        return;
+    PrintField(buf, 1, 1, DVALUE1(n), "keycodes-per-modifier");
+    n = IByte(&buf[1]);
+    printfield(buf, 2, 2, CARD16, "sequence number");
+    printfield(buf, 4, 4, DVALUE4(2 * n), "reply length");
+    PrintList(&buf[32], (long) n, KEYCODE, "keycodes");
 }
 
 void
-NoOperation (
-    FD fd,
-    const unsigned char *buf)
+NoOperation(FD fd, const unsigned char *buf)
 {
-  /* Request NoOperation is opcode 127 */
-  PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* NoOperation */ ;
-  if (Verbose < 1)
-    return;
-  if (Verbose > 1)
-    PrintField(SBf, 0, 4, CARD32, "sequence number");
+    /* Request NoOperation is opcode 127 */
+    PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* NoOperation */
+    if (Verbose < 1)
+        return;
+    if (Verbose > 1)
+        PrintField(SBf, 0, 4, CARD32, "sequence number");
 
-  printreqlen(buf, fd, CONST2(1));
+    printreqlen(buf, fd, CONST2(1));
 }