diff options
| -rw-r--r-- | audio.c | 192 | ||||
| -rw-r--r-- | bigreqscope.h | 6 | ||||
| -rw-r--r-- | common.c | 25 | ||||
| -rw-r--r-- | decode11.c | 121 | ||||
| -rw-r--r-- | decode_bigreq.c | 23 | ||||
| -rw-r--r-- | decode_lbx.c | 37 | ||||
| -rw-r--r-- | decode_randr.c | 30 | ||||
| -rw-r--r-- | decode_render.c | 76 | ||||
| -rw-r--r-- | decode_shm.c | 37 | ||||
| -rw-r--r-- | decode_wcp.c | 30 | ||||
| -rw-r--r-- | decodenas.c | 45 | ||||
| -rw-r--r-- | fd.c | 40 | ||||
| -rw-r--r-- | fd.h | 6 | ||||
| -rw-r--r-- | lbxscope.h | 16 | ||||
| -rw-r--r-- | nas.h | 76 | ||||
| -rw-r--r-- | print11.c | 889 | ||||
| -rw-r--r-- | print_bigreq.c | 2 | ||||
| -rw-r--r-- | print_lbx.c | 63 | ||||
| -rw-r--r-- | print_randr.c | 17 | ||||
| -rw-r--r-- | print_render.c | 80 | ||||
| -rw-r--r-- | print_shm.c | 13 | ||||
| -rw-r--r-- | print_wcp.c | 132 | ||||
| -rw-r--r-- | printnas.c | 382 | ||||
| -rw-r--r-- | proto.h | 570 | ||||
| -rw-r--r-- | prtype.c | 95 | ||||
| -rw-r--r-- | randrscope.h | 14 | ||||
| -rw-r--r-- | renderscope.h | 43 | ||||
| -rw-r--r-- | scope.c | 255 | ||||
| -rw-r--r-- | scope.h | 26 | ||||
| -rw-r--r-- | server.c | 221 | ||||
| -rw-r--r-- | shmscope.h | 15 | ||||
| -rw-r--r-- | table11.c | 129 | ||||
| -rw-r--r-- | wcpscope.h | 14 | ||||
| -rw-r--r-- | x11.h | 39 |
34 files changed, 2114 insertions, 1645 deletions
@@ -37,14 +37,12 @@ #include <netinet/tcp.h> #include <netdb.h> /* struct servent * and struct hostent * */ #include <errno.h> /* for EINTR, EADDRINUSE, ... */ -extern int errno; -extern char ScopeEnabled; - -ReportFromAudioClient (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static void +ReportFromAudioClient ( + FD fd, + unsigned char *buf, + long n) { if (NasVerbose) { if (ScopeEnabled) { @@ -56,10 +54,11 @@ ReportFromAudioClient (fd, buf, n) ProcessBuffer (fd, buf, n); } -ReportFromAudioServer(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static void +ReportFromAudioServer( + FD fd, + unsigned char *buf, + long n) { if (NasVerbose) { if (ScopeEnabled) { @@ -71,18 +70,18 @@ ReportFromAudioServer(fd, buf, n) ProcessBuffer(fd, buf, n); } -extern long StartAudioSetUpMessage (); -extern long FinishAudioSetUpMessage (); -extern long StartAudioRequest (); -extern long FinishAudioRequest (); -extern long StartAudioSetUpReply (); -extern long FinishAudioSetUpReply (); -extern long AudioServerPacket (); -extern long FinishAudioReply (); -extern long FlushFD (); - -StartAudioClientConnection(fd) - FD fd; +static long StartAudioSetUpMessage (FD fd, unsigned char *buf, long n); +static long FinishAudioSetUpMessage (FD fd, unsigned char *buf, long n); +static long StartAudioRequest (FD fd, unsigned char *buf, long n); +static long FinishAudioRequest (FD fd, unsigned char *buf, long n); +static long StartAudioSetUpReply (FD fd, unsigned char *buf, long n); +static long FinishAudioSetUpReply (FD fd, unsigned char *buf, long n); +static long FinishAudioReply (FD fd, unsigned char *buf, long n); +static long AudioServerPacket (FD fd, unsigned char *buf, long n); + +static void +StartAudioClientConnection( + FD fd) { enterprocedure("StartAudioClientConnection"); /* when a new connection is started, we have no saved bytes */ @@ -102,8 +101,9 @@ StartAudioClientConnection(fd) CS[fd].NumberofBytesNeeded = 12; } -StopAudioClientConnection(fd) - FD fd; +static void +StopAudioClientConnection( + FD fd) { enterprocedure("StopAudioClientConnection"); /* when a new connection is stopped, discard the old buffer */ @@ -112,14 +112,14 @@ StopAudioClientConnection(fd) Free((char*)CS[fd].SavedBytes); } -long StartAudioSetUpMessage (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +StartAudioSetUpMessage ( + FD fd, + unsigned char *buf, + long n) { short namelength; short datalength; - extern int littleEndian; enterprocedure("StartSetUpMessage"); /* @@ -142,10 +142,11 @@ long StartAudioSetUpMessage (fd, buf, n) return(0); } -long FinishAudioSetUpMessage (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishAudioSetUpMessage ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishSetUpMessage"); if (ScopeEnabled) @@ -158,10 +159,11 @@ long FinishAudioSetUpMessage (fd, buf, n) } -long StartAudioRequest (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +StartAudioRequest ( + FD fd, + unsigned char *buf, + long n) { unsigned short requestlength; enterprocedure("StartRequest"); @@ -176,10 +178,11 @@ long StartAudioRequest (fd, buf, n) } -long FinishAudioRequest (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishAudioRequest ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishRequest"); CS[fd].ByteProcessing = StartAudioRequest; @@ -189,8 +192,9 @@ long FinishAudioRequest (fd, buf, n) return(n); } -StartAudioServerConnection(fd) - FD fd; +static void +StartAudioServerConnection( + FD fd) { enterprocedure("StartAudioServerConnection"); /* when a new connection is started, we have no saved bytes */ @@ -207,8 +211,9 @@ StartAudioServerConnection(fd) CS[fd].NumberofBytesNeeded = 8; } -StopAudioServerConnection(fd) - FD fd; +static void +StopAudioServerConnection( + FD fd) { enterprocedure("StopAudioServerConnection"); /* when a new connection is stopped, discard the old buffer */ @@ -217,10 +222,11 @@ StopAudioServerConnection(fd) Free((char *)CS[fd].SavedBytes); } -long StartAudioSetUpReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +StartAudioSetUpReply ( + FD fd, + unsigned char *buf, + long n) { short replylength; @@ -233,10 +239,11 @@ long StartAudioSetUpReply (fd, buf, n) return(0); } -long FinishAudioSetUpReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishAudioSetUpReply ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishSetUpReply"); if (ScopeEnabled) @@ -248,10 +255,11 @@ long FinishAudioSetUpReply (fd, buf, n) /* ************************************************************ */ -long AudioErrorPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +AudioErrorPacket ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = AudioServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -260,10 +268,11 @@ long AudioErrorPacket (fd, buf, n) } -long AudioEventPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +AudioEventPacket ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = AudioServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -273,10 +282,11 @@ long AudioEventPacket (fd, buf, n) } -long AudioReplyPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +AudioReplyPacket ( + FD fd, + unsigned char *buf, + long n) { long replylength; @@ -298,10 +308,11 @@ long AudioReplyPacket (fd, buf, n) return(0); } -long FinishAudioReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishAudioReply ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = AudioServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -311,10 +322,11 @@ long FinishAudioReply (fd, buf, n) return(n); } -long AudioServerPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +AudioServerPacket ( + FD fd, + unsigned char *buf, + long n) { short PacketType; enterprocedure("ServerPacket"); @@ -327,8 +339,9 @@ long AudioServerPacket (fd, buf, n) return(AudioEventPacket(fd, buf, n)); } -CloseAudioConnection(fd) - FD fd; +static void +CloseAudioConnection( + FD fd) { debug(4,(stderr, "close %d and %d\n", fd, FDPair(fd))); StopAudioClientConnection(ServerHalf(fd)); @@ -344,8 +357,9 @@ CloseAudioConnection(fd) server for this client, then dump it to the client. Note, we don't have to have a server, if there isn't one. */ -DataFromAudioClient(fd) - FD fd; +static void +DataFromAudioClient( + FD fd) { long n; FD ServerFD; @@ -397,8 +411,9 @@ DataFromAudioClient(fd) /* similar situation for the server, but note that if there is no client, we close the connection down -- don't need a server with no client. */ -DataFromAudioServer(fd) - FD fd; +static void +DataFromAudioServer( + FD fd) { long n; FD ClientFD; @@ -438,8 +453,9 @@ DataFromAudioServer(fd) ReportFromAudioServer(fd, FDinfo[ClientFD].buffer, n); } -FD ConnectToAudioClient(ConnectionSocket) - FD ConnectionSocket; +static FD +ConnectToAudioClient( + FD ConnectionSocket) { FD ClientFD; ClientFD = AcceptConnection(ConnectionSocket); @@ -448,8 +464,8 @@ FD ConnectToAudioClient(ConnectionSocket) return(ClientFD); } -FD ConnectToAudioServer(report) - Boolean report; +static FD ConnectToAudioServer( + Boolean report) { FD ServerFD; XtransConnInfo trans_conn = NULL; /* transport connection object */ @@ -465,8 +481,9 @@ FD ConnectToAudioServer(report) return(ServerFD); } -NewAudio (fd) - FD fd; +void +NewAudio ( + FD fd) { FD ServerFD = -1; FD ClientFD = -1; @@ -476,7 +493,8 @@ NewAudio (fd) SetUpPair(ClientFD, ServerFD); } -InitializeAudio () +void +InitializeAudio (void) { InitializeAudioDecode (); } diff --git a/bigreqscope.h b/bigreqscope.h index 80648f1..b127df8 100644 --- a/bigreqscope.h +++ b/bigreqscope.h @@ -13,5 +13,11 @@ #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForBIGREQFlag; +extern unsigned char BIGREQRequest; + +extern void BigreqEnable (FD fd, unsigned char *buf); +extern void BigreqEnableReply (FD fd, unsigned char *buf); + #endif @@ -70,22 +70,19 @@ /* ********************************************** */ void -enterprocedure(s) - char *s; +enterprocedure (char *s) { debug(2,(stderr, "-> %s\n", s)); } void -warn(s) - char *s; +warn (char *s) { fprintf(stderr, "####### %s\n", s); } void -panic(s) - char *s; +panic (char *s) { fprintf(stderr, "%s\n", s); exit(1); @@ -97,7 +94,8 @@ panic(s) /* */ /* ********************************************** */ -void *Malloc (long n) +void * +Malloc (long n) { void *p; p = malloc(n); @@ -167,17 +165,13 @@ static void SignalCONT(int sig) static void SignalUSR1(int sig) { - extern char ScopeEnabled; - debug(1,(stderr, "==> SIGCONT received\n")); ScopeEnabled = ! ScopeEnabled; } void -SetSignalHandling() +SetSignalHandling(void) { - extern char HandleSIGUSR1; - enterprocedure("SetSignalHandling"); (void)signal(SIGURG, SignalURG); (void)signal(SIGPIPE, SignalPIPE); @@ -227,15 +221,14 @@ static int ON = 1 /* used in ioctl */ ; #endif void -SetUpConnectionSocket(iport, connectionFunc) - int iport; - int (*connectionFunc)(); +SetUpConnectionSocket( + int iport, + void (*connectionFunc)(int)) { #ifdef USE_XTRANS char port[20]; int partial; int i; - extern long ServerBasePort; #else FD ConnectionSocket; struct sockaddr_in sin; @@ -55,6 +55,12 @@ #include "scope.h" #include "x11.h" +#include "bigreqscope.h" +#include "lbxscope.h" +#include "randrscope.h" +#include "renderscope.h" +#include "shmscope.h" +#include "wcpscope.h" #ifdef SYSV #define bzero(s,l) memset(s, 0, l) @@ -104,10 +110,11 @@ struct QueueEntry static struct QueueEntry *FreeQEntries = NULL; /* ************************************************************ */ -static struct QueueEntry *NewQEntry (SequenceNumber, Request, RequestMinor) - long SequenceNumber; - short Request; - short RequestMinor; +static struct QueueEntry * +NewQEntry ( + long SequenceNumber, + short Request, + short RequestMinor) { struct QueueEntry *p; @@ -146,7 +153,7 @@ static struct QueueHeader ReplyQ[StaticMaxFD]; /* ************************************************************ */ void -InitReplyQ() +InitReplyQ (void) { short i; for (i = 0; i < StaticMaxFD; i++) @@ -157,8 +164,8 @@ InitReplyQ() } void -FlushReplyQ(fd) -FD fd; +FlushReplyQ ( + FD fd) { struct QueueEntry *p; struct QueueEntry *NextQEntry; @@ -178,8 +185,8 @@ FD fd; } static void -DumpReplyQ(fd) - FD fd; +DumpReplyQ ( + FD fd) { fprintf(stderr, "ReplyQ[%d] = { Head 0x%x; Tail 0x%x }\n", fd, ReplyQ[fd].Head, ReplyQ[fd].Tail); @@ -199,10 +206,11 @@ DumpReplyQ(fd) with this one */ static void -SequencedReplyExpected(fd, SequenceNumber, RequestType, RequestMinorType) - FD fd; - long SequenceNumber; - short RequestType; +SequencedReplyExpected ( + FD fd, + long SequenceNumber, + short RequestType, + short RequestMinorType) { struct QueueEntry *p; @@ -235,10 +243,11 @@ static short LastReplyMinorType; /* search for the type of request that is associated with a reply to the given sequence number for this fd */ -short CheckReplyTable (fd, SequenceNumber, minorp) - FD fd; - short SequenceNumber; - short *minorp; +short +CheckReplyTable ( + FD fd, + short SequenceNumber, + short *minorp) { struct QueueEntry *p; struct QueueEntry *trailer; @@ -288,17 +297,18 @@ short CheckReplyTable (fd, SequenceNumber, minorp) sequence number associated with this fd */ void -ReplyExpected(fd, Request) - FD fd; - short Request; +ReplyExpected ( + FD fd, + short Request) { SequencedReplyExpected(fd, CS[fd].SequenceNumber, Request, 0); } -ExtendedReplyExpected (fd, Request, RequestMinor) - FD fd; - short Request; - short RequestMinor; +void +ExtendedReplyExpected ( + FD fd, + short Request, + short RequestMinor) { SequencedReplyExpected(fd, CS[fd].SequenceNumber, Request, RequestMinor); } @@ -308,7 +318,7 @@ ExtendedReplyExpected (fd, Request, RequestMinor) /* This is only used with ListFontsWithInfo */ void -KeepLastReplyExpected() +KeepLastReplyExpected (void) { SequencedReplyExpected(Lastfd, LastSequenceNumber, LastReplyType, LastReplyMinorType); @@ -326,7 +336,8 @@ static char *simple_names[] = { "ERROR ", }; -SimpleDump (type, fd, Major, Minor, bytes) +static void +SimpleDump (int type, FD fd, short Major, short Minor, long bytes) { PrintTime (); fprintf (stdout, "@@%s %3d %3d %3d %7d\n", @@ -340,37 +351,11 @@ SimpleDump (type, fd, Major, Minor, bytes) /* */ /* ************************************************************ */ -extern unsigned char LookForLBXFlag; -extern unsigned char LBXRequest; -extern unsigned char LBXError; -extern unsigned char LBXEvent; - -extern unsigned char LookForWCPFlag; -extern unsigned char WCPRequest; -extern unsigned char WCPError; - -extern unsigned char LookForRENDERFlag; -extern unsigned char RENDERRequest; -extern unsigned char RENDERError; -#define RENDERNError 5 - -extern unsigned char LookForRANDRFlag; -extern unsigned char RANDRRequest; -extern unsigned char RANDREvent; - -extern unsigned char LookForMITSHMFlag; -extern unsigned char MITSHMRequest; -extern unsigned char MITSHMError; -extern unsigned char MITSHMEvent; - -extern unsigned char LookForBIGREQFlag; -extern unsigned char BIGREQRequest; - void -DecodeRequest(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +DecodeRequest ( + FD fd, + unsigned char *buf, + long n) { short Request = IByte (&buf[0]); short RequestMinor = Request >= 128 ? IByte (&buf[1]) : 0; @@ -857,10 +842,10 @@ DecodeRequest(fd, buf, n) /* ************************************************************ */ void -DecodeReply(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +DecodeReply ( + FD fd, + unsigned char *buf, + long n) { short SequenceNumber = IShort (&buf[2]); short RequestMinor; @@ -1029,10 +1014,10 @@ DecodeReply(fd, buf, n) /* ************************************************************ */ void -DecodeError(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +DecodeError ( + FD fd, + unsigned char *buf, + long n) { short Error = IByte (&buf[1]); short Request = 0; @@ -1125,10 +1110,10 @@ DecodeError(fd, buf, n) /* ************************************************************ */ void -DecodeEvent(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +DecodeEvent ( + FD fd, + unsigned char *buf, + long n) { short Event = IByte (&buf[0]); short EventMinor = Event == LBXEvent ? IByte (&buf[1]) : 0; diff --git a/decode_bigreq.c b/decode_bigreq.c index 1a75265..d359a5a 100644 --- a/decode_bigreq.c +++ b/decode_bigreq.c @@ -34,9 +34,10 @@ unsigned char LookForBIGREQFlag; unsigned char BIGREQRequest; -bigreq_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +bigreq_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -51,20 +52,22 @@ unsigned char *buf; } } -bigreq_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +bigreq_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: BigreqEnableReply (fd, buf); break; } } -InitializeBIGREQ(buf) - unsigned char *buf; +void +InitializeBIGREQ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; BIGREQRequest = (unsigned char)(buf[9]); LookForBIGREQFlag = 0; diff --git a/decode_lbx.c b/decode_lbx.c index 5aced31..46ea90a 100644 --- a/decode_lbx.c +++ b/decode_lbx.c @@ -35,9 +35,10 @@ unsigned char LookForLBXFlag; unsigned char LBXRequest, LBXEvent, LBXError; -lbx_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +lbx_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -70,10 +71,11 @@ unsigned char *buf; } } -lbx_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +lbx_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: @@ -84,9 +86,10 @@ lbx_decode_reply(fd, buf, RequestMinor) } } -lbx_decode_error(fd, buf) - FD fd; - unsigned char *buf; +void +lbx_decode_error ( + FD fd, + unsigned char *buf) { short error = IByte(&buf[1]) - LBXError; @@ -98,9 +101,10 @@ lbx_decode_error(fd, buf) } } -lbx_decode_event (fd, buf) - FD fd; - unsigned char *buf; +void +lbx_decode_event ( + FD fd, + unsigned char *buf) { short event = IByte(&buf[0]) - LBXEvent; @@ -116,10 +120,11 @@ lbx_decode_event (fd, buf) } } -InitializeLBX(buf) - unsigned char *buf; +void +InitializeLBX ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; LBXRequest = (unsigned char)(buf[9]); LBXEvent = (unsigned char)(buf[10]); diff --git a/decode_randr.c b/decode_randr.c index dfe9a3d..aa86de5 100644 --- a/decode_randr.c +++ b/decode_randr.c @@ -35,9 +35,10 @@ unsigned char LookForRANDRFlag; unsigned char RANDRRequest, RANDRError, RANDREvent; -randr_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +randr_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -52,10 +53,11 @@ unsigned char *buf; } } -randr_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +randr_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: RandrQueryVersionReply (fd, buf); break; @@ -64,17 +66,19 @@ randr_decode_reply(fd, buf, RequestMinor) } } -randr_decode_event (fd, buf) - FD fd; - unsigned char *buf; +void +randr_decode_event ( + FD fd, + unsigned char *buf) { RandrScreenChangeNotifyEvent (buf); } -InitializeRANDR(buf) - unsigned char *buf; +void +InitializeRANDR ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; RANDRRequest = (unsigned char)(buf[9]); RANDREvent = (unsigned char)(buf[10]); diff --git a/decode_render.c b/decode_render.c index 8e52d54..ccad5ee 100644 --- a/decode_render.c +++ b/decode_render.c @@ -35,9 +35,10 @@ unsigned char LookForRENDERFlag; unsigned char RENDERRequest, RENDERError; -render_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +render_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -75,10 +76,11 @@ unsigned char *buf; } } -render_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +render_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: RenderQueryVersionReply (fd, buf); break; @@ -88,9 +90,10 @@ render_decode_reply(fd, buf, RequestMinor) } } -render_decode_error(fd, buf) - FD fd; - unsigned char *buf; +void +render_decode_error ( + FD fd, + unsigned char *buf) { short error = IByte(&buf[1]) - RENDERError; @@ -105,9 +108,9 @@ render_decode_error(fd, buf) } } - -PrintPICTURE(buf) - unsigned char *buf; +static int +PrintPICTURE ( + unsigned char *buf) { /* print a WINDOW -- CARD32 plus 0 = None */ long n = ILong (buf); @@ -118,8 +121,9 @@ PrintPICTURE(buf) return(4); } -PrintPICTFORMAT(buf) - unsigned char *buf; +static int +PrintPICTFORMAT ( + unsigned char *buf) { /* print a WINDOW -- CARD32 plus 0 = None */ long n = ILong (buf); @@ -130,8 +134,9 @@ PrintPICTFORMAT(buf) return(4); } -PrintPICTFORMINFO(buf) - unsigned char *buf; +static int +PrintPICTFORMINFO ( + unsigned char *buf) { /* print a PictFormInfo */ long n = ILong(buf); @@ -153,8 +158,9 @@ PrintPICTFORMINFO(buf) return(28); } -PrintGLYPHSET(buf) - unsigned char *buf; +static int +PrintGLYPHSET ( + unsigned char *buf) { /* print a GLYPHSET -- CARD32 plus 0 = None */ long n = ILong (buf); @@ -165,8 +171,9 @@ PrintGLYPHSET(buf) return(4); } -PrintRENDERCOLOR(buf) - unsigned char *buf; +static int +PrintRENDERCOLOR ( + unsigned char *buf) { /* print a RENDERCOLOR */ unsigned short r, g, b, a; @@ -179,8 +186,9 @@ PrintRENDERCOLOR(buf) return(8); } -PrintFIXED(buf) - unsigned char *buf; +static int +PrintFIXED ( + unsigned char *buf) { /* print a PICTURE */ long n = ILong (buf); @@ -188,8 +196,9 @@ PrintFIXED(buf) return 4; } -PrintPOINTFIXED(buf) - unsigned char *buf; +static int +PrintPOINTFIXED ( + unsigned char *buf) { long x = ILong (buf); long y = ILong (buf+4); @@ -197,8 +206,9 @@ PrintPOINTFIXED(buf) return 8; } -PrintTRAPEZOID(buf) - unsigned char *buf; +static int +PrintTRAPEZOID ( + unsigned char *buf) { /* print a TRAPEZOID */ PrintField (buf, 0, 4, FIXED, "top"); @@ -210,8 +220,9 @@ PrintTRAPEZOID(buf) return 40; } -PrintTRIANGLE(buf) - unsigned char *buf; +static int +PrintTRIANGLE ( + unsigned char *buf) { /* print a TRIANGLE */ PrintField (buf, 0, 8, POINTFIXED, "p1"); @@ -220,10 +231,11 @@ PrintTRIANGLE(buf) return 24; } -InitializeRENDER(buf) - unsigned char *buf; +void +InitializeRENDER ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; RENDERRequest = (unsigned char)(buf[9]); RENDERError = (unsigned char)(buf[11]); diff --git a/decode_shm.c b/decode_shm.c index da2b74c..f47712c 100644 --- a/decode_shm.c +++ b/decode_shm.c @@ -34,9 +34,10 @@ unsigned char LookForMITSHMFlag; unsigned char MITSHMRequest, MITSHMError, MITSHMEvent; -mitshm_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +mitshm_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -53,10 +54,11 @@ unsigned char *buf; } } -mitshm_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +mitshm_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: MitshmQueryVersionReply (fd, buf); break; @@ -64,15 +66,17 @@ mitshm_decode_reply(fd, buf, RequestMinor) } } -mitshm_decode_event(fd, buf) - FD fd; - unsigned char *buf; +void +mitshm_decode_event ( + FD fd, + unsigned char *buf) { } -mitshm_decode_error(fd, buf) - FD fd; - unsigned char *buf; +void +mitshm_decode_error ( + FD fd, + unsigned char *buf) { short error = IByte(&buf[0]) - MITSHMError; @@ -84,10 +88,11 @@ mitshm_decode_error(fd, buf) } -InitializeMITSHM(buf) - unsigned char *buf; +void +InitializeMITSHM ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; MITSHMRequest = (unsigned char)(buf[9]); MITSHMEvent = (unsigned char)(buf[10]); diff --git a/decode_wcp.c b/decode_wcp.c index f6529c2..ba93efb 100644 --- a/decode_wcp.c +++ b/decode_wcp.c @@ -35,9 +35,10 @@ unsigned char LookForWCPFlag; unsigned char WCPRequest, WCPError; -wcp_decode_req(fd, buf) -FD fd; -unsigned char *buf; +void +wcp_decode_req ( + FD fd, + unsigned char *buf) { short Major = IByte (&buf[0]); short Minor = IByte (&buf[1]); @@ -71,10 +72,11 @@ unsigned char *buf; } } -wcp_decode_reply(fd, buf, RequestMinor) - FD fd; - unsigned char *buf; - short RequestMinor; +void +wcp_decode_reply ( + FD fd, + unsigned char *buf, + short RequestMinor) { switch (RequestMinor) { case 0: @@ -88,9 +90,10 @@ wcp_decode_reply(fd, buf, RequestMinor) } } -wcp_decode_error(fd, buf) - FD fd; - unsigned char *buf; +void +wcp_decode_error ( + FD fd, + unsigned char *buf) { short error = IByte(&buf[1]) - WCPError; @@ -102,10 +105,11 @@ wcp_decode_error(fd, buf) } } -InitializeWCP(buf) - unsigned char *buf; +void +InitializeWCP ( + unsigned char *buf) { - TYPE p, DefineType (); + TYPE p; WCPRequest = (unsigned char)(buf[9]); WCPError = (unsigned char)(buf[11]); diff --git a/decodenas.c b/decodenas.c index 687c344..d00ecef 100644 --- a/decodenas.c +++ b/decodenas.c @@ -52,7 +52,8 @@ static char *simple_names[] = { "ERROR ", }; -AudioSimpleDump (type, fd, Major, Minor, bytes) +static void +AudioSimpleDump (int type, FD fd, short Major, short Minor, long bytes) { PrintTime (); fprintf (stdout, "@@%s %3d %3d %3d %7d\n", @@ -66,10 +67,11 @@ AudioSimpleDump (type, fd, Major, Minor, bytes) /* */ /* ************************************************************ */ -DecodeAudioRequest(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +void +DecodeAudioRequest( + FD fd, + unsigned char *buf, + long n) { short Request = IByte (&buf[0]); short RequestMinor = Request >= 128 ? IByte (&buf[1]) : 0; @@ -238,10 +240,11 @@ DecodeAudioRequest(fd, buf, n) /* */ /* ************************************************************ */ -DecodeAudioReply(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +void +DecodeAudioReply( + FD fd, + unsigned char *buf, + long n) { short SequenceNumber = IShort (&buf[2]); short RequestMinor; @@ -276,7 +279,7 @@ DecodeAudioReply(fd, buf, n) AudioGetBucketAttributesReply (buf); break; case 11: - AudioListRadiosReply (); + AudioListRadiosReply (buf); break; case 12: AudioGetRadioAttributesReply (buf); @@ -322,10 +325,11 @@ DecodeAudioReply(fd, buf, n) /* */ /* ************************************************************ */ -DecodeAudioError(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +void +DecodeAudioError( + FD fd, + unsigned char *buf, + long n) { short Error = IByte (&buf[1]); short Request = 0; @@ -349,10 +353,11 @@ DecodeAudioError(fd, buf, n) /* */ /* ************************************************************ */ -DecodeAudioEvent(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +void +DecodeAudioEvent( + FD fd, + unsigned char *buf, + long n) { short Event = IByte (&buf[0]); short EventMinor = 0; @@ -395,10 +400,10 @@ DecodeAudioEvent(fd, buf, n) } } -InitializeAudioDecode () +void +InitializeAudioDecode (void) { TYPE p; - extern TYPE DefineType (); p = DefineType (NASREQUEST, ENUMERATED, "NASREQUEST", PrintENUMERATED); DefineEValue (p, 1L, "ListDevices"); @@ -74,7 +74,6 @@ #include <netinet/tcp.h> #include <netdb.h> /* struct servent * and struct hostent * */ #include <errno.h> /* for EINTR, EADDRINUSE, ... */ -extern int errno; /* @@ -92,7 +91,7 @@ extern int errno; /* ************************************************************ */ void -InitializeFD() +InitializeFD(void) { register short i; @@ -145,11 +144,11 @@ InitializeFD() /* ************************************************************ */ void -UsingFD(fd, Handler, FlushHandler, trans_conn) - FD fd; - void (*Handler)(int); - void (*FlushHandler)(int); - XtransConnInfo trans_conn; +UsingFD( + FD fd, + void (*Handler)(int), + void (*FlushHandler)(int), + XtransConnInfo trans_conn) { if (FDD[fd].Busy) NotUsingFD(fd); @@ -178,8 +177,8 @@ UsingFD(fd, Handler, FlushHandler, trans_conn) /* ************************************************************ */ void -NotUsingFD(fd) - FD fd; +NotUsingFD( + FD fd) { debug(128,(stderr, "Not Using FD %d\n", fd)); @@ -207,8 +206,8 @@ XtransConnInfo GetXTransConnInfo(FD fd) /* ************************************************************ */ static void -EOFonFD(fd) - FD fd; +EOFonFD ( + FD fd) { enterprocedure("EOFonFD"); debug(128,(stderr, "EOF on %d\n", fd)); @@ -222,8 +221,8 @@ EOFonFD(fd) } FD -AcceptConnection (ConnectionSocket) - FD ConnectionSocket; +AcceptConnection ( + FD ConnectionSocket) { FD ClientFD; struct sockaddr_in from; @@ -265,17 +264,17 @@ AcceptConnection (ConnectionSocket) } FD -MakeConnection(server, port, report, trans_conn) - char *server; - short port; - int report; - XtransConnInfo *trans_conn; /* transport connection object */ +MakeConnection( + char *server, + short port, + int report, + XtransConnInfo *trans_conn /* transport connection object */ + ) { FD ServerFD; #ifdef USE_XTRANS char address[256]; int connect_stat; - extern long ServerBasePort; snprintf (address, sizeof(address), "%s:%d", server, port - ServerBasePort); if ( (*trans_conn = _X11TransOpenCOTSClient(address)) == NULL ) { @@ -404,9 +403,6 @@ MakeConnection(server, port, report, trans_conn) /* */ /* ************************************************************ */ -#include <errno.h> /* for EINTR, EADDRINUSE, ... */ -extern int errno; - int MainLoop(void) { @@ -100,7 +100,13 @@ extern void InitializeFD(void); extern void UsingFD(FD fd, void (*Handler)(int), void (*FlushHandler)(int), XtransConnInfo trans_conn); extern void NotUsingFD(FD fd); + +extern FD AcceptConnection (FD ConnectionSocket); +extern FD MakeConnection (char *server, short port, int report, + XtransConnInfo *trans_conn); + extern int MainLoop(void); + #ifdef USE_XTRANS extern XtransConnInfo GetXTransConnInfo(FD fd); #endif @@ -39,5 +39,21 @@ SOFTWARE. #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForLBXFlag; +extern unsigned char LBXRequest; +extern unsigned char LBXError; +extern unsigned char LBXEvent; + +extern void LbxQueryVersion (FD fd, unsigned char *buf); +extern void LbxQueryVersionReply (FD fd, unsigned char *buf); +extern void LbxStartProxy (FD fd, unsigned char *buf); +extern void LbxStopProxy (FD fd, unsigned char *buf); +extern void LbxNewClient (FD fd, unsigned char *buf); +extern void LbxCloseClient (FD fd, unsigned char *buf); +extern void LbxSwitch (FD fd, unsigned char *buf); +extern void LbxModifySequence (FD fd, unsigned char *buf); +extern void LbxSwitchEvent (FD fd, unsigned char *buf); +extern void LbxCloseEvent (FD fd, unsigned char *buf); + #endif @@ -121,3 +121,79 @@ fd to identify the client/server and use it as an index into an array of state variables. */ + +/* audio.c */ +extern void NewAudio (FD fd); +extern void InitializeAudio (void); + +/* decodenas.c */ +extern void DecodeAudioRequest (FD fd, unsigned char *buf, long n); +extern void DecodeAudioReply (FD fd, unsigned char *buf, long n); +extern void DecodeAudioEvent (FD fd, unsigned char *buf, long n); +extern void DecodeAudioError (FD fd, unsigned char *buf, long n); + +extern void InitializeAudioDecode (void); + +/* printnas.c */ +extern void PrintAudioSetUpMessage (unsigned char *buf); +extern void PrintAudioSetUpReply (unsigned char *buf); +extern void AudioElementNotify (unsigned char *buf); +extern void AudioGrabNotify (unsigned char *buf); +extern void AudioMonitorNotify (unsigned char *buf); +extern void AudioBucketNotify (unsigned char *buf); +extern void AudioDeviceNotify (unsigned char *buf); +extern void UnknownAudioReply (unsigned char *buf); +extern void AudioListDevices (unsigned char *buf); +extern void AudioListDevicesReply (unsigned char *buf); +extern void AudioGetDeviceAttributes (unsigned char *buf); +extern void AudioGetDeviceAttributesReply (unsigned char *buf); +extern void AudioSetDeviceAttributes (unsigned char *buf); +extern void AudioCreateBucket (unsigned char *buf); +extern void AudioDestroyBucket (unsigned char *buf); +extern void AudioListBuckets (unsigned char *buf); +extern void AudioListBucketsReply (unsigned char *buf); +extern void AudioGetBucketAttributes (unsigned char *buf); +extern void AudioGetBucketAttributesReply (unsigned char *buf); +extern void AudioSetBucketAttributes (unsigned char *buf); +extern void AudioCreateRadio (unsigned char *buf); +extern void AudioDestroyRadio (unsigned char *buf); +extern void AudioListRadios (unsigned char *buf); +extern void AudioListRadiosReply (unsigned char *buf); +extern void AudioGetRadioAttributes (unsigned char *buf); +extern void AudioGetRadioAttributesReply (unsigned char *buf); +extern void AudioSetRadioAttributes (unsigned char *buf); +extern void AudioCreateFlow (unsigned char *buf); +extern void AudioDestroyFlow (unsigned char *buf); +extern void AudioGetFlowAttributes (unsigned char *buf); +extern void AudioGetFlowAttributesReply (unsigned char *buf); +extern void AudioSetFlowAttributes (unsigned char *buf); +extern void AudioGetElements (unsigned char *buf); +extern void AudioGetElementsReply (unsigned char *buf); +extern void AudioSetElements (unsigned char *buf); +extern void AudioGetElementStates (unsigned char *buf); +extern void AudioElementState (unsigned char *buf); +extern void AudioGetElementStatesReply (unsigned char *buf); +extern void AudioSetElementStates (unsigned char *buf); +extern void AudioGetElementParameters (unsigned char *buf); +extern void AudioGetElementParametersReply (unsigned char *buf); +extern void AudioSetElementParameters (unsigned char *buf); +extern void AudioWriteElement (unsigned char *buf); +extern void AudioReadElement (unsigned char *buf); +extern void AudioReadElementReply (unsigned char *buf); +extern void AudioGrabComponent (unsigned char *buf); +extern void AudioUngrabComponent (unsigned char *buf); +extern void AudioSendEvent (unsigned char *buf); +extern void AudioGetAllowedUsers (unsigned char *buf); +extern void AudioGetAllowedUsersReply (unsigned char *buf); +extern void AudioSetAllowedUsers (unsigned char *buf); +extern void AudioListExtensions (unsigned char *buf); +extern void AudioListExtensionsReply (unsigned char *buf); +extern void AudioQueryExtension (unsigned char *buf); +extern void AudioQueryExtensionReply (unsigned char *buf); +extern void AudioGetCloseDownMode (unsigned char *buf); +extern void AudioGetCloseDownModeReply (unsigned char *buf); +extern void AudioSetCloseDownMode (unsigned char *buf); +extern void AudioKillClient (unsigned char *buf); +extern void AudioGetServerTime (unsigned char *buf); +extern void AudioGetServerTimeReply (unsigned char *buf); +extern void AudioNoOperation (unsigned char *buf); @@ -54,6 +54,12 @@ #include "scope.h" #include "x11.h" +#include "bigreqscope.h" +#include "lbxscope.h" +#include "randrscope.h" +#include "renderscope.h" +#include "shmscope.h" +#include "wcpscope.h" static void PrintFailedSetUpReply(unsigned char *buf); static void PrintSuccessfulSetUpReply(unsigned char *buf); @@ -96,8 +102,8 @@ static void ListFontsWithInfoReply2(unsigned char *buf); /* ************************************************************ */ void -PrintSetUpMessage(buf) - unsigned char *buf; +PrintSetUpMessage ( + unsigned char *buf) { short n; short d; @@ -118,8 +124,8 @@ PrintSetUpMessage(buf) } void -PrintSetUpReply(buf) - unsigned char *buf; +PrintSetUpReply ( + unsigned char *buf) { enterprocedure("PrintSetUpReply"); SetIndentLevel(PRINTSERVER); @@ -130,8 +136,8 @@ PrintSetUpReply(buf) } static void -PrintFailedSetUpReply(buf) - unsigned char *buf; +PrintFailedSetUpReply ( + unsigned char *buf) { short n; @@ -147,8 +153,8 @@ PrintFailedSetUpReply(buf) } static void -PrintSuccessfulSetUpReply(buf) - unsigned char *buf; +PrintSuccessfulSetUpReply ( + unsigned char *buf) { short v; short n; @@ -200,8 +206,8 @@ char *REPLYHEADER = "..............REPLY"; /* Error Printing procedures */ void -RequestError(buf) - unsigned char *buf; +RequestError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) @@ -212,8 +218,8 @@ RequestError(buf) } void -ValueError(buf) - unsigned char *buf; +ValueError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Value */ ; if (Verbose < 1) @@ -225,8 +231,8 @@ ValueError(buf) } void -WindowError(buf) - unsigned char *buf; +WindowError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Window */ ; if (Verbose < 1) @@ -238,8 +244,8 @@ WindowError(buf) } void -PixmapError(buf) - unsigned char *buf; +PixmapError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Pixmap */ ; if (Verbose < 1) @@ -251,8 +257,8 @@ PixmapError(buf) } void -AtomError(buf) - unsigned char *buf; +AtomError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Atom */ ; if (Verbose < 1) @@ -264,8 +270,8 @@ AtomError(buf) } void -CursorError(buf) - unsigned char *buf; +CursorError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Cursor */ ; if (Verbose < 1) @@ -277,8 +283,8 @@ CursorError(buf) } void -FontError(buf) - unsigned char *buf; +FontError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Font */ ; if (Verbose < 1) @@ -290,8 +296,8 @@ FontError(buf) } void -MatchError(buf) - unsigned char *buf; +MatchError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Match */ ; if (Verbose < 1) @@ -302,8 +308,8 @@ MatchError(buf) } void -DrawableError(buf) - unsigned char *buf; +DrawableError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Drawable */ ; if (Verbose < 1) @@ -315,8 +321,8 @@ DrawableError(buf) } void -AccessError(buf) - unsigned char *buf; +AccessError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Access */ ; if (Verbose < 1) @@ -327,8 +333,8 @@ AccessError(buf) } void -AllocError(buf) - unsigned char *buf; +AllocError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Alloc */ ; if (Verbose < 1) @@ -339,8 +345,8 @@ AllocError(buf) } void -ColormapError(buf) - unsigned char *buf; +ColormapError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Colormap */ ; if (Verbose < 1) @@ -352,8 +358,8 @@ ColormapError(buf) } void -GContextError(buf) - unsigned char *buf; +GContextError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* GContext */ ; if (Verbose < 1) @@ -365,8 +371,8 @@ GContextError(buf) } void -IDChoiceError(buf) - unsigned char *buf; +IDChoiceError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* IDChoice */ ; if (Verbose < 1) @@ -378,8 +384,8 @@ IDChoiceError(buf) } void -NameError(buf) - unsigned char *buf; +NameError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Name */ ; if (Verbose < 1) @@ -390,8 +396,8 @@ NameError(buf) } void -LengthError(buf) - unsigned char *buf; +LengthError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Length */ ; if (Verbose < 1) @@ -402,8 +408,8 @@ LengthError(buf) } void -ImplementationError(buf) - unsigned char *buf; +ImplementationError ( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Implementation */ ; if (Verbose < 1) @@ -421,8 +427,8 @@ ImplementationError(buf) /* Event Printing procedures */ void -KeyPressEvent(buf) - unsigned char *buf; +KeyPressEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeyPress */ ; if (Verbose < 1) @@ -442,8 +448,8 @@ KeyPressEvent(buf) } void -KeyReleaseEvent(buf) - unsigned char *buf; +KeyReleaseEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeyRelease */ ; if (Verbose < 1) @@ -463,8 +469,8 @@ KeyReleaseEvent(buf) } void -ButtonPressEvent(buf) - unsigned char *buf; +ButtonPressEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ButtonPress */ ; if (Verbose < 1) @@ -484,8 +490,8 @@ ButtonPressEvent(buf) } void -ButtonReleaseEvent(buf) - unsigned char *buf; +ButtonReleaseEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ButtonRelease */ ; if (Verbose < 1) @@ -505,8 +511,8 @@ ButtonReleaseEvent(buf) } void -MotionNotifyEvent(buf) - unsigned char *buf; +MotionNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MotionNotify */ ; if (Verbose < 1) @@ -526,8 +532,8 @@ MotionNotifyEvent(buf) } void -EnterNotifyEvent(buf) - unsigned char *buf; +EnterNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* EnterNotify */ ; if (Verbose < 1) @@ -548,8 +554,8 @@ EnterNotifyEvent(buf) } void -LeaveNotifyEvent(buf) - unsigned char *buf; +LeaveNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* LeaveNotify */ ; if (Verbose < 1) @@ -570,8 +576,8 @@ LeaveNotifyEvent(buf) } void -FocusInEvent(buf) - unsigned char *buf; +FocusInEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* FocusIn */ ; if (Verbose < 1) @@ -583,8 +589,8 @@ FocusInEvent(buf) } void -FocusOutEvent(buf) - unsigned char *buf; +FocusOutEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* FocusOut */ ; if (Verbose < 1) @@ -596,8 +602,8 @@ FocusOutEvent(buf) } void -KeymapNotifyEvent(buf) - unsigned char *buf; +KeymapNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* KeymapNotify */ ; if (Verbose < 1) @@ -606,8 +612,8 @@ KeymapNotifyEvent(buf) } void -ExposeEvent(buf) - unsigned char *buf; +ExposeEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* Expose */ ; if (Verbose < 1) @@ -622,8 +628,8 @@ ExposeEvent(buf) } void -GraphicsExposureEvent(buf) - unsigned char *buf; +GraphicsExposureEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* GraphicsExposure */ ; if (Verbose < 1) @@ -640,8 +646,8 @@ GraphicsExposureEvent(buf) } void -NoExposureEvent(buf) - unsigned char *buf; +NoExposureEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* NoExposure */ ; if (Verbose < 1) @@ -653,8 +659,8 @@ NoExposureEvent(buf) } void -VisibilityNotifyEvent(buf) - unsigned char *buf; +VisibilityNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* VisibilityNotify */ ; if (Verbose < 1) @@ -665,8 +671,8 @@ VisibilityNotifyEvent(buf) } void -CreateNotifyEvent(buf) - unsigned char *buf; +CreateNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CreateNotify */ ; if (Verbose < 1) @@ -683,8 +689,8 @@ CreateNotifyEvent(buf) } void -DestroyNotifyEvent(buf) - unsigned char *buf; +DestroyNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* DestroyNotify */ ; if (Verbose < 1) @@ -695,8 +701,8 @@ DestroyNotifyEvent(buf) } void -UnmapNotifyEvent(buf) - unsigned char *buf; +UnmapNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* UnmapNotify */ ; if (Verbose < 1) @@ -708,8 +714,8 @@ UnmapNotifyEvent(buf) } void -MapNotifyEvent(buf) - unsigned char *buf; +MapNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MapNotify */ ; if (Verbose < 1) @@ -721,8 +727,8 @@ MapNotifyEvent(buf) } void -MapRequestEvent(buf) - unsigned char *buf; +MapRequestEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MapRequest */ ; if (Verbose < 1) @@ -733,8 +739,8 @@ MapRequestEvent(buf) } void -ReparentNotifyEvent(buf) - unsigned char *buf; +ReparentNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ReparentNotify */ ; if (Verbose < 1) @@ -749,8 +755,8 @@ ReparentNotifyEvent(buf) } void -ConfigureNotifyEvent(buf) - unsigned char *buf; +ConfigureNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ConfigureNotify */ ; if (Verbose < 1) @@ -768,8 +774,8 @@ ConfigureNotifyEvent(buf) } void -ConfigureRequestEvent(buf) - unsigned char *buf; +ConfigureRequestEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ConfigureRequest */ ; if (Verbose < 1) @@ -788,8 +794,8 @@ ConfigureRequestEvent(buf) } void -GravityNotifyEvent(buf) - unsigned char *buf; +GravityNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* GravityNotify */ ; if (Verbose < 1) @@ -802,8 +808,8 @@ GravityNotifyEvent(buf) } void -ResizeRequestEvent(buf) - unsigned char *buf; +ResizeRequestEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ResizeRequest */ ; if (Verbose < 1) @@ -815,8 +821,8 @@ ResizeRequestEvent(buf) } void -CirculateNotifyEvent(buf) - unsigned char *buf; +CirculateNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CirculateNotify */ ; if (Verbose < 1) @@ -829,8 +835,8 @@ CirculateNotifyEvent(buf) } void -CirculateRequestEvent(buf) - unsigned char *buf; +CirculateRequestEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* CirculateRequest */ ; if (Verbose < 1) @@ -842,8 +848,8 @@ CirculateRequestEvent(buf) } void -PropertyNotifyEvent(buf) - unsigned char *buf; +PropertyNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* PropertyNotify */ ; if (Verbose < 1) @@ -856,8 +862,8 @@ PropertyNotifyEvent(buf) } void -SelectionClearEvent(buf) - unsigned char *buf; +SelectionClearEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionClear */ ; if (Verbose < 1) @@ -869,8 +875,8 @@ SelectionClearEvent(buf) } void -SelectionRequestEvent(buf) - unsigned char *buf; +SelectionRequestEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionRequest */ ; if (Verbose < 1) @@ -885,8 +891,8 @@ SelectionRequestEvent(buf) } void -SelectionNotifyEvent(buf) - unsigned char *buf; +SelectionNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* SelectionNotify */ ; if (Verbose < 1) @@ -900,8 +906,8 @@ SelectionNotifyEvent(buf) } void -ColormapNotifyEvent(buf) - unsigned char *buf; +ColormapNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ColormapNotify */ ; if (Verbose < 1) @@ -914,8 +920,8 @@ ColormapNotifyEvent(buf) } void -ClientMessageEvent(buf) - unsigned char *buf; +ClientMessageEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* ClientMessage */ ; if (Verbose < 1) @@ -928,8 +934,8 @@ ClientMessageEvent(buf) } void -MappingNotifyEvent(buf) - unsigned char *buf; +MappingNotifyEvent ( + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* MappingNotify */ ; if (Verbose < 1) @@ -947,9 +953,10 @@ MappingNotifyEvent(buf) /* Request and Reply Printing procedures */ -ExtendedRequest(fd, buf) - int fd; - unsigned char *buf; +void +ExtendedRequest ( + int fd, + unsigned char *buf) { short n; PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); @@ -963,8 +970,9 @@ ExtendedRequest(fd, buf) (void) PrintList (&buf[4], n, CARD32, "data"); } -UnknownReply(buf) - unsigned char *buf; +void +UnknownReply ( + unsigned char *buf) { long n; @@ -977,8 +985,8 @@ UnknownReply(buf) } void -CreateWindow(buf) - unsigned char *buf; +CreateWindow ( + unsigned char *buf) { /* Request CreateWindow is opcode 1 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateWindow */ ; @@ -1003,8 +1011,8 @@ CreateWindow(buf) } void -ChangeWindowAttributes(buf) - unsigned char *buf; +ChangeWindowAttributes ( + unsigned char *buf) { /* Request ChangeWindowAttributes is opcode 2 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeWindowAttributes */ ; @@ -1020,8 +1028,8 @@ ChangeWindowAttributes(buf) } void -GetWindowAttributes(buf) - unsigned char *buf; +GetWindowAttributes ( + unsigned char *buf) { /* Request GetWindowAttributes is opcode 3 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetWindowAttributes */ ; @@ -1035,8 +1043,8 @@ GetWindowAttributes(buf) } void -GetWindowAttributesReply(buf) - unsigned char *buf; +GetWindowAttributesReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetWindowAttributes */ ; if (Verbose < 1) @@ -1061,8 +1069,8 @@ GetWindowAttributesReply(buf) } void -DestroyWindow(buf) - unsigned char *buf; +DestroyWindow ( + unsigned char *buf) { /* Request DestroyWindow is opcode 4 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DestroyWindow */ ; @@ -1076,8 +1084,8 @@ DestroyWindow(buf) } void -DestroySubwindows(buf) - unsigned char *buf; +DestroySubwindows ( + unsigned char *buf) { /* Request DestroySubwindows is opcode 5 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DestroySubwindows */ ; @@ -1091,8 +1099,8 @@ DestroySubwindows(buf) } void -ChangeSaveSet(buf) - unsigned char *buf; +ChangeSaveSet ( + unsigned char *buf) { /* Request ChangeSaveSet is opcode 6 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeSaveSet */ ; @@ -1107,8 +1115,8 @@ ChangeSaveSet(buf) } void -ReparentWindow(buf) - unsigned char *buf; +ReparentWindow ( + unsigned char *buf) { /* Request ReparentWindow is opcode 7 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ReparentWindow */ ; @@ -1125,8 +1133,8 @@ ReparentWindow(buf) } void -MapWindow(buf) - unsigned char *buf; +MapWindow ( + unsigned char *buf) { /* Request MapWindow is opcode 8 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* MapWindow */ ; @@ -1140,8 +1148,8 @@ MapWindow(buf) } void -MapSubwindows(buf) - unsigned char *buf; +MapSubwindows ( + unsigned char *buf) { /* Request MapSubwindows is opcode 9 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* MapSubwindows */ ; @@ -1155,8 +1163,8 @@ MapSubwindows(buf) } void -UnmapWindow(buf) - unsigned char *buf; +UnmapWindow ( + unsigned char *buf) { /* Request UnmapWindow is opcode 10 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UnmapWindow */ ; @@ -1170,8 +1178,8 @@ UnmapWindow(buf) } void -UnmapSubwindows(buf) - unsigned char *buf; +UnmapSubwindows ( + unsigned char *buf) { /* Request UnmapSubwindows is opcode 11 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UnmapSubwindows */ ; @@ -1185,8 +1193,8 @@ UnmapSubwindows(buf) } void -ConfigureWindow(buf) - unsigned char *buf; +ConfigureWindow ( + unsigned char *buf) { /* Request ConfigureWindow is opcode 12 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ConfigureWindow */ ; @@ -1202,8 +1210,8 @@ ConfigureWindow(buf) } void -CirculateWindow(buf) - unsigned char *buf; +CirculateWindow ( + unsigned char *buf) { /* Request CirculateWindow is opcode 13 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CirculateWindow */ ; @@ -1218,8 +1226,8 @@ CirculateWindow(buf) } void -GetGeometry(buf) - unsigned char *buf; +GetGeometry ( + unsigned char *buf) { /* Request GetGeometry is opcode 14 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetGeometry */ ; @@ -1233,8 +1241,8 @@ GetGeometry(buf) } void -GetGeometryReply(buf) - unsigned char *buf; +GetGeometryReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetGeometry */ ; if (Verbose < 1) @@ -1251,8 +1259,8 @@ GetGeometryReply(buf) } void -QueryTree(buf) - unsigned char *buf; +QueryTree ( + unsigned char *buf) { /* Request QueryTree is opcode 15 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryTree */ ; @@ -1266,8 +1274,8 @@ QueryTree(buf) } void -QueryTreeReply(buf) - unsigned char *buf; +QueryTreeReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryTree */ ; @@ -1283,8 +1291,8 @@ QueryTreeReply(buf) } void -InternAtom(buf) - unsigned char *buf; +InternAtom ( + unsigned char *buf) { short n; /* Request InternAtom is opcode 16 */ @@ -1302,8 +1310,8 @@ InternAtom(buf) } void -InternAtomReply(buf) - unsigned char *buf; +InternAtomReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* InternAtom */ ; if (Verbose < 1) @@ -1314,8 +1322,8 @@ InternAtomReply(buf) } void -GetAtomName(buf) - unsigned char *buf; +GetAtomName ( + unsigned char *buf) { /* Request GetAtomName is opcode 17 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetAtomName */ ; @@ -1329,8 +1337,8 @@ GetAtomName(buf) } void -GetAtomNameReply(buf) - unsigned char *buf; +GetAtomNameReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetAtomName */ ; @@ -1344,8 +1352,8 @@ GetAtomNameReply(buf) } void -ChangeProperty(buf) - unsigned char *buf; +ChangeProperty ( + unsigned char *buf) { long n; short unit; @@ -1375,8 +1383,8 @@ ChangeProperty(buf) } void -DeleteProperty(buf) - unsigned char *buf; +DeleteProperty ( + unsigned char *buf) { /* Request DeleteProperty is opcode 19 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* DeleteProperty */ ; @@ -1391,8 +1399,8 @@ DeleteProperty(buf) } void -GetProperty(buf) - unsigned char *buf; +GetProperty ( + unsigned char *buf) { /* Request GetProperty is opcode 20 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetProperty */ ; @@ -1411,8 +1419,8 @@ GetProperty(buf) } void -GetPropertyReply(buf) - unsigned char *buf; +GetPropertyReply ( + unsigned char *buf) { long n; short unit; @@ -1437,8 +1445,8 @@ GetPropertyReply(buf) } void -ListProperties(buf) - unsigned char *buf; +ListProperties ( + unsigned char *buf) { /* Request ListProperties is opcode 21 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListProperties */ ; @@ -1452,8 +1460,8 @@ ListProperties(buf) } void -ListPropertiesReply(buf) - unsigned char *buf; +ListPropertiesReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListProperties */ ; @@ -1467,8 +1475,8 @@ ListPropertiesReply(buf) } void -SetSelectionOwner(buf) - unsigned char *buf; +SetSelectionOwner ( + unsigned char *buf) { /* Request SetSelectionOwner is opcode 22 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetSelectionOwner */ ; @@ -1484,8 +1492,8 @@ SetSelectionOwner(buf) } void -GetSelectionOwner(buf) - unsigned char *buf; +GetSelectionOwner ( + unsigned char *buf) { /* Request GetSelectionOwner is opcode 23 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetSelectionOwner */ ; @@ -1499,8 +1507,8 @@ GetSelectionOwner(buf) } void -GetSelectionOwnerReply(buf) - unsigned char *buf; +GetSelectionOwnerReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetSelectionOwner */ ; if (Verbose < 1) @@ -1511,8 +1519,8 @@ GetSelectionOwnerReply(buf) } void -ConvertSelection(buf) - unsigned char *buf; +ConvertSelection ( + unsigned char *buf) { /* Request ConvertSelection is opcode 24 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ConvertSelection */ ; @@ -1530,8 +1538,8 @@ ConvertSelection(buf) } void -SendEvent(buf) - unsigned char *buf; +SendEvent ( + unsigned char *buf) { /* Request SendEvent is opcode 25 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SendEvent */ ; @@ -1548,8 +1556,8 @@ SendEvent(buf) } void -GrabPointer(buf) - unsigned char *buf; +GrabPointer ( + unsigned char *buf) { /* Request GrabPointer is opcode 26 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabPointer */ ; @@ -1570,8 +1578,8 @@ GrabPointer(buf) } void -GrabPointerReply(buf) - unsigned char *buf; +GrabPointerReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GrabPointer */ ; if (Verbose < 1) @@ -1582,8 +1590,8 @@ GrabPointerReply(buf) } void -UngrabPointer(buf) - unsigned char *buf; +UngrabPointer ( + unsigned char *buf) { /* Request UngrabPointer is opcode 27 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabPointer */ ; @@ -1597,8 +1605,8 @@ UngrabPointer(buf) } void -GrabButton(buf) - unsigned char *buf; +GrabButton ( + unsigned char *buf) { /* Request GrabButton is opcode 28 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabButton */ ; @@ -1620,8 +1628,8 @@ GrabButton(buf) } void -UngrabButton(buf) - unsigned char *buf; +UngrabButton ( + unsigned char *buf) { /* Request UngrabButton is opcode 29 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabButton */ ; @@ -1637,8 +1645,8 @@ UngrabButton(buf) } void -ChangeActivePointerGrab(buf) - unsigned char *buf; +ChangeActivePointerGrab ( + unsigned char *buf) { /* Request ChangeActivePointerGrab is opcode 30 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeActivePointerGrab */ ; @@ -1654,8 +1662,8 @@ ChangeActivePointerGrab(buf) } void -GrabKeyboard(buf) - unsigned char *buf; +GrabKeyboard ( + unsigned char *buf) { /* Request GrabKeyboard is opcode 31 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabKeyboard */ ; @@ -1673,8 +1681,8 @@ GrabKeyboard(buf) } void -GrabKeyboardReply(buf) - unsigned char *buf; +GrabKeyboardReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GrabKeyboard */ ; if (Verbose < 1) @@ -1685,8 +1693,8 @@ GrabKeyboardReply(buf) } void -UngrabKeyboard(buf) - unsigned char *buf; +UngrabKeyboard ( + unsigned char *buf) { /* Request UngrabKeyboard is opcode 32 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabKeyboard */ ; @@ -1700,8 +1708,8 @@ UngrabKeyboard(buf) } void -GrabKey(buf) - unsigned char *buf; +GrabKey ( + unsigned char *buf) { /* Request GrabKey is opcode 33 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabKey */ ; @@ -1720,8 +1728,8 @@ GrabKey(buf) } void -UngrabKey(buf) - unsigned char *buf; +UngrabKey ( + unsigned char *buf) { /* Request UngrabKey is opcode 34 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabKey */ ; @@ -1737,8 +1745,8 @@ UngrabKey(buf) } void -AllowEvents(buf) - unsigned char *buf; +AllowEvents ( + unsigned char *buf) { /* Request AllowEvents is opcode 35 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllowEvents */ ; @@ -1753,8 +1761,8 @@ AllowEvents(buf) } void -GrabServer(buf) - unsigned char *buf; +GrabServer ( + unsigned char *buf) { /* Request GrabServer is opcode 36 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GrabServer */ ; @@ -1767,8 +1775,8 @@ GrabServer(buf) } void -UngrabServer(buf) - unsigned char *buf; +UngrabServer ( + unsigned char *buf) { /* Request UngrabServer is opcode 37 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UngrabServer */ ; @@ -1781,8 +1789,8 @@ UngrabServer(buf) } void -QueryPointer(buf) - unsigned char *buf; +QueryPointer ( + unsigned char *buf) { /* Request QueryPointer is opcode 38 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryPointer */ ; @@ -1796,8 +1804,8 @@ QueryPointer(buf) } void -QueryPointerReply(buf) - unsigned char *buf; +QueryPointerReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryPointer */ ; if (Verbose < 1) @@ -1815,8 +1823,8 @@ QueryPointerReply(buf) } void -GetMotionEvents(buf) - unsigned char *buf; +GetMotionEvents ( + unsigned char *buf) { /* Request GetMotionEvents is opcode 39 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetMotionEvents */ ; @@ -1832,8 +1840,8 @@ GetMotionEvents(buf) } void -GetMotionEventsReply(buf) - unsigned char *buf; +GetMotionEventsReply ( + unsigned char *buf) { long n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetMotionEvents */ ; @@ -1847,8 +1855,8 @@ GetMotionEventsReply(buf) } void -TranslateCoordinates(buf) - unsigned char *buf; +TranslateCoordinates ( + unsigned char *buf) { /* Request TranslateCoordinates is opcode 40 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* TranslateCoordinates */ ; @@ -1865,8 +1873,8 @@ TranslateCoordinates(buf) } void -TranslateCoordinatesReply(buf) - unsigned char *buf; +TranslateCoordinatesReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* TranslateCoordinates */ ; if (Verbose < 1) @@ -1880,8 +1888,8 @@ TranslateCoordinatesReply(buf) } void -WarpPointer(buf) - unsigned char *buf; +WarpPointer ( + unsigned char *buf) { /* Request WarpPointer is opcode 41 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* WarpPointer */ ; @@ -1902,8 +1910,8 @@ WarpPointer(buf) } void -SetInputFocus(buf) - unsigned char *buf; +SetInputFocus ( + unsigned char *buf) { /* Request SetInputFocus is opcode 42 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetInputFocus */ ; @@ -1919,8 +1927,8 @@ SetInputFocus(buf) } void -GetInputFocus(buf) - unsigned char *buf; +GetInputFocus ( + unsigned char *buf) { /* Request GetInputFocus is opcode 43 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetInputFocus */ ; @@ -1933,8 +1941,8 @@ GetInputFocus(buf) } void -GetInputFocusReply(buf) - unsigned char *buf; +GetInputFocusReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetInputFocus */ ; if (Verbose < 1) @@ -1946,8 +1954,8 @@ GetInputFocusReply(buf) } void -QueryKeymap(buf) - unsigned char *buf; +QueryKeymap ( + unsigned char *buf) { /* Request QueryKeymap is opcode 44 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryKeymap */ ; @@ -1960,8 +1968,8 @@ QueryKeymap(buf) } void -QueryKeymapReply(buf) - unsigned char *buf; +QueryKeymapReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryKeymap */ ; if (Verbose < 1) @@ -1972,8 +1980,8 @@ QueryKeymapReply(buf) } void -OpenFont(buf) - unsigned char *buf; +OpenFont ( + unsigned char *buf) { short n; /* Request OpenFont is opcode 45 */ @@ -1991,8 +1999,8 @@ OpenFont(buf) } void -CloseFont(buf) - unsigned char *buf; +CloseFont ( + unsigned char *buf) { /* Request CloseFont is opcode 46 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CloseFont */ ; @@ -2006,8 +2014,8 @@ CloseFont(buf) } void -QueryFont(buf) - unsigned char *buf; +QueryFont ( + unsigned char *buf) { /* Request QueryFont is opcode 47 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryFont */ ; @@ -2021,8 +2029,8 @@ QueryFont(buf) } void -QueryFontReply(buf) - unsigned char *buf; +QueryFontReply ( + unsigned char *buf) { short n; long m; @@ -2053,8 +2061,8 @@ QueryFontReply(buf) } void -QueryTextExtents(buf) - unsigned char *buf; +QueryTextExtents ( + unsigned char *buf) { int n; @@ -2075,8 +2083,8 @@ QueryTextExtents(buf) } void -QueryTextExtentsReply(buf) - unsigned char *buf; +QueryTextExtentsReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryTextExtents */ ; if (Verbose < 1) @@ -2094,8 +2102,8 @@ QueryTextExtentsReply(buf) } void -ListFonts(buf) - unsigned char *buf; +ListFonts ( + unsigned char *buf) { short n; /* Request ListFonts is opcode 49 */ @@ -2113,8 +2121,8 @@ ListFonts(buf) } void -ListFontsReply(buf) - unsigned char *buf; +ListFontsReply ( + unsigned char *buf) { short n; @@ -2129,8 +2137,8 @@ ListFontsReply(buf) } void -ListFontsWithInfo(buf) - unsigned char *buf; +ListFontsWithInfo ( + unsigned char *buf) { short n; /* Request ListFontsWithInfo is opcode 50 */ @@ -2148,8 +2156,8 @@ ListFontsWithInfo(buf) } void -ListFontsWithInfoReply(buf) - unsigned char *buf; +ListFontsWithInfoReply ( + unsigned char *buf) { short which; @@ -2167,8 +2175,8 @@ ListFontsWithInfoReply(buf) } static void -ListFontsWithInfoReply1(buf) - unsigned char *buf; +ListFontsWithInfoReply1 ( + unsigned char *buf) { short n; short m; @@ -2195,8 +2203,8 @@ ListFontsWithInfoReply1(buf) } static void -ListFontsWithInfoReply2(buf) - unsigned char *buf; +ListFontsWithInfoReply2 ( + unsigned char *buf) { PrintField(buf, 1, 1, CONST1(0), "last-reply indicator"); printfield(buf, 2, 2, CARD16, "sequence number"); @@ -2204,8 +2212,8 @@ ListFontsWithInfoReply2(buf) } void -SetFontPath(buf) - unsigned char *buf; +SetFontPath ( + unsigned char *buf) { short n; /* Request SetFontPath is opcode 51 */ @@ -2222,8 +2230,8 @@ SetFontPath(buf) } void -GetFontPath(buf) - unsigned char *buf; +GetFontPath ( + unsigned char *buf) { /* Request GetFontPath is opcode 52 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetFontPath */ ; @@ -2236,8 +2244,8 @@ GetFontPath(buf) } void -GetFontPathReply(buf) - unsigned char *buf; +GetFontPathReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetFontPath */ ; @@ -2251,8 +2259,8 @@ GetFontPathReply(buf) } void -CreatePixmap(buf) - unsigned char *buf; +CreatePixmap ( + unsigned char *buf) { /* Request CreatePixmap is opcode 53 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreatePixmap */ ; @@ -2270,8 +2278,8 @@ CreatePixmap(buf) } void -FreePixmap(buf) - unsigned char *buf; +FreePixmap ( + unsigned char *buf) { /* Request FreePixmap is opcode 54 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreePixmap */ ; @@ -2311,8 +2319,8 @@ unsigned long GCDefaults[] = { }; void -CreateGC(buf) - unsigned char *buf; +CreateGC ( + unsigned char *buf) { CreateValueRec (ILong(buf+4), 23, GCDefaults); SetValueRec (ILong(buf+4), &buf[12], 4, GC_BITMASK, &buf[16]); @@ -2332,8 +2340,8 @@ CreateGC(buf) } void -ChangeGC(buf) - unsigned char *buf; +ChangeGC ( + unsigned char *buf) { SetValueRec (ILong(buf+4), &buf[8], 4, GC_BITMASK, &buf[12]); @@ -2351,8 +2359,8 @@ ChangeGC(buf) } void -CopyGC(buf) - unsigned char *buf; +CopyGC ( + unsigned char *buf) { /* Request CopyGC is opcode 57 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyGC */ ; @@ -2368,8 +2376,8 @@ CopyGC(buf) } void -SetDashes(buf) - unsigned char *buf; +SetDashes ( + unsigned char *buf) { short n; /* Request SetDashes is opcode 58 */ @@ -2388,8 +2396,8 @@ SetDashes(buf) } void -SetClipRectangles(buf) - unsigned char *buf; +SetClipRectangles ( + unsigned char *buf) { short n; @@ -2410,8 +2418,8 @@ SetClipRectangles(buf) } void -FreeGC(buf) - unsigned char *buf; +FreeGC ( + unsigned char *buf) { DeleteValueRec (ILong (&buf[4])); @@ -2427,8 +2435,8 @@ FreeGC(buf) } void -ClearArea(buf) - unsigned char *buf; +ClearArea ( + unsigned char *buf) { /* Request ClearArea is opcode 61 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ClearArea */ ; @@ -2447,8 +2455,8 @@ ClearArea(buf) } void -CopyArea(buf) - unsigned char *buf; +CopyArea ( + unsigned char *buf) { /* Request CopyArea is opcode 62 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyArea */ ; @@ -2476,8 +2484,8 @@ CopyArea(buf) } void -CopyPlane(buf) - unsigned char *buf; +CopyPlane ( + unsigned char *buf) { /* Request CopyPlane is opcode 63 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyPlane */ ; @@ -2508,8 +2516,8 @@ CopyPlane(buf) } void -PolyPoint(buf) - unsigned char *buf; +PolyPoint ( + unsigned char *buf) { short n; /* Request PolyPoint is opcode 64 */ @@ -2534,8 +2542,8 @@ PolyPoint(buf) } void -PolyLine(buf) - unsigned char *buf; +PolyLine ( + unsigned char *buf) { short n; /* Request PolyLine is opcode 65 */ @@ -2568,8 +2576,8 @@ PolyLine(buf) } void -PolySegment(buf) - unsigned char *buf; +PolySegment ( + unsigned char *buf) { short n; /* Request PolySegment is opcode 66 */ @@ -2600,8 +2608,8 @@ PolySegment(buf) } void -PolyRectangle(buf) - unsigned char *buf; +PolyRectangle ( + unsigned char *buf) { short n; /* Request PolyRectangle is opcode 67 */ @@ -2633,8 +2641,8 @@ PolyRectangle(buf) } void -PolyArc(buf) - unsigned char *buf; +PolyArc ( + unsigned char *buf) { short n; /* Request PolyArc is opcode 68 */ @@ -2666,8 +2674,8 @@ PolyArc(buf) } void -FillPoly(buf) - unsigned char *buf; +FillPoly ( + unsigned char *buf) { short n; /* Request FillPoly is opcode 69 */ @@ -2698,8 +2706,8 @@ FillPoly(buf) } void -PolyFillRectangle(buf) - unsigned char *buf; +PolyFillRectangle ( + unsigned char *buf) { short n; /* Request PolyFillRectangle is opcode 70 */ @@ -2727,8 +2735,8 @@ PolyFillRectangle(buf) } void -PolyFillArc(buf) - unsigned char *buf; +PolyFillArc ( + unsigned char *buf) { short n; /* Request PolyFillArc is opcode 71 */ @@ -2757,8 +2765,8 @@ PolyFillArc(buf) } void -PutImage(buf) - unsigned char *buf; +PutImage ( + unsigned char *buf) { int n; /* Request PutImage is opcode 72 */ @@ -2804,8 +2812,8 @@ PutImage(buf) } void -GetImage(buf) - unsigned char *buf; +GetImage ( + unsigned char *buf) { /* Request GetImage is opcode 73 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetImage */ ; @@ -2825,8 +2833,8 @@ GetImage(buf) } void -GetImageReply(buf) - unsigned char *buf; +GetImageReply ( + unsigned char *buf) { long n; @@ -2847,8 +2855,8 @@ GetImageReply(buf) } void -PolyText8(buf) - unsigned char *buf; +PolyText8 ( + unsigned char *buf) { int n; @@ -2880,8 +2888,8 @@ PolyText8(buf) } void -PolyText16(buf) - unsigned char *buf; +PolyText16 ( + unsigned char *buf) { int n; @@ -2913,8 +2921,8 @@ PolyText16(buf) } void -ImageText8(buf) - unsigned char *buf; +ImageText8 ( + unsigned char *buf) { short n; /* Request ImageText8 is opcode 76 */ @@ -2942,8 +2950,8 @@ ImageText8(buf) } void -ImageText16(buf) - unsigned char *buf; +ImageText16 ( + unsigned char *buf) { short n; /* Request ImageText16 is opcode 77 */ @@ -2971,8 +2979,8 @@ ImageText16(buf) } void -CreateColormap(buf) - unsigned char *buf; +CreateColormap ( + unsigned char *buf) { /* Request CreateColormap is opcode 78 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateColormap */ ; @@ -2989,8 +2997,8 @@ CreateColormap(buf) } void -FreeColormap(buf) - unsigned char *buf; +FreeColormap ( + unsigned char *buf) { /* Request FreeColormap is opcode 79 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeColormap */ ; @@ -3004,8 +3012,8 @@ FreeColormap(buf) } void -CopyColormapAndFree(buf) - unsigned char *buf; +CopyColormapAndFree ( + unsigned char *buf) { /* Request CopyColormapAndFree is opcode 80 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CopyColormapAndFree */ ; @@ -3020,8 +3028,8 @@ CopyColormapAndFree(buf) } void -InstallColormap(buf) - unsigned char *buf; +InstallColormap ( + unsigned char *buf) { /* Request InstallColormap is opcode 81 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* InstallColormap */ ; @@ -3035,8 +3043,8 @@ InstallColormap(buf) } void -UninstallColormap(buf) - unsigned char *buf; +UninstallColormap ( + unsigned char *buf) { /* Request UninstallColormap is opcode 82 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* UninstallColormap */ ; @@ -3050,8 +3058,8 @@ UninstallColormap(buf) } void -ListInstalledColormaps(buf) - unsigned char *buf; +ListInstalledColormaps ( + unsigned char *buf) { /* Request ListInstalledColormaps is opcode 83 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListInstalledColormaps */ ; @@ -3065,8 +3073,8 @@ ListInstalledColormaps(buf) } void -ListInstalledColormapsReply(buf) - unsigned char *buf; +ListInstalledColormapsReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListInstalledColormaps */ ; @@ -3080,8 +3088,8 @@ ListInstalledColormapsReply(buf) } void -AllocColor(buf) - unsigned char *buf; +AllocColor ( + unsigned char *buf) { /* Request AllocColor is opcode 84 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColor */ ; @@ -3098,8 +3106,8 @@ AllocColor(buf) } void -AllocColorReply(buf) - unsigned char *buf; +AllocColorReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocColor */ ; if (Verbose < 1) @@ -3113,8 +3121,8 @@ AllocColorReply(buf) } void -AllocNamedColor(buf) - unsigned char *buf; +AllocNamedColor ( + unsigned char *buf) { short n; /* Request AllocNamedColor is opcode 85 */ @@ -3132,8 +3140,8 @@ AllocNamedColor(buf) } void -AllocNamedColorReply(buf) - unsigned char *buf; +AllocNamedColorReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocNamedColor */ ; if (Verbose < 1) @@ -3150,8 +3158,8 @@ AllocNamedColorReply(buf) } void -AllocColorCells(buf) - unsigned char *buf; +AllocColorCells ( + unsigned char *buf) { /* Request AllocColorCells is opcode 86 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColorCells */ ; @@ -3168,8 +3176,8 @@ AllocColorCells(buf) } void -AllocColorCellsReply(buf) - unsigned char *buf; +AllocColorCellsReply ( + unsigned char *buf) { short n; short m; @@ -3188,8 +3196,8 @@ AllocColorCellsReply(buf) } void -AllocColorPlanes(buf) - unsigned char *buf; +AllocColorPlanes ( + unsigned char *buf) { /* Request AllocColorPlanes is opcode 87 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* AllocColorPlanes */ ; @@ -3208,8 +3216,8 @@ AllocColorPlanes(buf) } void -AllocColorPlanesReply(buf) - unsigned char *buf; +AllocColorPlanesReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* AllocColorPlanes */ ; @@ -3226,8 +3234,8 @@ AllocColorPlanesReply(buf) } void -FreeColors(buf) - unsigned char *buf; +FreeColors ( + unsigned char *buf) { short n; @@ -3246,8 +3254,8 @@ FreeColors(buf) } void -StoreColors(buf) - unsigned char *buf; +StoreColors ( + unsigned char *buf) { short n; /* Request StoreColors is opcode 89 */ @@ -3264,8 +3272,8 @@ StoreColors(buf) } void -StoreNamedColor(buf) - unsigned char *buf; +StoreNamedColor ( + unsigned char *buf) { short n; /* Request StoreNamedColor is opcode 90 */ @@ -3285,8 +3293,8 @@ StoreNamedColor(buf) } void -QueryColors(buf) - unsigned char *buf; +QueryColors ( + unsigned char *buf) { short n; /* Request QueryColors is opcode 91 */ @@ -3303,8 +3311,8 @@ QueryColors(buf) } void -QueryColorsReply(buf) - unsigned char *buf; +QueryColorsReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryColors */ ; @@ -3318,8 +3326,8 @@ QueryColorsReply(buf) } void -LookupColor(buf) - unsigned char *buf; +LookupColor ( + unsigned char *buf) { short n; /* Request LookupColor is opcode 92 */ @@ -3337,8 +3345,8 @@ LookupColor(buf) } void -LookupColorReply(buf) - unsigned char *buf; +LookupColorReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* LookupColor */ ; if (Verbose < 1) @@ -3354,8 +3362,8 @@ LookupColorReply(buf) } void -CreateCursor(buf) - unsigned char *buf; +CreateCursor ( + unsigned char *buf) { /* Request CreateCursor is opcode 93 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateCursor */ ; @@ -3379,8 +3387,8 @@ CreateCursor(buf) } void -CreateGlyphCursor(buf) - unsigned char *buf; +CreateGlyphCursor ( + unsigned char *buf) { /* Request CreateGlyphCursor is opcode 94 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* CreateGlyphCursor */ ; @@ -3404,8 +3412,8 @@ CreateGlyphCursor(buf) } void -FreeCursor(buf) - unsigned char *buf; +FreeCursor ( + unsigned char *buf) { /* Request FreeCursor is opcode 95 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* FreeCursor */ ; @@ -3419,8 +3427,8 @@ FreeCursor(buf) } void -RecolorCursor(buf) - unsigned char *buf; +RecolorCursor ( + unsigned char *buf) { /* Request RecolorCursor is opcode 96 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* RecolorCursor */ ; @@ -3440,8 +3448,8 @@ RecolorCursor(buf) } void -QueryBestSize(buf) - unsigned char *buf; +QueryBestSize ( + unsigned char *buf) { /* Request QueryBestSize is opcode 97 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* QueryBestSize */ ; @@ -3458,8 +3466,8 @@ QueryBestSize(buf) } void -QueryBestSizeReply(buf) - unsigned char *buf; +QueryBestSizeReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* QueryBestSize */ ; if (Verbose < 1) @@ -3471,8 +3479,8 @@ QueryBestSizeReply(buf) } void -QueryExtension(buf) - unsigned char *buf; +QueryExtension ( + unsigned char *buf) { short n; /* Request QueryExtension is opcode 98 */ @@ -3489,16 +3497,9 @@ QueryExtension(buf) } void -QueryExtensionReply(buf) - unsigned char *buf; +QueryExtensionReply ( + unsigned char *buf) { - extern unsigned char LookForLBXFlag; - extern unsigned char LookForWCPFlag; - extern unsigned char LookForRENDERFlag; - extern unsigned char LookForRANDRFlag; - extern unsigned char LookForMITSHMFlag; - extern unsigned char LookForBIGREQFlag; - if (LookForLBXFlag) { InitializeLBX(buf); LookForLBXFlag = 0; @@ -3530,8 +3531,8 @@ QueryExtensionReply(buf) } void -ListExtensions(buf) - unsigned char *buf; +ListExtensions ( + unsigned char *buf) { /* Request ListExtensions is opcode 99 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListExtensions */ ; @@ -3544,8 +3545,8 @@ ListExtensions(buf) } void -ListExtensionsReply(buf) - unsigned char *buf; +ListExtensionsReply ( + unsigned char *buf) { short n; @@ -3560,8 +3561,8 @@ ListExtensionsReply(buf) } void -ChangeKeyboardMapping(buf) - unsigned char *buf; +ChangeKeyboardMapping ( + unsigned char *buf) { short n; short m; @@ -3582,8 +3583,8 @@ ChangeKeyboardMapping(buf) } void -GetKeyboardMapping(buf) - unsigned char *buf; +GetKeyboardMapping ( + unsigned char *buf) { /* Request GetKeyboardMapping is opcode 101 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetKeyboardMapping */ ; @@ -3598,8 +3599,8 @@ GetKeyboardMapping(buf) } void -GetKeyboardMappingReply(buf) - unsigned char *buf; +GetKeyboardMappingReply ( + unsigned char *buf) { long n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetKeyboardMapping */ ; @@ -3613,8 +3614,8 @@ GetKeyboardMappingReply(buf) } void -ChangeKeyboardControl(buf) - unsigned char *buf; +ChangeKeyboardControl ( + unsigned char *buf) { /* Request ChangeKeyboardControl is opcode 102 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangeKeyboardControl */ ; @@ -3629,8 +3630,8 @@ ChangeKeyboardControl(buf) } void -GetKeyboardControl(buf) - unsigned char *buf; +GetKeyboardControl ( + unsigned char *buf) { /* Request GetKeyboardControl is opcode 103 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetKeyboardControl */ ; @@ -3643,8 +3644,8 @@ GetKeyboardControl(buf) } void -GetKeyboardControlReply(buf) - unsigned char *buf; +GetKeyboardControlReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetKeyboardControl */ ; if (Verbose < 1) @@ -3661,8 +3662,8 @@ GetKeyboardControlReply(buf) } void -Bell(buf) - unsigned char *buf; +Bell ( + unsigned char *buf) { /* Request Bell is opcode 104 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* Bell */ ; @@ -3676,8 +3677,8 @@ Bell(buf) } void -ChangePointerControl(buf) - unsigned char *buf; +ChangePointerControl ( + unsigned char *buf) { /* Request ChangePointerControl is opcode 105 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ChangePointerControl */ ; @@ -3695,8 +3696,8 @@ ChangePointerControl(buf) } void -GetPointerControl(buf) - unsigned char *buf; +GetPointerControl ( + unsigned char *buf) { /* Request GetPointerControl is opcode 106 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetPointerControl */ ; @@ -3709,8 +3710,8 @@ GetPointerControl(buf) } void -GetPointerControlReply(buf) - unsigned char *buf; +GetPointerControlReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetPointerControl */ ; if (Verbose < 1) @@ -3723,8 +3724,8 @@ GetPointerControlReply(buf) } void -SetScreenSaver(buf) - unsigned char *buf; +SetScreenSaver ( + unsigned char *buf) { /* Request SetScreenSaver is opcode 107 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetScreenSaver */ ; @@ -3741,8 +3742,8 @@ SetScreenSaver(buf) } void -GetScreenSaver(buf) - unsigned char *buf; +GetScreenSaver ( + unsigned char *buf) { /* Request GetScreenSaver is opcode 108 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetScreenSaver */ ; @@ -3755,8 +3756,8 @@ GetScreenSaver(buf) } void -GetScreenSaverReply(buf) - unsigned char *buf; +GetScreenSaverReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetScreenSaver */ ; if (Verbose < 1) @@ -3770,8 +3771,8 @@ GetScreenSaverReply(buf) } void -ChangeHosts(buf) - unsigned char *buf; +ChangeHosts ( + unsigned char *buf) { short n; /* Request ChangeHosts is opcode 109 */ @@ -3794,8 +3795,8 @@ ChangeHosts(buf) } void -ListHosts(buf) - unsigned char *buf; +ListHosts ( + unsigned char *buf) { /* Request ListHosts is opcode 110 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ListHosts */ ; @@ -3808,8 +3809,8 @@ ListHosts(buf) } void -ListHostsReply(buf) - unsigned char *buf; +ListHostsReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* ListHosts */ ; @@ -3824,8 +3825,8 @@ ListHostsReply(buf) } void -SetAccessControl(buf) - unsigned char *buf; +SetAccessControl ( + unsigned char *buf) { /* Request SetAccessControl is opcode 111 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetAccessControl */ ; @@ -3839,8 +3840,8 @@ SetAccessControl(buf) } void -SetCloseDownMode(buf) - unsigned char *buf; +SetCloseDownMode ( + unsigned char *buf) { /* Request SetCloseDownMode is opcode 112 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* SetCloseDownMode */ ; @@ -3854,8 +3855,8 @@ SetCloseDownMode(buf) } void -KillClient(buf) - unsigned char *buf; +KillClient ( + unsigned char *buf) { /* Request KillClient is opcode 113 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* KillClient */ ; @@ -3869,8 +3870,8 @@ KillClient(buf) } void -RotateProperties(buf) - unsigned char *buf; +RotateProperties ( + unsigned char *buf) { short n; /* Request RotateProperties is opcode 114 */ @@ -3889,8 +3890,8 @@ RotateProperties(buf) } void -ForceScreenSaver(buf) - unsigned char *buf; +ForceScreenSaver ( + unsigned char *buf) { /* Request ForceScreenSaver is opcode 115 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* ForceScreenSaver */ ; @@ -3904,8 +3905,8 @@ ForceScreenSaver(buf) } void -SetPointerMapping(buf) - unsigned char *buf; +SetPointerMapping ( + unsigned char *buf) { short n; /* Request SetPointerMapping is opcode 116 */ @@ -3922,8 +3923,8 @@ SetPointerMapping(buf) } void -SetPointerMappingReply(buf) - unsigned char *buf; +SetPointerMappingReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* SetPointerMapping */ ; if (Verbose < 1) @@ -3934,8 +3935,8 @@ SetPointerMappingReply(buf) } void -GetPointerMapping(buf) - unsigned char *buf; +GetPointerMapping ( + unsigned char *buf) { /* Request GetPointerMapping is opcode 117 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetPointerMapping */ ; @@ -3948,8 +3949,8 @@ GetPointerMapping(buf) } void -GetPointerMappingReply(buf) - unsigned char *buf; +GetPointerMappingReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetPointerMapping */ ; @@ -3963,8 +3964,8 @@ GetPointerMappingReply(buf) } void -SetModifierMapping(buf) - unsigned char *buf; +SetModifierMapping ( + unsigned char *buf) { short n; /* Request SetModifierMapping is opcode 118 */ @@ -3988,8 +3989,8 @@ SetModifierMapping(buf) } void -SetModifierMappingReply(buf) - unsigned char *buf; +SetModifierMappingReply ( + unsigned char *buf) { PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* SetModifierMapping */ ; if (Verbose < 1) @@ -4000,8 +4001,8 @@ SetModifierMappingReply(buf) } void -GetModifierMapping(buf) - unsigned char *buf; +GetModifierMapping ( + unsigned char *buf) { /* Request GetModifierMapping is opcode 119 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* GetModifierMapping */ ; @@ -4014,8 +4015,8 @@ GetModifierMapping(buf) } void -GetModifierMappingReply(buf) - unsigned char *buf; +GetModifierMappingReply ( + unsigned char *buf) { short n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetModifierMapping */ ; @@ -4029,8 +4030,8 @@ GetModifierMappingReply(buf) } void -NoOperation(buf) - unsigned char *buf; +NoOperation ( + unsigned char *buf) { /* Request NoOperation is opcode 127 */ PrintField(buf, 0, 1, REQUEST, REQUESTHEADER) /* NoOperation */ ; diff --git a/print_bigreq.c b/print_bigreq.c index 230cee4..e0f1f6f 100644 --- a/print_bigreq.c +++ b/print_bigreq.c @@ -26,6 +26,7 @@ #include "x11.h" #include "bigreqscope.h" +void BigreqEnable (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* BigreqRequest */ ; @@ -38,6 +39,7 @@ BigreqEnable (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } +void BigreqEnableReply (FD fd, unsigned char *buf) { short n; diff --git a/print_lbx.c b/print_lbx.c index d758dd9..03dcaf2 100644 --- a/print_lbx.c +++ b/print_lbx.c @@ -32,8 +32,10 @@ static unsigned char starting_server[256]; static unsigned char starting_client[256]; static int client_client, server_client; -LbxQueryVersion (fd, buf) -register unsigned char *buf; +void +LbxQueryVersion ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* LbxRequest */ ; PrintField (buf, 1, 1, LBXREQUEST, LBXREQUESTHEADER) /* LbxSwitch */ ; @@ -45,8 +47,10 @@ register unsigned char *buf; printfield(buf, 2, 2, CONST2(2), "request length"); } -LbxQueryVersionReply (fd, buf) -register unsigned char *buf; +void +LbxQueryVersionReply ( + FD fd, + unsigned char *buf) { short n; long m; @@ -62,8 +66,10 @@ register unsigned char *buf; PrintField(buf, 10, 2, CARD16, "minor-version"); } -LbxStartProxy (fd, buf) - unsigned char *buf; +void +LbxStartProxy ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* LbxRequest */ ; PrintField (buf, 1, 1, LBXREQUEST, LBXREQUESTHEADER) /* LbxSwitch */ ; @@ -75,8 +81,10 @@ LbxStartProxy (fd, buf) printfield(buf, 2, 2, CONST2(2), "request length"); } -LbxStopProxy (fd, buf) - unsigned char *buf; +void +LbxStopProxy ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* LbxRequest */ ; PrintField (buf, 1, 1, LBXREQUEST, LBXREQUESTHEADER) /* LbxSwitch */ ; @@ -88,8 +96,10 @@ LbxStopProxy (fd, buf) printfield(buf, 2, 2, CONST2(2), "request length"); } -LbxNewClient (fd, buf) -register unsigned char *buf; +void +LbxNewClient ( + FD fd, + unsigned char *buf) { unsigned long c; @@ -109,16 +119,17 @@ register unsigned char *buf; PrintField(buf, 4, 4, CARD32, "new-client-id"); } -LbxCloseClient (fd, buf) - unsigned char *buf; +void +LbxCloseClient ( + FD fd, + unsigned char *buf) { } -long StartSetUpMessage (); -long StartSetUpReply (); - -LbxSwitch (fd, buf) -register unsigned char *buf; +void +LbxSwitch ( + FD fd, + unsigned char *buf) { unsigned long c; c = ILong(&buf[4]); @@ -145,8 +156,10 @@ register unsigned char *buf; PrintField(buf, 4, 4, CARD32, "client number"); } -LbxModifySequence (fd, buf) - unsigned char *buf; +void +LbxModifySequence ( + FD fd, + unsigned char *buf) { int mod; @@ -164,8 +177,10 @@ LbxModifySequence (fd, buf) printfield(buf, 4, 4, INT32, "adjustment"); } -LbxSwitchEvent (fd, buf) - unsigned char *buf; +void +LbxSwitchEvent ( + FD fd, + unsigned char *buf) { unsigned long c; @@ -185,8 +200,10 @@ LbxSwitchEvent (fd, buf) PrintField(buf, 4, 4, CARD32, "client"); } -LbxCloseEvent (fd, buf) - unsigned char *buf; +void +LbxCloseEvent ( + FD fd, + unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* LbxEvent */ ; PrintField(buf, 1, 1, LBXEVENT, LBXEVENTHEADER) /* LbxSwitchEvent */ ; diff --git a/print_randr.c b/print_randr.c index da2da74..03893d4 100644 --- a/print_randr.c +++ b/print_randr.c @@ -26,6 +26,7 @@ #include "x11.h" #include "randrscope.h" +void RandrQueryVersion (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RandrRequest */ ; @@ -37,6 +38,8 @@ RandrQueryVersion (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RandrQueryVersionReply (FD fd, unsigned char *buf) { short n; @@ -52,6 +55,8 @@ RandrQueryVersionReply (FD fd, unsigned char *buf) PrintField(buf, 8, 2, CARD16, "major-version"); PrintField(buf, 10, 2, CARD16, "minor-version"); } + +void RandrGetScreenInfo (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RandrRequest */ ; @@ -65,6 +70,7 @@ RandrGetScreenInfo (FD fd, unsigned char *buf) PrintField(buf, 4, 4, WINDOW, "window"); } +void RandrGetScreenInfoReply (FD fd, unsigned char *buf) { short n; @@ -95,6 +101,7 @@ RandrGetScreenInfoReply (FD fd, unsigned char *buf) PrintField(buf,30, 2, CARD16, "rotation"); } +void RandrSetScreenConfig (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RandrRequest */ ; @@ -113,6 +120,7 @@ RandrSetScreenConfig (FD fd, unsigned char *buf) PrintField(buf,20, 2, CARD16, "visual-group-id"); } +void RandrSetScreenConfigReply (FD fd, unsigned char *buf) { short n; @@ -130,6 +138,7 @@ RandrSetScreenConfigReply (FD fd, unsigned char *buf) PrintField(buf,16, 4, WINDOW, "root"); } +void RandrScreenChangeSelectInput (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RandrRequest */ ; @@ -144,8 +153,8 @@ RandrScreenChangeSelectInput (FD fd, unsigned char *buf) PrintField(buf, 8, 1, BOOL, "enable"); } -RandrScreenSizes (buf) - unsigned char *buf; +void +RandrScreenSizes (unsigned char *buf) { PrintField(buf, 0, 2, CARD16, "width-in-pixels"); PrintField(buf, 2, 2, CARD16, "height-in-pixels"); @@ -154,8 +163,8 @@ RandrScreenSizes (buf) PrintField(buf, 8, 2, CARD16, "visual-group"); } -RandrScreenChangeNotifyEvent(buf) - unsigned char *buf; +void +RandrScreenChangeNotifyEvent (unsigned char *buf) { PrintField(buf, 0, 1, EVENT, EVENTHEADER) /* RRScreenChangeNotify */ ; if (Verbose < 1) diff --git a/print_render.c b/print_render.c index fa56d17..0bcc370 100644 --- a/print_render.c +++ b/print_render.c @@ -26,6 +26,7 @@ #include "x11.h" #include "renderscope.h" +void RenderQueryVersion (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -37,6 +38,8 @@ RenderQueryVersion (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderQueryVersionReply (FD fd, unsigned char *buf) { short n; @@ -52,6 +55,8 @@ RenderQueryVersionReply (FD fd, unsigned char *buf) PrintField(buf, 8, 2, CARD16, "major-version"); PrintField(buf, 10, 2, CARD16, "minor-version"); } + +void RenderQueryPictFormats (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -63,6 +68,8 @@ RenderQueryPictFormats (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderQueryPictFormatsReply (FD fd, unsigned char *buf) { long n; @@ -86,6 +93,8 @@ RenderQueryPictFormatsReply (FD fd, unsigned char *buf) v = ILong (&buf[20]); PrintList (&buf[32], (long) f, PICTFORMINFO, "pict-formats"); } + +void RenderQueryPictIndexValues (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -97,6 +106,8 @@ RenderQueryPictIndexValues (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderQueryPictIndexValuesReply (FD fd, unsigned char *buf) { short n; @@ -110,6 +121,8 @@ RenderQueryPictIndexValuesReply (FD fd, unsigned char *buf) printfield(buf, 2, 2, CARD16, "sequence number"); printfield(buf, 4, 4, DVALUE4(0), "reply length"); } + +void RenderQueryDithers (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -121,6 +134,8 @@ RenderQueryDithers (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderQueryDithersReply (FD fd, unsigned char *buf) { short n; @@ -134,6 +149,8 @@ RenderQueryDithersReply (FD fd, unsigned char *buf) printfield(buf, 2, 2, CARD16, "sequence number"); printfield(buf, 4, 4, DVALUE4(0), "reply length"); } + +void RenderCreatePicture (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -150,6 +167,8 @@ RenderCreatePicture (FD fd, unsigned char *buf) PrintField(buf, 16, 4, PICTURE_BITMASK, "value-mask"); PrintValues(&buf[16], 4, PICTURE_BITMASK, &buf[20], "value-list"); } + +void RenderChangePicture (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -164,6 +183,8 @@ RenderChangePicture (FD fd, unsigned char *buf) PrintField(buf, 8, 4, PICTURE_BITMASK, "value-mask"); PrintValues(&buf[8], 4, PICTURE_BITMASK, &buf[12], "value-list"); } + +void RenderSetPictureClipRectangles (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -175,6 +196,8 @@ RenderSetPictureClipRectangles (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderFreePicture (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -186,6 +209,8 @@ RenderFreePicture (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderComposite (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -197,6 +222,8 @@ RenderComposite (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderScale (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -208,6 +235,8 @@ RenderScale (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderTrapezoids (FD fd, unsigned char *buf) { int n; @@ -229,6 +258,7 @@ RenderTrapezoids (FD fd, unsigned char *buf) PrintList(&buf[24], (long)n, TRAPEZOID, "trapezoids"); } +void RenderTriangles (FD fd, unsigned char *buf) { long n; @@ -249,6 +279,8 @@ RenderTriangles (FD fd, unsigned char *buf) n = (CS[fd].requestLen - 6) / 6; PrintList(&buf[24], (long)n, TRIANGLE, "triangles"); } + +void RenderTriStrip (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -260,6 +292,8 @@ RenderTriStrip (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderTriFan (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -271,6 +305,8 @@ RenderTriFan (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderColorTrapezoids (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -282,6 +318,8 @@ RenderColorTrapezoids (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderColorTriangles (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -293,6 +331,8 @@ RenderColorTriangles (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderTransform (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -304,6 +344,8 @@ RenderTransform (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderCreateGlyphSet (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -317,6 +359,8 @@ RenderCreateGlyphSet (FD fd, unsigned char *buf) PrintField(buf, 4, 4, GLYPHSET, "glyphset"); PrintField(buf, 8, 4, PICTFORMAT, "format"); } + +void RenderReferenceGlyphSet (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -328,6 +372,8 @@ RenderReferenceGlyphSet (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderFreeGlyphSet (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -340,9 +386,8 @@ RenderFreeGlyphSet (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); PrintField(buf, 4, 4, GLYPHSET, "glyphset"); } -extern char Leader[]; -void +static void PrintGlyphs(unsigned char *buf, int n, char *name) { unsigned char *gids; @@ -365,6 +410,7 @@ PrintGlyphs(unsigned char *buf, int n, char *name) } } +void RenderAddGlyphs (FD fd, unsigned char *buf) { long n; @@ -383,6 +429,8 @@ RenderAddGlyphs (FD fd, unsigned char *buf) PrintField(buf, 8, 4, CARD32, "nglyphs"); PrintGlyphs(&buf[12], ILong(&buf[8]), "glyphs"); } + +void RenderAddGlyphsFromPicture (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* RenderRequest */ ; @@ -395,6 +443,8 @@ RenderAddGlyphsFromPicture (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } + +void RenderFreeGlyphs (FD fd, unsigned char *buf) { unsigned short n; @@ -411,9 +461,7 @@ RenderFreeGlyphs (FD fd, unsigned char *buf) (void)PrintList(&buf[8], (long)n, CARD32, "glyphs"); } -extern char Leader[]; - -void +static void PrintGlyphList(unsigned char *buf, int length, char *name, int size) { short n; @@ -448,6 +496,7 @@ PrintGlyphList(unsigned char *buf, int length, char *name, int size) } } +void RenderCompositeGlyphs8 (FD fd, unsigned char *buf) { int n; @@ -471,6 +520,7 @@ RenderCompositeGlyphs8 (FD fd, unsigned char *buf) PrintGlyphList(&buf[28], n, "items", 1); } +void RenderCompositeGlyphs16 (FD fd, unsigned char *buf) { int n; @@ -494,6 +544,8 @@ RenderCompositeGlyphs16 (FD fd, unsigned char *buf) PrintField(buf, 26, 2, INT16, "y-src"); PrintGlyphList(&buf[28], n, "items", 2); } + +void RenderCompositeGlyphs32 (FD fd, unsigned char *buf) { int n; @@ -516,6 +568,8 @@ RenderCompositeGlyphs32 (FD fd, unsigned char *buf) PrintField(buf, 26, 2, INT16, "y-src"); PrintGlyphList(&buf[28], n, "items", 4); } + +void RenderFillRectangles (FD fd, unsigned char *buf) { int n; @@ -533,7 +587,9 @@ RenderFillRectangles (FD fd, unsigned char *buf) PrintField(buf, 12, 8, RENDERCOLOR, "color"); (void)PrintList(&buf[20], (long)n, RECTANGLE, "rectangles"); } -RenderPictFormatError (fd, buf) + +void +RenderPictFormatError (FD fd, unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) @@ -544,7 +600,8 @@ RenderPictFormatError (fd, buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -RenderPictureError (fd, buf) +void +RenderPictureError (FD fd, unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) @@ -555,7 +612,8 @@ RenderPictureError (fd, buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -RenderPictOpError (fd, buf) +void +RenderPictOpError (FD fd, unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) @@ -566,7 +624,8 @@ RenderPictOpError (fd, buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -RenderGlyphSetError (fd, buf) +void +RenderGlyphSetError (FD fd, unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) @@ -577,7 +636,8 @@ RenderGlyphSetError (fd, buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -RenderGlyphError (fd, buf) +void +RenderGlyphError (FD fd, unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (Verbose < 1) diff --git a/print_shm.c b/print_shm.c index e5a5b3e..f100477 100644 --- a/print_shm.c +++ b/print_shm.c @@ -26,6 +26,7 @@ #include "x11.h" #include "shmscope.h" +void MitshmQueryVersion (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -38,6 +39,7 @@ MitshmQueryVersion (FD fd, unsigned char *buf) printfield(buf, 2, 2, CONST2(2), "request length"); } +void MitshmQueryVersionReply (FD fd, unsigned char *buf) { short n; @@ -56,6 +58,8 @@ MitshmQueryVersionReply (FD fd, unsigned char *buf) PrintField(buf, 14, 2, CARD16, "gid"); PrintField(buf, 16, 1, CARD8, "pxiamp-fromat"); } + +void MitshmAttach (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -71,6 +75,7 @@ MitshmAttach (FD fd, unsigned char *buf) PrintField(buf, 12, 1, BOOL, "read-only"); } +void MitshmDetach (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -84,6 +89,7 @@ MitshmDetach (FD fd, unsigned char *buf) PrintField (buf, 4, 4, CARD32, "shmseg"); } +void MitshmPutImage (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -112,6 +118,7 @@ MitshmPutImage (FD fd, unsigned char *buf) PrintField (buf, 36, 4, CARD32, "offset"); } +void MitshmGetImage (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -133,6 +140,7 @@ MitshmGetImage (FD fd, unsigned char *buf) PrintField (buf, 28, 4, CARD32, "shmseg"); } +void MitshmGetImageReply (FD fd, unsigned char *buf) { short n; @@ -148,6 +156,7 @@ MitshmGetImageReply (FD fd, unsigned char *buf) PrintField(buf, 8, 4, VISUALID, "visual"); } +void MitshmCreatePixmap (FD fd, unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* MitshmRequest */ ; @@ -166,6 +175,8 @@ MitshmCreatePixmap (FD fd, unsigned char *buf) PrintField(buf, 20, 4, CARD32, "shmseg"); PrintField(buf, 24, 4, CARD32, "offset"); } -MitshmShmSegError (fd, buf) + +void +MitshmShmSegError (FD fd, unsigned char *buf) { } diff --git a/print_wcp.c b/print_wcp.c index e86158f..4f864f0 100644 --- a/print_wcp.c +++ b/print_wcp.c @@ -27,8 +27,10 @@ #include "x11.h" #include "wcpscope.h" -WcpQueryVersion (fd, buf) -register unsigned char *buf; +void +WcpQueryVersion ( + FD fd, + register unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -40,8 +42,10 @@ register unsigned char *buf; printfield(buf, 2, 2, CONST2(2), "request length"); } -WcpQueryVersionReply (fd, buf) -register unsigned char *buf; +void +WcpQueryVersionReply ( + FD fd, + unsigned char *buf) { short n; long m; @@ -59,13 +63,12 @@ register unsigned char *buf; #define NextByte(dst) if (!len--) { error = "Out of data"; break; } dst = *data++; -extern char Leader[]; - -WcpAnalyzeImage1RLL (buf, len, width, height) - char *buf; - int len; - int width; - int height; +static void +WcpAnalyzeImage1RLL ( + char *buf, + int len, + int width, + int height) { unsigned char byte; unsigned char *data = (unsigned char *) buf; @@ -118,12 +121,13 @@ WcpAnalyzeImage1RLL (buf, len, width, height) x, y - 1, (char *) data - buf); } -WcpAnalyzeImageNRLL (buf, len, width, height, bytes) - char *buf; - int len; - int width; - int height; - int bytes; +static void +WcpAnalyzeImageNRLL ( + char *buf, + int len, + int width, + int height, + int bytes) { } @@ -137,9 +141,9 @@ WcpAnalyzeImageNRLL (buf, len, width, height, bytes) typedef unsigned long PIXEL; static void -init_cache (cache, BPP) - PIXEL cache[LRU_CACHE]; - int BPP; +init_cache ( + PIXEL cache[LRU_CACHE], + int BPP) { int e; @@ -154,9 +158,9 @@ init_cache (cache, BPP) } static void -push (cache, pixel) - PIXEL cache[LRU_CACHE]; - PIXEL pixel; +push ( + PIXEL cache[LRU_CACHE], + PIXEL pixel) { int e; @@ -167,9 +171,9 @@ push (cache, pixel) } static PIXEL -use (cache, e) - PIXEL cache[LRU_CACHE]; - int e; +use ( + PIXEL cache[LRU_CACHE], + int e) { PIXEL tmp; @@ -184,9 +188,9 @@ use (cache, e) } static int -match (cache, pixel) - PIXEL cache[LRU_CACHE]; - PIXEL pixel; +match ( + PIXEL cache[LRU_CACHE], + PIXEL pixel) { int e; @@ -200,12 +204,13 @@ match (cache, pixel) return LRU_MISS; } -WcpAnalyzeImageNLRU (buf, len, width, height, bytes) - char *buf; - int len; - int width; - int height; - int bytes; +static void +WcpAnalyzeImageNLRU ( + char *buf, + int len, + int width, + int height, + int bytes) { unsigned char *data = (unsigned char *) buf; unsigned char byte; @@ -285,13 +290,14 @@ WcpAnalyzeImageNLRU (buf, len, width, height, bytes) x, y - 1, (char *) data - buf); } -WcpAnalyzeImage (buf, len, depth, encoding, width, height) - char *buf; - int len; - int depth; - int encoding; - int width; - int height; +static void +WcpAnalyzeImage ( + char *buf, + int len, + int depth, + int encoding, + int width, + int height) { int bytes; @@ -340,8 +346,10 @@ WcpAnalyzeImage (buf, len, depth, encoding, width, height) fprintf (stdout, "encoding %d depth %d\n", encoding, depth); } -WcpPutImage (fd, buf) - unsigned char *buf; +void +WcpPutImage ( + FD fd, + unsigned char *buf) { int n; PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; @@ -376,8 +384,10 @@ WcpPutImage (fd, buf) PrintBytes(&buf[28], (long)n, "data"); } -WcpGetImage (fd, buf) - unsigned char *buf; +void +WcpGetImage ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -396,8 +406,10 @@ WcpGetImage (fd, buf) PrintField(buf, 20, 1, CARD8, "encoding"); } -WcpGetImageReply (fd, buf) -register unsigned char *buf; +void +WcpGetImageReply ( + FD fd, + unsigned char *buf) { long n; @@ -412,8 +424,10 @@ register unsigned char *buf; PrintBytes (&buf[32], n, "data"); } -WcpCreateColorCursor (fd, buf) -register unsigned char *buf; +void +WcpCreateColorCursor ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -425,8 +439,10 @@ register unsigned char *buf; printfield(buf, 2, 2, CONST2(2), "request length"); } -WcpCreateLut (fd, buf) -register unsigned char *buf; +void +WcpCreateLut ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -438,8 +454,10 @@ register unsigned char *buf; printfield(buf, 2, 2, CONST2(2), "request length"); } -WcpFreeLut (fd, buf) -register unsigned char *buf; +void +WcpFreeLut ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -451,8 +469,10 @@ register unsigned char *buf; printfield(buf, 2, 2, CONST2(2), "request length"); } -WcpCopyArea (fd, buf) -register unsigned char *buf; +void +WcpCopyArea ( + FD fd, + unsigned char *buf) { PrintField (buf, 0, 1, REQUEST, REQUESTHEADER) /* WcpRequest */ ; PrintField (buf, 1, 1, WCPREQUEST, WCPREQUESTHEADER) /* WcpSwitch */ ; @@ -40,14 +40,17 @@ #define printfield(a,b,c,d,e) if (NasVerbose > 1) PrintField(a,b,c,d,e) +static void PrintFailedAudioSetUpReply (unsigned char *buf); +static void PrintSuccessfulAudioSetUpReply (unsigned char *buf); /* ************************************************************ */ /* */ /* */ /* ************************************************************ */ -PrintAudioSetUpMessage(buf) - unsigned char *buf; +void +PrintAudioSetUpMessage( + unsigned char *buf) { short n; short d; @@ -67,8 +70,8 @@ PrintAudioSetUpMessage(buf) PrintString8(&buf[pad((long)(12+n))], (long)d, "authorization-protocol-data"); } -PrintAudioSetUpReply(buf) - unsigned char *buf; +void +PrintAudioSetUpReply(unsigned char *buf) { enterprocedure("PrintSetUpReply"); SetIndentLevel(PRINTSERVER); @@ -78,8 +81,8 @@ PrintAudioSetUpReply(buf) PrintFailedAudioSetUpReply(buf); } -PrintFailedAudioSetUpReply(buf) - unsigned char *buf; +static void +PrintFailedAudioSetUpReply(unsigned char *buf) { short n; @@ -94,8 +97,9 @@ PrintFailedAudioSetUpReply(buf) PrintString8(&buf[8], (long)n, "reason"); } -PrintSuccessfulAudioSetUpReply(buf) - unsigned char *buf; +static void +PrintSuccessfulAudioSetUpReply( + unsigned char *buf) { short v; short n; @@ -128,16 +132,6 @@ PrintSuccessfulAudioSetUpReply(buf) } -/* ************************************************************ */ -/* */ -/* */ -/* ************************************************************ */ - -extern char *REQUESTHEADER; -extern char *EVENTHEADER; -extern char *ERRORHEADER; -extern char *REPLYHEADER; - /* ************************************************************ */ /* */ @@ -146,8 +140,9 @@ extern char *REPLYHEADER; /* Error Printing procedures */ -AudioRequestError(buf) - unsigned char *buf; +static void +AudioRequestError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Request */ ; if (NasVerbose < 1) @@ -157,8 +152,9 @@ AudioRequestError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioValueError(buf) - unsigned char *buf; +static void +AudioValueError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Value */ ; if (NasVerbose < 1) @@ -169,8 +165,9 @@ AudioValueError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioMatchError(buf) - unsigned char *buf; +static void +AudioMatchError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Match */ ; if (NasVerbose < 1) @@ -180,8 +177,9 @@ AudioMatchError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioAccessError(buf) - unsigned char *buf; +static void +AudioAccessError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Access */ ; if (NasVerbose < 1) @@ -191,8 +189,9 @@ AudioAccessError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioAllocError(buf) - unsigned char *buf; +static void +AudioAllocError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Alloc */ ; if (NasVerbose < 1) @@ -202,8 +201,9 @@ AudioAllocError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioIDChoiceError(buf) - unsigned char *buf; +static void +AudioIDChoiceError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* IDChoice */ ; if (NasVerbose < 1) @@ -214,8 +214,9 @@ AudioIDChoiceError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioLengthError(buf) - unsigned char *buf; +static void +AudioLengthError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Length */ ; if (NasVerbose < 1) @@ -225,8 +226,9 @@ AudioLengthError(buf) PrintField(buf, 10, 1, CARD8, "major opcode"); } -AudioImplementationError(buf) - unsigned char *buf; +static void +AudioImplementationError( + unsigned char *buf) { PrintField(buf, 1, 1, ERROR, ERRORHEADER) /* Implementation */ ; if (NasVerbose < 1) @@ -243,8 +245,9 @@ AudioImplementationError(buf) /* Event Printing procedures */ -AudioElementNotify (buf) - unsigned char *buf; +void +AudioElementNotify ( + unsigned char *buf) { PrintField(buf, 0, 1, NASEVENT, EVENTHEADER); if (NasVerbose < 1) @@ -261,13 +264,15 @@ AudioElementNotify (buf) printfield(buf, 24, 4, CARD32, "num bytes"); } -AudioGrabNotify (buf) - unsigned char *buf; +void +AudioGrabNotify ( + unsigned char *buf) { } -AudioMonitorNotify (buf) - unsigned char *buf; +void +AudioMonitorNotify ( + unsigned char *buf) { PrintField(buf, 0, 1, NASEVENT, EVENTHEADER); if (NasVerbose < 1) @@ -286,13 +291,15 @@ AudioMonitorNotify (buf) PrintField(buf, 28, 4, CARD32, "data2"); } -AudioBucketNotify (buf) - unsigned char *buf; +void +AudioBucketNotify ( + unsigned char *buf) { } -AudioDeviceNotify (buf) - unsigned char *buf; +void +AudioDeviceNotify ( + unsigned char *buf) { } @@ -303,8 +310,9 @@ AudioDeviceNotify (buf) /* Request and Reply Printing procedures */ -UnknownAudioReply(buf) - unsigned char *buf; +void +UnknownAudioReply( + unsigned char *buf) { long n; @@ -316,8 +324,9 @@ UnknownAudioReply(buf) (void) PrintList (&buf[8], n, CARD32, "data"); } -AudioListDevices (buf) - unsigned char *buf; +void +AudioListDevices ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER) /* ListDevices */; if (NasVerbose < 1) @@ -327,8 +336,9 @@ AudioListDevices (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListDevicesReply(buf) - unsigned char *buf; +void +AudioListDevicesReply( + unsigned char *buf) { long n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER) /* GetWindowAttributes */ ; @@ -340,9 +350,9 @@ AudioListDevicesReply(buf) n = ILong(&buf[8]); } -static -AuString (buf) - unsigned char *buf; +static long +AuString ( + unsigned char *buf) { long n; @@ -353,9 +363,9 @@ AuString (buf) return 8 + pad(n); } -static -AuDeviceAttributes (buf) - unsigned char *buf; +static void +AuDeviceAttributes ( + unsigned char *buf) { int l; printfield(buf, 0, 4, CARD32, "value mask"); @@ -369,8 +379,9 @@ AuDeviceAttributes (buf) l = 20 + AuString(&buf[20]); } -AudioGetDeviceAttributes (buf) - unsigned char *buf; +void +AudioGetDeviceAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -380,8 +391,9 @@ AudioGetDeviceAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetDeviceAttributesReply (buf) - unsigned char *buf; +void +AudioGetDeviceAttributesReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -391,8 +403,9 @@ AudioGetDeviceAttributesReply (buf) AuDeviceAttributes (&buf[32]); } -AudioSetDeviceAttributes (buf) - unsigned char *buf; +void +AudioSetDeviceAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -404,8 +417,9 @@ AudioSetDeviceAttributes (buf) AuDeviceAttributes (&buf[8]); } -AudioCreateBucket (buf) - unsigned char *buf; +void +AudioCreateBucket ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -415,8 +429,9 @@ AudioCreateBucket (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioDestroyBucket (buf) - unsigned char *buf; +void +AudioDestroyBucket ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -426,8 +441,9 @@ AudioDestroyBucket (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListBuckets (buf) - unsigned char *buf; +void +AudioListBuckets ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -437,8 +453,9 @@ AudioListBuckets (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListBucketsReply (buf) - unsigned char *buf; +void +AudioListBucketsReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -447,8 +464,9 @@ AudioListBucketsReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioGetBucketAttributes (buf) - unsigned char *buf; +void +AudioGetBucketAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -458,8 +476,9 @@ AudioGetBucketAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetBucketAttributesReply (buf) - unsigned char *buf; +void +AudioGetBucketAttributesReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -468,8 +487,9 @@ AudioGetBucketAttributesReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetBucketAttributes (buf) - unsigned char *buf; +void +AudioSetBucketAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -479,8 +499,9 @@ AudioSetBucketAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioCreateRadio (buf) - unsigned char *buf; +void +AudioCreateRadio ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -490,8 +511,9 @@ AudioCreateRadio (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioDestroyRadio (buf) - unsigned char *buf; +void +AudioDestroyRadio ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -501,8 +523,9 @@ AudioDestroyRadio (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListRadios (buf) - unsigned char *buf; +void +AudioListRadios ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -512,8 +535,9 @@ AudioListRadios (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListRadiosReply (buf) - unsigned char *buf; +void +AudioListRadiosReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -522,8 +546,9 @@ AudioListRadiosReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioGetRadioAttributes (buf) - unsigned char *buf; +void +AudioGetRadioAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -533,8 +558,9 @@ AudioGetRadioAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetRadioAttributesReply (buf) - unsigned char *buf; +void +AudioGetRadioAttributesReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -543,8 +569,9 @@ AudioGetRadioAttributesReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetRadioAttributes (buf) - unsigned char *buf; +void +AudioSetRadioAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -554,8 +581,9 @@ AudioSetRadioAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioCreateFlow (buf) - unsigned char *buf; +void +AudioCreateFlow ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -565,8 +593,9 @@ AudioCreateFlow (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioDestroyFlow (buf) - unsigned char *buf; +void +AudioDestroyFlow ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -576,8 +605,9 @@ AudioDestroyFlow (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetFlowAttributes (buf) - unsigned char *buf; +void +AudioGetFlowAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -587,8 +617,9 @@ AudioGetFlowAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetFlowAttributesReply (buf) - unsigned char *buf; +void +AudioGetFlowAttributesReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -597,8 +628,9 @@ AudioGetFlowAttributesReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetFlowAttributes (buf) - unsigned char *buf; +void +AudioSetFlowAttributes ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -608,8 +640,9 @@ AudioSetFlowAttributes (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetElements (buf) - unsigned char *buf; +void +AudioGetElements ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -619,8 +652,9 @@ AudioGetElements (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetElementsReply (buf) - unsigned char *buf; +void +AudioGetElementsReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -629,8 +663,9 @@ AudioGetElementsReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetElements (buf) - unsigned char *buf; +void +AudioSetElements ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -640,8 +675,9 @@ AudioSetElements (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetElementStates (buf) - unsigned char *buf; +void +AudioGetElementStates ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -651,16 +687,18 @@ AudioGetElementStates (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioElementState (buf) - unsigned char *buf; +void +AudioElementState ( + unsigned char *buf) { printfield(buf, 0, 4, CARD32, "flow"); printfield(buf, 4, 1, CARD8, "element number"); printfield(buf, 5, 1, CARD8, "state"); } -AudioGetElementStatesReply (buf) - unsigned char *buf; +void +AudioGetElementStatesReply ( + unsigned char *buf) { int n, i; int o; @@ -679,8 +717,9 @@ AudioGetElementStatesReply (buf) } } -AudioSetElementStates (buf) - unsigned char *buf; +void +AudioSetElementStates ( + unsigned char *buf) { int nstates, i; int o; @@ -700,8 +739,9 @@ AudioSetElementStates (buf) } } -AudioGetElementParameters (buf) - unsigned char *buf; +void +AudioGetElementParameters ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -711,8 +751,9 @@ AudioGetElementParameters (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetElementParametersReply (buf) - unsigned char *buf; +void +AudioGetElementParametersReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -721,8 +762,9 @@ AudioGetElementParametersReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetElementParameters (buf) - unsigned char *buf; +void +AudioSetElementParameters ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -732,8 +774,9 @@ AudioSetElementParameters (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioWriteElement (buf) - unsigned char *buf; +void +AudioWriteElement ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -746,8 +789,9 @@ AudioWriteElement (buf) printfield(buf, 12, 1, CARD8, "state"); } -AudioReadElement (buf) - unsigned char *buf; +void +AudioReadElement ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -757,8 +801,9 @@ AudioReadElement (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioReadElementReply (buf) - unsigned char *buf; +void +AudioReadElementReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -767,8 +812,9 @@ AudioReadElementReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioGrabComponent (buf) - unsigned char *buf; +void +AudioGrabComponent ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -778,8 +824,9 @@ AudioGrabComponent (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioUngrabComponent (buf) - unsigned char *buf; +void +AudioUngrabComponent ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -789,8 +836,9 @@ AudioUngrabComponent (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioSendEvent (buf) - unsigned char *buf; +void +AudioSendEvent ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -800,8 +848,9 @@ AudioSendEvent (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetAllowedUsers (buf) - unsigned char *buf; +void +AudioGetAllowedUsers ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -811,8 +860,9 @@ AudioGetAllowedUsers (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetAllowedUsersReply (buf) - unsigned char *buf; +void +AudioGetAllowedUsersReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -821,8 +871,9 @@ AudioGetAllowedUsersReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetAllowedUsers (buf) - unsigned char *buf; +void +AudioSetAllowedUsers ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -832,8 +883,9 @@ AudioSetAllowedUsers (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListExtensions (buf) - unsigned char *buf; +void +AudioListExtensions ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -843,8 +895,9 @@ AudioListExtensions (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioListExtensionsReply (buf) - unsigned char *buf; +void +AudioListExtensionsReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -853,8 +906,9 @@ AudioListExtensionsReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioQueryExtension (buf) - unsigned char *buf; +void +AudioQueryExtension ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -864,8 +918,9 @@ AudioQueryExtension (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioQueryExtensionReply (buf) - unsigned char *buf; +void +AudioQueryExtensionReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -874,8 +929,9 @@ AudioQueryExtensionReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioGetCloseDownMode (buf) - unsigned char *buf; +void +AudioGetCloseDownMode ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -885,8 +941,9 @@ AudioGetCloseDownMode (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetCloseDownModeReply (buf) - unsigned char *buf; +void +AudioGetCloseDownModeReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -895,8 +952,9 @@ AudioGetCloseDownModeReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioSetCloseDownMode (buf) - unsigned char *buf; +void +AudioSetCloseDownMode ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -906,8 +964,9 @@ AudioSetCloseDownMode (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioKillClient (buf) - unsigned char *buf; +void +AudioKillClient ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -917,8 +976,9 @@ AudioKillClient (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetServerTime (buf) - unsigned char *buf; +void +AudioGetServerTime ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -928,8 +988,9 @@ AudioGetServerTime (buf) printfield(buf, 2, 2, DVALUE2(8 + n), "request length"); } -AudioGetServerTimeReply (buf) - unsigned char *buf; +void +AudioGetServerTimeReply ( + unsigned char *buf) { PrintField (RBf, 0, 1, NASREPLY, REPLYHEADER); if (NasVerbose < 1) @@ -938,8 +999,9 @@ AudioGetServerTimeReply (buf) printfield(buf, 4, 4, DVALUE4((n + p) / 4), "reply length"); } -AudioNoOperation (buf) - unsigned char *buf; +void +AudioNoOperation ( + unsigned char *buf) { PrintField (buf, 0, 1, NASREQUEST, REQUESTHEADER); if (NasVerbose < 1) @@ -1,271 +1,317 @@ #include "x11.h" /* common.c */ -void enterprocedure(char *s); -void warn(char *s); -void panic(char *s); -void *Malloc(long n); -void Free(void *p); -void SetSignalHandling(void); -void SetUpConnectionSocket(int iport, int (*connectionFunc)()); +extern void enterprocedure (char *s); +extern void warn (char *s); +extern void panic (char *s); +extern void *Malloc (long n); +extern void Free (void *p); +extern void SetSignalHandling (void); +extern void SetUpConnectionSocket (int iport, void (*connectionFunc) (int)); + /* decode11.c */ -void InitReplyQ(void); -void FlushReplyQ(FD fd); -void KeepLastReplyExpected(void); -void DecodeRequest(FD fd, unsigned char *buf, long n); -void DecodeReply(FD fd, unsigned char *buf, long n); -void DecodeError(FD fd, unsigned char *buf, long n); -void DecodeEvent(FD fd, unsigned char *buf, long n); +extern void InitReplyQ (void); +extern void FlushReplyQ (FD fd); +extern short CheckReplyTable (FD fd, short SequenceNumber, short *minorp); +extern void ReplyExpected (FD fd, short Request); +extern void ExtendedReplyExpected (FD fd, short Request, short RequestMinor); +extern void KeepLastReplyExpected (void); + +extern void DecodeRequest (FD fd, unsigned char *buf, long n); +extern void DecodeReply (FD fd, unsigned char *buf, long n); +extern void DecodeError (FD fd, unsigned char *buf, long n); +extern void DecodeEvent (FD fd, unsigned char *buf, long n); + +/* X11 Extension decoders in decode_*.c */ +#define extension_decode_prototypes(ext) \ + extern void ext##_decode_req (FD fd, unsigned char *buf); \ + extern void ext##_decode_reply (FD fd, unsigned char *buf, \ + short RequestMinor); \ + extern void ext##_decode_error (FD fd, unsigned char *buf); \ + extern void ext##_decode_event (FD fd, unsigned char *buf) + +extension_decode_prototypes(bigreq); +extension_decode_prototypes(lbx); +extension_decode_prototypes(mitshm); +extension_decode_prototypes(randr); +extension_decode_prototypes(render); +extension_decode_prototypes(wcp); + +extern void InitializeBIGREQ (unsigned char *buf); +extern void InitializeLBX (unsigned char *buf); +extern void InitializeMITSHM (unsigned char *buf); +extern void InitializeRANDR (unsigned char *buf); +extern void InitializeRENDER (unsigned char *buf); +extern void InitializeWCP (unsigned char *buf); + /* print11.c */ -void PrintSetUpMessage(unsigned char *buf); -void PrintSetUpReply(unsigned char *buf); -void RequestError(unsigned char *buf); -void ValueError(unsigned char *buf); -void WindowError(unsigned char *buf); -void PixmapError(unsigned char *buf); -void AtomError(unsigned char *buf); -void CursorError(unsigned char *buf); -void FontError(unsigned char *buf); -void MatchError(unsigned char *buf); -void DrawableError(unsigned char *buf); -void AccessError(unsigned char *buf); -void AllocError(unsigned char *buf); -void ColormapError(unsigned char *buf); -void GContextError(unsigned char *buf); -void IDChoiceError(unsigned char *buf); -void NameError(unsigned char *buf); -void LengthError(unsigned char *buf); -void ImplementationError(unsigned char *buf); -void KeyPressEvent(unsigned char *buf); -void KeyReleaseEvent(unsigned char *buf); -void ButtonPressEvent(unsigned char *buf); -void ButtonReleaseEvent(unsigned char *buf); -void MotionNotifyEvent(unsigned char *buf); -void EnterNotifyEvent(unsigned char *buf); -void LeaveNotifyEvent(unsigned char *buf); -void FocusInEvent(unsigned char *buf); -void FocusOutEvent(unsigned char *buf); -void KeymapNotifyEvent(unsigned char *buf); -void ExposeEvent(unsigned char *buf); -void GraphicsExposureEvent(unsigned char *buf); -void NoExposureEvent(unsigned char *buf); -void VisibilityNotifyEvent(unsigned char *buf); -void CreateNotifyEvent(unsigned char *buf); -void DestroyNotifyEvent(unsigned char *buf); -void UnmapNotifyEvent(unsigned char *buf); -void MapNotifyEvent(unsigned char *buf); -void MapRequestEvent(unsigned char *buf); -void ReparentNotifyEvent(unsigned char *buf); -void ConfigureNotifyEvent(unsigned char *buf); -void ConfigureRequestEvent(unsigned char *buf); -void GravityNotifyEvent(unsigned char *buf); -void ResizeRequestEvent(unsigned char *buf); -void CirculateNotifyEvent(unsigned char *buf); -void CirculateRequestEvent(unsigned char *buf); -void PropertyNotifyEvent(unsigned char *buf); -void SelectionClearEvent(unsigned char *buf); -void SelectionRequestEvent(unsigned char *buf); -void SelectionNotifyEvent(unsigned char *buf); -void ColormapNotifyEvent(unsigned char *buf); -void ClientMessageEvent(unsigned char *buf); -void MappingNotifyEvent(unsigned char *buf); -void CreateWindow(unsigned char *buf); -void ChangeWindowAttributes(unsigned char *buf); -void GetWindowAttributes(unsigned char *buf); -void GetWindowAttributesReply(unsigned char *buf); -void DestroyWindow(unsigned char *buf); -void DestroySubwindows(unsigned char *buf); -void ChangeSaveSet(unsigned char *buf); -void ReparentWindow(unsigned char *buf); -void MapWindow(unsigned char *buf); -void MapSubwindows(unsigned char *buf); -void UnmapWindow(unsigned char *buf); -void UnmapSubwindows(unsigned char *buf); -void ConfigureWindow(unsigned char *buf); -void CirculateWindow(unsigned char *buf); -void GetGeometry(unsigned char *buf); -void GetGeometryReply(unsigned char *buf); -void QueryTree(unsigned char *buf); -void QueryTreeReply(unsigned char *buf); -void InternAtom(unsigned char *buf); -void InternAtomReply(unsigned char *buf); -void GetAtomName(unsigned char *buf); -void GetAtomNameReply(unsigned char *buf); -void ChangeProperty(unsigned char *buf); -void DeleteProperty(unsigned char *buf); -void GetProperty(unsigned char *buf); -void GetPropertyReply(unsigned char *buf); -void ListProperties(unsigned char *buf); -void ListPropertiesReply(unsigned char *buf); -void SetSelectionOwner(unsigned char *buf); -void GetSelectionOwner(unsigned char *buf); -void GetSelectionOwnerReply(unsigned char *buf); -void ConvertSelection(unsigned char *buf); -void SendEvent(unsigned char *buf); -void GrabPointer(unsigned char *buf); -void GrabPointerReply(unsigned char *buf); -void UngrabPointer(unsigned char *buf); -void GrabButton(unsigned char *buf); -void UngrabButton(unsigned char *buf); -void ChangeActivePointerGrab(unsigned char *buf); -void GrabKeyboard(unsigned char *buf); -void GrabKeyboardReply(unsigned char *buf); -void UngrabKeyboard(unsigned char *buf); -void GrabKey(unsigned char *buf); -void UngrabKey(unsigned char *buf); -void AllowEvents(unsigned char *buf); -void GrabServer(unsigned char *buf); -void UngrabServer(unsigned char *buf); -void QueryPointer(unsigned char *buf); -void QueryPointerReply(unsigned char *buf); -void GetMotionEvents(unsigned char *buf); -void GetMotionEventsReply(unsigned char *buf); -void TranslateCoordinates(unsigned char *buf); -void TranslateCoordinatesReply(unsigned char *buf); -void WarpPointer(unsigned char *buf); -void SetInputFocus(unsigned char *buf); -void GetInputFocus(unsigned char *buf); -void GetInputFocusReply(unsigned char *buf); -void QueryKeymap(unsigned char *buf); -void QueryKeymapReply(unsigned char *buf); -void OpenFont(unsigned char *buf); -void CloseFont(unsigned char *buf); -void QueryFont(unsigned char *buf); -void QueryFontReply(unsigned char *buf); -void QueryTextExtents(unsigned char *buf); -void QueryTextExtentsReply(unsigned char *buf); -void ListFonts(unsigned char *buf); -void ListFontsReply(unsigned char *buf); -void ListFontsWithInfo(unsigned char *buf); -void ListFontsWithInfoReply(unsigned char *buf); -void SetFontPath(unsigned char *buf); -void GetFontPath(unsigned char *buf); -void GetFontPathReply(unsigned char *buf); -void CreatePixmap(unsigned char *buf); -void FreePixmap(unsigned char *buf); -void CreateGC(unsigned char *buf); -void ChangeGC(unsigned char *buf); -void CopyGC(unsigned char *buf); -void SetDashes(unsigned char *buf); -void SetClipRectangles(unsigned char *buf); -void FreeGC(unsigned char *buf); -void ClearArea(unsigned char *buf); -void CopyArea(unsigned char *buf); -void CopyPlane(unsigned char *buf); -void PolyPoint(unsigned char *buf); -void PolyLine(unsigned char *buf); -void PolySegment(unsigned char *buf); -void PolyRectangle(unsigned char *buf); -void PolyArc(unsigned char *buf); -void FillPoly(unsigned char *buf); -void PolyFillRectangle(unsigned char *buf); -void PolyFillArc(unsigned char *buf); -void PutImage(unsigned char *buf); -void GetImage(unsigned char *buf); -void GetImageReply(unsigned char *buf); -void PolyText8(unsigned char *buf); -void PolyText16(unsigned char *buf); -void ImageText8(unsigned char *buf); -void ImageText16(unsigned char *buf); -void CreateColormap(unsigned char *buf); -void FreeColormap(unsigned char *buf); -void CopyColormapAndFree(unsigned char *buf); -void InstallColormap(unsigned char *buf); -void UninstallColormap(unsigned char *buf); -void ListInstalledColormaps(unsigned char *buf); -void ListInstalledColormapsReply(unsigned char *buf); -void AllocColor(unsigned char *buf); -void AllocColorReply(unsigned char *buf); -void AllocNamedColor(unsigned char *buf); -void AllocNamedColorReply(unsigned char *buf); -void AllocColorCells(unsigned char *buf); -void AllocColorCellsReply(unsigned char *buf); -void AllocColorPlanes(unsigned char *buf); -void AllocColorPlanesReply(unsigned char *buf); -void FreeColors(unsigned char *buf); -void StoreColors(unsigned char *buf); -void StoreNamedColor(unsigned char *buf); -void QueryColors(unsigned char *buf); -void QueryColorsReply(unsigned char *buf); -void LookupColor(unsigned char *buf); -void LookupColorReply(unsigned char *buf); -void CreateCursor(unsigned char *buf); -void CreateGlyphCursor(unsigned char *buf); -void FreeCursor(unsigned char *buf); -void RecolorCursor(unsigned char *buf); -void QueryBestSize(unsigned char *buf); -void QueryBestSizeReply(unsigned char *buf); -void QueryExtension(unsigned char *buf); -void QueryExtensionReply(unsigned char *buf); -void ListExtensions(unsigned char *buf); -void ListExtensionsReply(unsigned char *buf); -void ChangeKeyboardMapping(unsigned char *buf); -void GetKeyboardMapping(unsigned char *buf); -void GetKeyboardMappingReply(unsigned char *buf); -void ChangeKeyboardControl(unsigned char *buf); -void GetKeyboardControl(unsigned char *buf); -void GetKeyboardControlReply(unsigned char *buf); -void Bell(unsigned char *buf); -void ChangePointerControl(unsigned char *buf); -void GetPointerControl(unsigned char *buf); -void GetPointerControlReply(unsigned char *buf); -void SetScreenSaver(unsigned char *buf); -void GetScreenSaver(unsigned char *buf); -void GetScreenSaverReply(unsigned char *buf); -void ChangeHosts(unsigned char *buf); -void ListHosts(unsigned char *buf); -void ListHostsReply(unsigned char *buf); -void SetAccessControl(unsigned char *buf); -void SetCloseDownMode(unsigned char *buf); -void KillClient(unsigned char *buf); -void RotateProperties(unsigned char *buf); -void ForceScreenSaver(unsigned char *buf); -void SetPointerMapping(unsigned char *buf); -void SetPointerMappingReply(unsigned char *buf); -void GetPointerMapping(unsigned char *buf); -void GetPointerMappingReply(unsigned char *buf); -void SetModifierMapping(unsigned char *buf); -void SetModifierMappingReply(unsigned char *buf); -void GetModifierMapping(unsigned char *buf); -void GetModifierMappingReply(unsigned char *buf); -void NoOperation(unsigned char *buf); +extern void PrintSetUpMessage (unsigned char *buf); +extern void PrintSetUpReply (unsigned char *buf); + +extern void RequestError (unsigned char *buf); +extern void ValueError (unsigned char *buf); +extern void WindowError (unsigned char *buf); +extern void PixmapError (unsigned char *buf); +extern void AtomError (unsigned char *buf); +extern void CursorError (unsigned char *buf); +extern void FontError (unsigned char *buf); +extern void MatchError (unsigned char *buf); +extern void DrawableError (unsigned char *buf); +extern void AccessError (unsigned char *buf); +extern void AllocError (unsigned char *buf); +extern void ColormapError (unsigned char *buf); +extern void GContextError (unsigned char *buf); +extern void IDChoiceError (unsigned char *buf); +extern void NameError (unsigned char *buf); +extern void LengthError (unsigned char *buf); +extern void ImplementationError (unsigned char *buf); + +extern void KeyPressEvent (unsigned char *buf); +extern void KeyReleaseEvent (unsigned char *buf); +extern void ButtonPressEvent (unsigned char *buf); +extern void ButtonReleaseEvent (unsigned char *buf); +extern void MotionNotifyEvent (unsigned char *buf); +extern void EnterNotifyEvent (unsigned char *buf); +extern void LeaveNotifyEvent (unsigned char *buf); +extern void FocusInEvent (unsigned char *buf); +extern void FocusOutEvent (unsigned char *buf); +extern void KeymapNotifyEvent (unsigned char *buf); +extern void ExposeEvent (unsigned char *buf); +extern void GraphicsExposureEvent (unsigned char *buf); +extern void NoExposureEvent (unsigned char *buf); +extern void VisibilityNotifyEvent (unsigned char *buf); +extern void CreateNotifyEvent (unsigned char *buf); +extern void DestroyNotifyEvent (unsigned char *buf); +extern void UnmapNotifyEvent (unsigned char *buf); +extern void MapNotifyEvent (unsigned char *buf); +extern void MapRequestEvent (unsigned char *buf); +extern void ReparentNotifyEvent (unsigned char *buf); +extern void ConfigureNotifyEvent (unsigned char *buf); +extern void ConfigureRequestEvent (unsigned char *buf); +extern void GravityNotifyEvent (unsigned char *buf); +extern void ResizeRequestEvent (unsigned char *buf); +extern void CirculateNotifyEvent (unsigned char *buf); +extern void CirculateRequestEvent (unsigned char *buf); +extern void PropertyNotifyEvent (unsigned char *buf); +extern void SelectionClearEvent (unsigned char *buf); +extern void SelectionRequestEvent (unsigned char *buf); +extern void SelectionNotifyEvent (unsigned char *buf); +extern void ColormapNotifyEvent (unsigned char *buf); +extern void ClientMessageEvent (unsigned char *buf); +extern void MappingNotifyEvent (unsigned char *buf); + +extern void ExtendedRequest (int fd, unsigned char *buf); +extern void UnknownReply (unsigned char *buf); + +extern void CreateWindow (unsigned char *buf); +extern void ChangeWindowAttributes (unsigned char *buf); +extern void GetWindowAttributes (unsigned char *buf); +extern void GetWindowAttributesReply (unsigned char *buf); +extern void DestroyWindow (unsigned char *buf); +extern void DestroySubwindows (unsigned char *buf); +extern void ChangeSaveSet (unsigned char *buf); +extern void ReparentWindow (unsigned char *buf); +extern void MapWindow (unsigned char *buf); +extern void MapSubwindows (unsigned char *buf); +extern void UnmapWindow (unsigned char *buf); +extern void UnmapSubwindows (unsigned char *buf); +extern void ConfigureWindow (unsigned char *buf); +extern void CirculateWindow (unsigned char *buf); +extern void GetGeometry (unsigned char *buf); +extern void GetGeometryReply (unsigned char *buf); +extern void QueryTree (unsigned char *buf); +extern void QueryTreeReply (unsigned char *buf); +extern void InternAtom (unsigned char *buf); +extern void InternAtomReply (unsigned char *buf); +extern void GetAtomName (unsigned char *buf); +extern void GetAtomNameReply (unsigned char *buf); +extern void ChangeProperty (unsigned char *buf); +extern void DeleteProperty (unsigned char *buf); +extern void GetProperty (unsigned char *buf); +extern void GetPropertyReply (unsigned char *buf); +extern void ListProperties (unsigned char *buf); +extern void ListPropertiesReply (unsigned char *buf); +extern void SetSelectionOwner (unsigned char *buf); +extern void GetSelectionOwner (unsigned char *buf); +extern void GetSelectionOwnerReply (unsigned char *buf); +extern void ConvertSelection (unsigned char *buf); +extern void SendEvent (unsigned char *buf); +extern void GrabPointer (unsigned char *buf); +extern void GrabPointerReply (unsigned char *buf); +extern void UngrabPointer (unsigned char *buf); +extern void GrabButton (unsigned char *buf); +extern void UngrabButton (unsigned char *buf); +extern void ChangeActivePointerGrab (unsigned char *buf); +extern void GrabKeyboard (unsigned char *buf); +extern void GrabKeyboardReply (unsigned char *buf); +extern void UngrabKeyboard (unsigned char *buf); +extern void GrabKey (unsigned char *buf); +extern void UngrabKey (unsigned char *buf); +extern void AllowEvents (unsigned char *buf); +extern void GrabServer (unsigned char *buf); +extern void UngrabServer (unsigned char *buf); +extern void QueryPointer (unsigned char *buf); +extern void QueryPointerReply (unsigned char *buf); +extern void GetMotionEvents (unsigned char *buf); +extern void GetMotionEventsReply (unsigned char *buf); +extern void TranslateCoordinates (unsigned char *buf); +extern void TranslateCoordinatesReply (unsigned char *buf); +extern void WarpPointer (unsigned char *buf); +extern void SetInputFocus (unsigned char *buf); +extern void GetInputFocus (unsigned char *buf); +extern void GetInputFocusReply (unsigned char *buf); +extern void QueryKeymap (unsigned char *buf); +extern void QueryKeymapReply (unsigned char *buf); +extern void OpenFont (unsigned char *buf); +extern void CloseFont (unsigned char *buf); +extern void QueryFont (unsigned char *buf); +extern void QueryFontReply (unsigned char *buf); +extern void QueryTextExtents (unsigned char *buf); +extern void QueryTextExtentsReply (unsigned char *buf); +extern void ListFonts (unsigned char *buf); +extern void ListFontsReply (unsigned char *buf); +extern void ListFontsWithInfo (unsigned char *buf); +extern void ListFontsWithInfoReply (unsigned char *buf); +extern void SetFontPath (unsigned char *buf); +extern void GetFontPath (unsigned char *buf); +extern void GetFontPathReply (unsigned char *buf); +extern void CreatePixmap (unsigned char *buf); +extern void FreePixmap (unsigned char *buf); +extern void CreateGC (unsigned char *buf); +extern void ChangeGC (unsigned char *buf); +extern void CopyGC (unsigned char *buf); +extern void SetDashes (unsigned char *buf); +extern void SetClipRectangles (unsigned char *buf); +extern void FreeGC (unsigned char *buf); +extern void ClearArea (unsigned char *buf); +extern void CopyArea (unsigned char *buf); +extern void CopyPlane (unsigned char *buf); +extern void PolyPoint (unsigned char *buf); +extern void PolyLine (unsigned char *buf); +extern void PolySegment (unsigned char *buf); +extern void PolyRectangle (unsigned char *buf); +extern void PolyArc (unsigned char *buf); +extern void FillPoly (unsigned char *buf); +extern void PolyFillRectangle (unsigned char *buf); +extern void PolyFillArc (unsigned char *buf); +extern void PutImage (unsigned char *buf); +extern void GetImage (unsigned char *buf); +extern void GetImageReply (unsigned char *buf); +extern void PolyText8 (unsigned char *buf); +extern void PolyText16 (unsigned char *buf); +extern void ImageText8 (unsigned char *buf); +extern void ImageText16 (unsigned char *buf); +extern void CreateColormap (unsigned char *buf); +extern void FreeColormap (unsigned char *buf); +extern void CopyColormapAndFree (unsigned char *buf); +extern void InstallColormap (unsigned char *buf); +extern void UninstallColormap (unsigned char *buf); +extern void ListInstalledColormaps (unsigned char *buf); +extern void ListInstalledColormapsReply (unsigned char *buf); +extern void AllocColor (unsigned char *buf); +extern void AllocColorReply (unsigned char *buf); +extern void AllocNamedColor (unsigned char *buf); +extern void AllocNamedColorReply (unsigned char *buf); +extern void AllocColorCells (unsigned char *buf); +extern void AllocColorCellsReply (unsigned char *buf); +extern void AllocColorPlanes (unsigned char *buf); +extern void AllocColorPlanesReply (unsigned char *buf); +extern void FreeColors (unsigned char *buf); +extern void StoreColors (unsigned char *buf); +extern void StoreNamedColor (unsigned char *buf); +extern void QueryColors (unsigned char *buf); +extern void QueryColorsReply (unsigned char *buf); +extern void LookupColor (unsigned char *buf); +extern void LookupColorReply (unsigned char *buf); +extern void CreateCursor (unsigned char *buf); +extern void CreateGlyphCursor (unsigned char *buf); +extern void FreeCursor (unsigned char *buf); +extern void RecolorCursor (unsigned char *buf); +extern void QueryBestSize (unsigned char *buf); +extern void QueryBestSizeReply (unsigned char *buf); +extern void QueryExtension (unsigned char *buf); +extern void QueryExtensionReply (unsigned char *buf); +extern void ListExtensions (unsigned char *buf); +extern void ListExtensionsReply (unsigned char *buf); +extern void ChangeKeyboardMapping (unsigned char *buf); +extern void GetKeyboardMapping (unsigned char *buf); +extern void GetKeyboardMappingReply (unsigned char *buf); +extern void ChangeKeyboardControl (unsigned char *buf); +extern void GetKeyboardControl (unsigned char *buf); +extern void GetKeyboardControlReply (unsigned char *buf); +extern void Bell (unsigned char *buf); +extern void ChangePointerControl (unsigned char *buf); +extern void GetPointerControl (unsigned char *buf); +extern void GetPointerControlReply (unsigned char *buf); +extern void SetScreenSaver (unsigned char *buf); +extern void GetScreenSaver (unsigned char *buf); +extern void GetScreenSaverReply (unsigned char *buf); +extern void ChangeHosts (unsigned char *buf); +extern void ListHosts (unsigned char *buf); +extern void ListHostsReply (unsigned char *buf); +extern void SetAccessControl (unsigned char *buf); +extern void SetCloseDownMode (unsigned char *buf); +extern void KillClient (unsigned char *buf); +extern void RotateProperties (unsigned char *buf); +extern void ForceScreenSaver (unsigned char *buf); +extern void SetPointerMapping (unsigned char *buf); +extern void SetPointerMappingReply (unsigned char *buf); +extern void GetPointerMapping (unsigned char *buf); +extern void GetPointerMappingReply (unsigned char *buf); +extern void SetModifierMapping (unsigned char *buf); +extern void SetModifierMappingReply (unsigned char *buf); +extern void GetModifierMapping (unsigned char *buf); +extern void GetModifierMappingReply (unsigned char *buf); +extern void NoOperation (unsigned char *buf); + /* prtype.c */ -void SetIndentLevel(int which); -void DumpHexBuffer(unsigned char *buf, long n); -void DumpItem(char *name, FD fd, unsigned char *buf, long n); -void PrintField(unsigned char *buf, int start, int length, int FieldType, char *name); -long PrintList(unsigned char *buf, long number, int ListType, char *name); -long PrintListSTR(unsigned char *buf, long number, char *name); -int PrintBytes(unsigned char buf[], long number, char *name); -int PrintString8(unsigned char buf[], int number, char *name); -int PrintString16(unsigned char buf[], int number, char *name); -void PrintValues(unsigned char *control, int clength, int ctype, unsigned char *values, char *name); -int PrintTextList8(unsigned char *buf, int length, char *name); -int PrintTextList16(unsigned char *buf, int length, char *name); +extern void SetIndentLevel (short which); +extern void DumpHexBuffer (unsigned char *buf, long n); +extern void DumpItem (char *name, FD fd, unsigned char *buf, long n); +extern void PrintField (unsigned char *buf, short start, short length, + short FieldType, char *name); +extern int PrintBytes (unsigned char buf[], long number, char *name); +extern void PrintValues (unsigned char *control, int clength, int ctype, + unsigned char *values, char *name); +extern void PrintTextList8 (unsigned char *buf, int length, char *name); +extern void PrintTextList16 (unsigned char *buf, int length, char *name); + /* scope.c */ -void TimerExpired(void); -FD FDPair(FD fd); -FD ClientHalf(FD fd); -FD ServerHalf(FD fd); -char *ClientName(FD fd); -void NewConnection(FD fd); +extern void TestBreakPoints (unsigned char *buf, long n); +extern void TimerExpired (void); +extern void SetUpPair (FD client, FD server); +extern FD FDPair (FD fd); +extern FD ClientHalf (FD fd); +extern FD ServerHalf (FD fd); +extern char *ClientName (FD fd); +extern int ClientNumber (FD fd); +extern void NewConnection (FD fd); +extern void FlushFD (FD fd); +extern short GetServerport (void); +extern void ReadCommands (void); + /* server.c */ -FD ConnectToServer(int report); -void ProcessBuffer(FD fd, unsigned char *buf, long n); -void ReportFromClient(FD fd, unsigned char *buf, long n); -void ReportFromServer(FD fd, unsigned char *buf, long n); -void PrintTime(void); -long pad(long n); -unsigned long ILong(unsigned char buf[]); -unsigned short IShort(unsigned char buf[]); -unsigned short IByte(unsigned char buf[]); -short IBool(unsigned char buf[]); -void StartClientConnection(FD fd); -void StopClientConnection(FD fd); -void StartServerConnection(FD fd); -void StopServerConnection(FD fd); -long StartSetUpMessage(FD fd, unsigned char *buf, long n); -long StartSetUpReply(FD fd, unsigned char *buf, long n); -/* table11.c */ -void InitializeX11(void); +extern FD ConnectToServer (Boolean report); +extern void ProcessBuffer (FD fd, unsigned char *buf, long n); +extern void ReportFromClient (FD fd, unsigned char *buf, long n); +extern void ReportFromServer (FD fd, unsigned char *buf, long n); +extern void PrintTime (void); +extern void SetBufLimit (FD fd); +extern void ClearBufLimit (FD fd); +extern void StartClientConnection (FD fd); +extern void StopClientConnection (FD fd); +extern void StartServerConnection (FD fd); +extern void StopServerConnection (FD fd); +extern long StartSetUpMessage (FD fd, unsigned char *buf, long n); +extern long StartSetUpReply (FD fd, unsigned char *buf, long n); +extern long GetXRequestFromName (char *name); + +/* table11.c */ +extern void InitializeX11 (void); +extern TYPE DefineType (short typeid, short class, char *name, + int (*printproc)(unsigned char *)); +extern void DefineEValue (TYPE type, long value, char *name); +extern void DefineValues (TYPE type, long value, short length, + short ctype, char *name); +extern long GetEValue (short typeid, char *name); @@ -55,8 +55,6 @@ #include "scope.h" #include "x11.h" -extern int littleEndian; - /* For each of the types we need a way to print that type. Types are of varieties: @@ -76,8 +74,8 @@ extern int littleEndian; /* print representation of a character for debugging */ -static char *printrep (c) - unsigned short c; +static char * +printrep (unsigned short c) { static char pr[8]; @@ -136,8 +134,8 @@ char Leader[MaxIndent + 1]; static short CurrentLevel = 0; void -SetIndentLevel(which) - short which; +SetIndentLevel ( + short which) { short i; @@ -157,13 +155,14 @@ SetIndentLevel(which) } static void -ModifyIndentLevel(amount) - short amount; +ModifyIndentLevel ( + short amount) { SetIndentLevel(CurrentLevel + amount); } -static short SizeofLeader () +static short +SizeofLeader (void) { return (CurrentLevel * 8); } @@ -176,11 +175,11 @@ static short SizeofLeader () /* if we want verbose enough output, we will dump the buffer in hex */ void -DumpItem(name, fd, buf, n) - char *name; - FD fd; - unsigned char *buf; - long n; +DumpItem ( + char *name, + FD fd, + unsigned char *buf, + long n) { if (n == 0) return; @@ -711,12 +710,12 @@ PrintSET( /* ************************************************************ */ void -PrintField(buf, start, length, FieldType, name) - unsigned char *buf; - short start; - short length; - short FieldType; - char *name; +PrintField ( + unsigned char *buf, + short start, + short length, + short FieldType, + char *name) { if (Verbose == 0) return; @@ -764,11 +763,12 @@ PrintField(buf, start, length, FieldType, name) /* print a list of things. The things are of type <ListType>. They start at <buf>. There are <number> things in the list */ -long PrintList(buf, number, ListType, name) - unsigned char *buf; - long number; - short ListType; - char *name; +long +PrintList ( + unsigned char *buf, + long number, + short ListType, + char *name) { long n; long i; @@ -815,10 +815,11 @@ long PrintList(buf, number, ListType, name) /* print a list of STRs. Similar to PrintList They start at <buf>. There are <number> things in the list */ -long PrintListSTR(buf, number, name) - unsigned char *buf; - long number; - char *name; +long +PrintListSTR ( + unsigned char *buf, + long number, + char *name) { long n; long i; @@ -939,12 +940,11 @@ PrintString16( return(number); } -extern long TranslateText; - -PrintTString8(buf, number, name) - unsigned char buf[]; - long number; - char *name; +void +PrintTString8( + unsigned char buf[], + long number, + char *name) { long i; int off; @@ -963,18 +963,18 @@ PrintTString8(buf, number, name) /* print a String of CHAR2B -- 16-bit characters */ - -PrintTString16(buf, number, name) - unsigned char buf[]; - long number; - char *name; +void +PrintTString16( + unsigned char buf[], + long number, + char *name) { long i; unsigned short c; int off; if (number == 0) - return; + return; off = 0; if (TranslateText) @@ -1053,7 +1053,7 @@ PrintValues( /* PolyText8 and PolyText16 take lists of characters with possible font changes in them. */ -int +void PrintTextList8( unsigned char *buf, int length, @@ -1081,7 +1081,7 @@ PrintTextList8( } } -int +void PrintTextList16( unsigned char *buf, int length, @@ -1144,10 +1144,11 @@ DumpHexBuffer( } } -PrintValueRec (key, cmask, ctype) - unsigned long key; - unsigned long cmask; - short ctype; +void +PrintValueRec ( + unsigned long key, + unsigned long cmask, + short ctype) { unsigned char *values; struct ValueListEntry *p; diff --git a/randrscope.h b/randrscope.h index bb95728..9e8a70e 100644 --- a/randrscope.h +++ b/randrscope.h @@ -12,5 +12,19 @@ #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForRANDRFlag; +extern unsigned char RANDRRequest; +extern unsigned char RANDREvent; + +extern void RandrQueryVersion (FD fd, unsigned char *buf); +extern void RandrQueryVersionReply (FD fd, unsigned char *buf); +extern void RandrGetScreenInfo (FD fd, unsigned char *buf); +extern void RandrGetScreenInfoReply (FD fd, unsigned char *buf); +extern void RandrSetScreenConfig (FD fd, unsigned char *buf); +extern void RandrSetScreenConfigReply (FD fd, unsigned char *buf); +extern void RandrScreenChangeSelectInput (FD fd, unsigned char *buf); +extern void RandrScreenSizes (unsigned char *buf); +extern void RandrScreenChangeNotifyEvent (unsigned char *buf); + #endif diff --git a/renderscope.h b/renderscope.h index a539c1e..03e31d6 100644 --- a/renderscope.h +++ b/renderscope.h @@ -12,5 +12,48 @@ #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForRENDERFlag; +extern unsigned char RENDERRequest; +extern unsigned char RENDERError; +#define RENDERNError 5 + +extern void RenderQueryVersion (FD fd, unsigned char *buf); +extern void RenderQueryVersionReply (FD fd, unsigned char *buf); +extern void RenderQueryPictFormats (FD fd, unsigned char *buf); +extern void RenderQueryPictFormatsReply (FD fd, unsigned char *buf); +extern void RenderQueryPictIndexValues (FD fd, unsigned char *buf); +extern void RenderQueryPictIndexValuesReply (FD fd, unsigned char *buf); +extern void RenderQueryDithers (FD fd, unsigned char *buf); +extern void RenderQueryDithersReply (FD fd, unsigned char *buf); +extern void RenderCreatePicture (FD fd, unsigned char *buf); +extern void RenderChangePicture (FD fd, unsigned char *buf); +extern void RenderSetPictureClipRectangles (FD fd, unsigned char *buf); +extern void RenderFreePicture (FD fd, unsigned char *buf); +extern void RenderComposite (FD fd, unsigned char *buf); +extern void RenderScale (FD fd, unsigned char *buf); +extern void RenderTrapezoids (FD fd, unsigned char *buf); +extern void RenderTriangles (FD fd, unsigned char *buf); +extern void RenderTriStrip (FD fd, unsigned char *buf); +extern void RenderTriFan (FD fd, unsigned char *buf); +extern void RenderColorTrapezoids (FD fd, unsigned char *buf); +extern void RenderColorTriangles (FD fd, unsigned char *buf); +extern void RenderTransform (FD fd, unsigned char *buf); +extern void RenderCreateGlyphSet (FD fd, unsigned char *buf); +extern void RenderReferenceGlyphSet (FD fd, unsigned char *buf); +extern void RenderFreeGlyphSet (FD fd, unsigned char *buf); +extern void RenderAddGlyphs (FD fd, unsigned char *buf); +extern void RenderAddGlyphsFromPicture (FD fd, unsigned char *buf); +extern void RenderFreeGlyphs (FD fd, unsigned char *buf); +extern void RenderCompositeGlyphs8 (FD fd, unsigned char *buf); +extern void RenderCompositeGlyphs16 (FD fd, unsigned char *buf); +extern void RenderCompositeGlyphs32 (FD fd, unsigned char *buf); +extern void RenderFillRectangles (FD fd, unsigned char *buf); + +extern void RenderPictFormatError (FD fd, unsigned char *buf); +extern void RenderPictureError (FD fd, unsigned char *buf); +extern void RenderPictOpError (FD fd, unsigned char *buf); +extern void RenderGlyphSetError (FD fd, unsigned char *buf); +extern void RenderGlyphError (FD fd, unsigned char *buf); + #endif @@ -54,7 +54,9 @@ ***************************************************** */ #include "scope.h" +#include "nas.h" +#include <ctype.h> #include <unistd.h> #include <sys/param.h> @@ -63,6 +65,7 @@ #define bcopy(s,d,l) memmove(d,s,l) #endif +#include <sys/types.h> /* needed by sys/socket.h and netinet/in.h */ #include <sys/uio.h> /* for struct iovec, used by socket.h */ #include <sys/socket.h> /* for AF_INET, SOCK_STREAM, ... */ #include <sys/ioctl.h> /* for FIONCLEX, FIONBIO, ... */ @@ -74,7 +77,6 @@ #include <netinet/tcp.h> #include <netdb.h> /* struct servent * and struct hostent * */ #include <errno.h> /* for EINTR, EADDRINUSE, ... */ -extern int errno; /* ********************************************** */ @@ -91,6 +93,7 @@ static long ServerOutPort = 0; static long ServerDisplay = 0; static FD ConnectToClient(FD ConnectionSocket); +static void DataFromClient(FD fd); static void SetUpStdin(void); long TranslateText = 0; @@ -125,21 +128,21 @@ typedef struct _BreakPoint { typedef enum _CMDResult { CMDProceed, CMDDebug, CMDSyntax, CMDError } CMDResult; -CMDResult CMDStep (); -CMDResult CMDCont (); -CMDResult CMDBreak (); -CMDResult CMDDelete (); -CMDResult CMDDisable (); -CMDResult CMDEnable (); -CMDResult CMDLevel (); -CMDResult CMDAudio (); -CMDResult CMDQuit (); -CMDResult CMDHelp (); +static CMDResult CMDStep (int argc, char **argv); +static CMDResult CMDCont (int argc, char **argv); +static CMDResult CMDBreak (int argc, char **argv); +static CMDResult CMDDelete (int argc, char **argv); +static CMDResult CMDDisable (int argc, char **argv); +static CMDResult CMDEnable (int argc, char **argv); +static CMDResult CMDLevel (int argc, char **argv); +static CMDResult CMDAudio (int argc, char **argv); +static CMDResult CMDQuit (int argc, char **argv); +static CMDResult CMDHelp (int argc, char **argv); typedef struct _CMDFunc { char *name; char *alias; - CMDResult (*func)(); + CMDResult (*func)(int argc, char **argv); char *usage; char *help; } CMDFuncRec, *CMDFuncPtr; @@ -175,9 +178,9 @@ CMDFuncRec CMDFuncs[] = { #endif static int -CMDStringToInt(s, v) - char *s; - int *v; +CMDStringToInt ( + char *s, + int *v) { int sign = 1; @@ -232,8 +235,8 @@ CMDStringToInt(s, v) } static CMDFuncPtr -CMDStringToFunc (name) - char *name; +CMDStringToFunc ( + char *name) { int i; for (i = 0; i < NumCMDFuncs; i++) @@ -248,9 +251,9 @@ CMDStringToFunc (name) } static int -CMDSplitIntoWords(line, argv) - char *line; - char **argv; +CMDSplitIntoWords ( + char *line, + char **argv) { char quotechar; int argc; @@ -285,10 +288,10 @@ CMDSplitIntoWords(line, argv) return argc; } -CMDResult -CMDHelp(argc, argv) - int argc; - char **argv; +static CMDResult +CMDHelp( + int argc, + char **argv) { int i; CMDFuncPtr func; @@ -315,9 +318,9 @@ CMDHelp(argc, argv) } static void -CMDSyntaxError(argc, argv) - int argc; - char **argv; +CMDSyntaxError( + int argc, + char **argv) { printf("Syntax error in:"); while (*argv) @@ -326,7 +329,7 @@ CMDSyntaxError(argc, argv) } void -ReadCommands () +ReadCommands (void) { int argc; char line[1024]; @@ -376,9 +379,9 @@ BP *breakPoints; int breakPointNumber; void -TestBreakPoints (buf, n) - unsigned char *buf; - long n; +TestBreakPoints ( + unsigned char *buf, + long n) { BP *bp; @@ -396,8 +399,8 @@ TestBreakPoints (buf, n) } } -void -setBreakPoint () +static void +setBreakPoint (void) { Boolean b = false; BP *bp; @@ -421,8 +424,6 @@ setBreakPoint () BreakPoint = b; for (fd = 0; fd < HighestFD; fd++) { - static void DataFromClient(FD fd); - if (FDD[fd].Busy && FDD[fd].InputHandler == DataFromClient) { if (BreakPoint) @@ -434,10 +435,10 @@ setBreakPoint () } } -CMDResult -CMDBreak (argc, argv) - int argc; - char **argv; +static CMDResult +CMDBreak ( + int argc, + char **argv) { BP *bp, **prev; int request; @@ -470,19 +471,19 @@ CMDBreak (argc, argv) return CMDDebug; } -CMDResult -CMDCont (argc, argv) - int argc; - char **argv; +static CMDResult +CMDCont ( + int argc, + char **argv) { SingleStep = 0; return CMDProceed; } -CMDResult -CMDDisable (argc, argv) - int argc; - char **argv; +static CMDResult +CMDDisable ( + int argc, + char **argv) { BP *bp; int number; @@ -514,10 +515,10 @@ CMDDisable (argc, argv) return CMDDebug; } -CMDResult -CMDDelete (argc, argv) - int argc; - char **argv; +static CMDResult +CMDDelete ( + int argc, + char **argv) { BP *bp, **prev; int number; @@ -555,10 +556,10 @@ CMDDelete (argc, argv) return CMDDebug; } -CMDResult -CMDEnable (argc, argv) - int argc; - char **argv; +static CMDResult +CMDEnable ( + int argc, + char **argv) { BP *bp; int number; @@ -590,29 +591,29 @@ CMDEnable (argc, argv) return CMDDebug; } -CMDResult -CMDStep (argc, argv) - int argc; - char **argv; +static CMDResult +CMDStep ( + int argc, + char **argv) { SingleStep = 1; setBreakPoint (); return CMDProceed; } -CMDResult -CMDQuit (argc, argv) - int argc; - char **argv; +static CMDResult +CMDQuit ( + int argc, + char **argv) { printf ("exiting...\n"); exit (0); } -CMDResult -CMDLevel (argc, argv) - int argc; - char **argv; +static CMDResult +CMDLevel ( + int argc, + char **argv) { int level; @@ -625,10 +626,10 @@ CMDLevel (argc, argv) return CMDDebug; } -CMDResult -CMDAudio (argc, argv) - int argc; - char **argv; +static CMDResult +CMDAudio ( + int argc, + char **argv) { int level; @@ -646,7 +647,8 @@ CMDAudio (argc, argv) /* */ /* ********************************************** */ -short GetServerport () +short +GetServerport (void) { short port; @@ -657,7 +659,8 @@ short GetServerport () return(port); } -static short GetScopePort () +static short +GetScopePort (void) { short port; @@ -673,7 +676,7 @@ static short GetScopePort () /* ********************************************** */ static void -Usage() +Usage(void) { fprintf(stderr, "Usage: xscope\n"); fprintf(stderr, " [-h<server-host>]\n"); @@ -694,9 +697,9 @@ Usage() static void -ScanArgs(argc, argv) - int argc; - char **argv; +ScanArgs ( + int argc, + char **argv) { XVerbose = 1 /* default verbose-ness level */; NasVerbose = 1; @@ -829,11 +832,10 @@ ScanArgs(argc, argv) /* */ /* ********************************************** */ -int NewAudio (); - -main(argc, argv) - int argc; - char **argv; +int +main ( + int argc, + char **argv) { ScanArgs(argc, argv); InitializeFD(); @@ -850,7 +852,7 @@ main(argc, argv) } void -TimerExpired() +TimerExpired (void) { debug(16,(stderr, "Timer tick\n")); } @@ -872,8 +874,8 @@ TimerExpired() */ static void -ReadStdin(fd) - FD fd; +ReadStdin ( + FD fd) { char buf[2048]; long n; @@ -884,10 +886,10 @@ ReadStdin(fd) } static void -SetUpStdin() +SetUpStdin (void) { enterprocedure("SetUpStdin"); - UsingFD(fileno(stdin), ReadStdin, (int (*)()) NULL, NULL); + UsingFD(fileno(stdin), ReadStdin, NULL, NULL); } /* ************************************************************ */ @@ -908,9 +910,9 @@ static long clientNumber = 0; struct fdinfo FDinfo[StaticMaxFD]; void -SetUpPair(client, server) - FD client; - FD server; +SetUpPair( + FD client, + FD server) { if (client >= 0) { @@ -938,10 +940,10 @@ SetUpPair(client, server) } } - -ResetPair (client, server) - FD client; - FD server; +static void +ResetPair ( + FD client, + FD server) { if (client >= 0) { @@ -958,8 +960,8 @@ ResetPair (client, server) } static void -CloseConnection(fd) - FD fd; +CloseConnection ( + FD fd) { debug(4,(stderr, "close %d and %d\n", fd, FDPair(fd))); ResetPair (ClientHalf(fd), ServerHalf(fd)); @@ -981,30 +983,34 @@ CloseConnection(fd) /* ************************************************************ */ -FD FDPair(fd) - FD fd; +FD +FDPair ( + FD fd) { return(FDinfo[fd].pair); } -FD ClientHalf(fd) - FD fd; +FD +ClientHalf ( + FD fd) { if (FDinfo[fd].Server) return(FDinfo[fd].pair); return(fd); } -FD ServerHalf(fd) - FD fd; +FD +ServerHalf ( + FD fd) { if (FDinfo[fd].Server) return(fd); return(FDinfo[fd].pair); } -char *ClientName (fd) - FD fd; +char * +ClientName ( + FD fd) { static char name[12]; @@ -1014,8 +1020,9 @@ char *ClientName (fd) return(name); } -int ClientNumber (fd) - FD fd; +int +ClientNumber ( + FD fd) { return FDinfo[fd].ClientNumber; } @@ -1030,11 +1037,11 @@ int ClientNumber (fd) * data */ void -FlushFD (fd) - FD fd; +FlushFD ( + FD fd) { long BytesToWrite = FDinfo[fd].bufcount - FDinfo[fd].bufstart; - char *p = FDinfo[fd].buffer + FDinfo[fd].bufstart; + unsigned char *p = FDinfo[fd].buffer + FDinfo[fd].bufstart; int PeerFD; PeerFD = FDPair (fd); @@ -1087,8 +1094,8 @@ FlushFD (fd) have to have a server, if there isn't one. */ static void -DataFromClient(fd) - FD fd; +DataFromClient ( + FD fd) { long n; FD ServerFD; @@ -1141,8 +1148,8 @@ DataFromClient(fd) we close the connection down -- don't need a server with no client. */ static void -DataFromServer(fd) - FD fd; +DataFromServer ( + FD fd) { long n; FD ClientFD; @@ -1190,20 +1197,12 @@ DataFromServer(fd) /* */ /* ************************************************************ */ -#include <sys/types.h> /* needed by sys/socket.h and netinet/in.h */ -#include <sys/uio.h> /* for struct iovec, used by socket.h */ -#include <sys/socket.h> /* for AF_INET, SOCK_STREAM, ... */ -#include <sys/ioctl.h> /* for FIONCLEX, FIONBIO, ... */ -#include <netinet/in.h> /* struct sockaddr_in */ -#include <netdb.h> /* struct servent * and struct hostent * */ -#include <errno.h> /* for EINTR, EADDRINUSE, ... */ -extern int errno; static int ON = 1 /* used in ioctl */ ; void -NewConnection(fd) - FD fd; +NewConnection ( + FD fd) { FD ClientFD = ConnectToClient(fd); FD ServerFD = ConnectToServer(true); @@ -1214,8 +1213,9 @@ NewConnection(fd) /* ************************************************************ */ -static FD ConnectToClient(ConnectionSocket) - FD ConnectionSocket; +static FD +ConnectToClient ( + FD ConnectionSocket) { FD ClientFD; XtransConnInfo trans_conn = NULL; @@ -1268,8 +1268,9 @@ static FD ConnectToClient(ConnectionSocket) -FD ConnectToServer(report) - Boolean report; +FD +ConnectToServer ( + Boolean report) { FD ServerFD; XtransConnInfo trans_conn = NULL; /* transport connection object */ @@ -56,6 +56,8 @@ #include <X11/Xos.h> #include <X11/Xfuncs.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <netdb.h> #ifdef SVR4 #include <sys/filio.h> @@ -94,23 +96,9 @@ extern char *ScopeHost; extern int Interrupt, SingleStep, BreakPoint; -extern void ReadCommands (); - extern char ServerHostName[MAXHOSTNAMELEN]; extern char AudioServerHostName[MAXHOSTNAMELEN]; -/* external function type declarations */ - -extern void *Malloc (long n); -#ifdef X_NOT_STDC_ENV -extern char *strcpy(); -extern char *sprintf(); -#else -#include <stdlib.h> -#include <string.h> -#endif -extern char *ClientName(); - /* ********************************************** */ /* */ /* ********************************************** */ @@ -125,7 +113,7 @@ struct fdinfo Boolean Server; long ClientNumber; FD pair; - char buffer[BUFFER_SIZE]; + unsigned char buffer[BUFFER_SIZE]; int bufcount; int bufstart; int buflimit; /* limited writes */ @@ -134,3 +122,11 @@ struct fdinfo }; extern struct fdinfo FDinfo[StaticMaxFD]; +extern int littleEndian; +extern char HandleSIGUSR1; +extern char Leader[]; +extern long ServerBasePort; +extern char ScopeEnabled; +extern long TranslateText; + + @@ -66,18 +66,16 @@ unsigned char RBf[2]; unsigned char SBf[4]; struct ConnState CS[StaticMaxFD]; -extern char ScopeEnabled; - /* ************************************************************ */ /* */ /* */ /* ************************************************************ */ void -ReportFromClient(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ReportFromClient( + FD fd, + unsigned char *buf, + long n) { if (Verbose > 0) { @@ -91,10 +89,10 @@ ReportFromClient(fd, buf, n) } void -ReportFromServer(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ReportFromServer ( + FD fd, + unsigned char *buf, + long n) { if (Verbose > 0) { if (ScopeEnabled) { @@ -119,7 +117,7 @@ static struct timeval tp; /* print the time since we started in hundredths (1/100) of seconds */ void -PrintTime() +PrintTime(void) { static long lastsec = 0; long sec /* seconds */ ; @@ -152,17 +150,17 @@ PrintTime() requests as various built-in types. The following routines support the types built into X11 */ -long pad (n) - long n; +long +pad ( + long n) { /* round up to next multiple of 4 */ return((n + 3) & ~0x3); } -extern int littleEndian; - -unsigned long ILong (buf) - unsigned char buf[]; +unsigned long +ILong ( + unsigned char buf[]) { /* check for byte-swapping */ if (littleEndian) @@ -170,8 +168,9 @@ unsigned long ILong (buf) return((((((buf[0] << 8) | buf[1]) << 8) | buf[2]) << 8) | buf[3]); } -unsigned short IShort (buf) -unsigned char buf[]; +unsigned short +IShort ( + unsigned char buf[]) { /* check for byte-swapping */ if (littleEndian) @@ -179,21 +178,24 @@ unsigned char buf[]; return((buf[0] << 8) | buf[1]); } -unsigned short IChar2B (buf) -unsigned char buf[]; +unsigned short +IChar2B ( + unsigned char buf[]) { /* CHAR2B is like an IShort, but not byte-swapped */ return((buf[0] << 8) | buf[1]); } -unsigned short IByte (buf) -unsigned char buf[]; +unsigned short +IByte ( + unsigned char buf[]) { return(buf[0]); } -Boolean IBool(buf) - unsigned char buf[]; +Boolean +IBool ( + unsigned char buf[]) { if (buf[0] != 0) return(true); @@ -211,10 +213,10 @@ Boolean IBool(buf) interpret. The following procedures provide this ability */ static void -SaveBytes(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +SaveBytes ( + FD fd, + unsigned char *buf, + long n) { /* check if there is enough space to hold the bytes we want */ if (CS[fd].NumberofSavedBytes + n > CS[fd].SizeofSavedBytes) @@ -238,9 +240,9 @@ SaveBytes(fd, buf, n) } static void -RemoveSavedBytes(fd, n) - FD fd; - long n; +RemoveSavedBytes ( + FD fd, + long n) { /* check if all bytes are being removed -- easiest case */ if (CS[fd].NumberofSavedBytes <= n) @@ -285,10 +287,10 @@ static long FinishReply(FD fd, unsigned char *buf, long n); int littleEndian; void -ProcessBuffer(fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ProcessBuffer ( + FD fd, + unsigned char *buf, + long n) { unsigned char *BytesToProcess; long NumberofUsedBytes; @@ -396,23 +398,26 @@ ProcessBuffer(fd, buf, n) and ByteProcessing. It probably needs to do some computation first. */ -SetBufLimit (fd) - FD fd; +void +SetBufLimit ( + FD fd) { int ServerFD = FDPair (fd); FDinfo[ServerFD].buflimit = (CS[fd].NumberofBytesProcessed + CS[fd].NumberofBytesNeeded); } -ClearBufLimit (fd) - FD fd; +void +ClearBufLimit ( + FD fd) { int ServerFD = FDPair (fd); FDinfo[ServerFD].buflimit = -1; } -StartStuff (fd) - FD fd; +static void +StartStuff ( + FD fd) { if (BreakPoint) { @@ -423,10 +428,11 @@ StartStuff (fd) } } -FinishStuff (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static void +FinishStuff ( + FD fd, + unsigned char *buf, + long n) { if (BreakPoint) { @@ -446,8 +452,8 @@ FinishStuff (fd, buf, n) } void -StartClientConnection(fd) - FD fd; +StartClientConnection ( + FD fd) { enterprocedure("StartClientConnection"); /* when a new connection is started, we have no saved bytes */ @@ -469,8 +475,8 @@ StartClientConnection(fd) } void -StopClientConnection(fd) - FD fd; +StopClientConnection ( + FD fd) { enterprocedure("StopClientConnection"); /* when a new connection is stopped, discard the old buffer */ @@ -479,10 +485,11 @@ StopClientConnection(fd) Free((char*)CS[fd].SavedBytes); } -long StartSetUpMessage (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +long +StartSetUpMessage ( + FD fd, + unsigned char *buf, + long n) { unsigned short namelength; unsigned short datalength; @@ -509,10 +516,11 @@ long StartSetUpMessage (fd, buf, n) return(0); } -static long FinishSetUpMessage (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishSetUpMessage ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishSetUpMessage"); if( Raw || (Verbose > 3) ) @@ -530,10 +538,11 @@ static long FinishSetUpMessage (fd, buf, n) return(n); } -long StartBigRequest (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +StartBigRequest ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("StartBigRequest"); @@ -548,10 +557,11 @@ long StartBigRequest (fd, buf, n) return(0); } -static long StartRequest (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +StartRequest ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("StartRequest"); @@ -576,10 +586,11 @@ static long StartRequest (fd, buf, n) } -static long FinishRequest (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +static long +FinishRequest ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishRequest"); CS[fd].ByteProcessing = StartRequest; @@ -596,8 +607,8 @@ static long FinishRequest (fd, buf, n) /* ************************************************************ */ void -StartServerConnection(fd) - FD fd; +StartServerConnection ( + FD fd) { enterprocedure("StartServerConnection"); /* when a new connection is started, we have no saved bytes */ @@ -615,8 +626,8 @@ StartServerConnection(fd) } void -StopServerConnection(fd) - FD fd; +StopServerConnection ( + FD fd) { enterprocedure("StopServerConnection"); /* when a new connection is stopped, discard the old buffer */ @@ -626,10 +637,10 @@ StopServerConnection(fd) } long -StartSetUpReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +StartSetUpReply ( + FD fd, + unsigned char *buf, + long n) { unsigned short replylength; @@ -643,10 +654,10 @@ StartSetUpReply (fd, buf, n) } static long -FinishSetUpReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +FinishSetUpReply ( + FD fd, + unsigned char *buf, + long n) { enterprocedure("FinishSetUpReply"); if( Raw || (Verbose > 3) ) @@ -661,10 +672,10 @@ FinishSetUpReply (fd, buf, n) /* ************************************************************ */ static long -ErrorPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ErrorPacket ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = ServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -674,10 +685,10 @@ ErrorPacket (fd, buf, n) static long -EventPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +EventPacket ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = ServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -688,10 +699,10 @@ EventPacket (fd, buf, n) static long -ReplyPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ReplyPacket ( + FD fd, + unsigned char *buf, + long n) { long replylength; @@ -714,10 +725,10 @@ ReplyPacket (fd, buf, n) } static long -ServerPacket (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +ServerPacket ( + FD fd, + unsigned char *buf, + long n) { short PacketType; enterprocedure("ServerPacket"); @@ -730,10 +741,11 @@ ServerPacket (fd, buf, n) return(EventPacket(fd, buf, n)); } -long FinishReply (fd, buf, n) - FD fd; - unsigned char *buf; - long n; +long +FinishReply ( + FD fd, + unsigned char *buf, + long n) { CS[fd].ByteProcessing = ServerPacket; CS[fd].NumberofBytesNeeded = 32; @@ -743,8 +755,9 @@ long FinishReply (fd, buf, n) return(n); } -long GetXRequestFromName (name) - char *name; +long +GetXRequestFromName ( + char *name) { return GetEValue (REQUEST, name); } @@ -12,5 +12,20 @@ #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForMITSHMFlag; +extern unsigned char MITSHMRequest; +extern unsigned char MITSHMError; +extern unsigned char MITSHMEvent; + +extern void MitshmQueryVersion (FD fd, unsigned char *buf); +extern void MitshmQueryVersionReply (FD fd, unsigned char *buf); +extern void MitshmAttach (FD fd, unsigned char *buf); +extern void MitshmDetach (FD fd, unsigned char *buf); +extern void MitshmPutImage (FD fd, unsigned char *buf); +extern void MitshmGetImage (FD fd, unsigned char *buf); +extern void MitshmGetImageReply (FD fd, unsigned char *buf); +extern void MitshmCreatePixmap (FD fd, unsigned char *buf); +extern void MitshmShmSegError (FD fd, unsigned char *buf); + #endif @@ -111,7 +111,7 @@ static int PrintVISUALTYPE(unsigned char *buf); */ void -InitializeX11() +InitializeX11 (void) { InitReplyQ(); @@ -129,8 +129,8 @@ ValuePtr buckets[HASH_SIZE]; #define HASH(key) ((key) % HASH_SIZE) ValuePtr -GetValueRec (key) - unsigned long key; +GetValueRec ( + unsigned long key) { ValuePtr *bucket, value; @@ -143,10 +143,11 @@ GetValueRec (key) return 0; } -CreateValueRec (key, size, def) - unsigned long key; - int size; - unsigned long *def; +void +CreateValueRec ( + unsigned long key, + int size, + unsigned long *def) { ValuePtr *bucket, value; int i; @@ -154,7 +155,7 @@ CreateValueRec (key, size, def) bucket = &buckets[HASH(key)]; value = (ValuePtr) malloc (sizeof (ValueRec) + size * sizeof (unsigned long)); if (!value) - return 0; + return; value->values = (unsigned long *) (value + 1); for (i = 0; i < size; i++) value->values[i] = ILong((char *) (def + i)); @@ -164,8 +165,9 @@ CreateValueRec (key, size, def) *bucket = value; } -DeleteValueRec (key) - unsigned long key; +void +DeleteValueRec ( + unsigned long key) { ValuePtr *bucket, value; @@ -180,12 +182,13 @@ DeleteValueRec (key) } } -SetValueRec (key, control, clength, ctype, values) - unsigned long key; - unsigned char *control; - short clength; - short ctype; - unsigned char *values; +void +SetValueRec ( + unsigned long key, + unsigned char *control, + short clength, + short ctype, + unsigned char *values) { long cmask; struct ValueListEntry *p; @@ -226,11 +229,11 @@ SetValueRec (key, control, clength, ctype, values) /* define the various types */ TYPE -DefineType(typeid, class, name, printproc) - short typeid; - short class; - char *name; - int (*printproc)(unsigned char *); +DefineType ( + short typeid, + short class, + char *name, + int (*printproc)(unsigned char *)) { TD[typeid].Name = name; TD[typeid].Type = class; @@ -243,10 +246,10 @@ DefineType(typeid, class, name, printproc) /* define an Enumerated Value (or a Set Value) */ void -DefineEValue(type, value, name) - TYPE type; - long value; - char *name; +DefineEValue( + TYPE type, + long value, + char *name) { struct ValueListEntry *p; @@ -274,9 +277,9 @@ DefineEValue(type, value, name) } long -GetEValue (typeid, name) - short typeid; - char *name; +GetEValue ( + short typeid, + char *name) { TYPE p; struct ValueListEntry *v; @@ -334,7 +337,7 @@ DefineValues(TYPE type, long value, short length, short ctype, char *name) /* ************************************************************ */ static void -InitBuiltInTypes() +InitBuiltInTypes (void) { (void) DefineType(INT8, BUILTIN, "INT8", PrintINT8); (void) DefineType(INT16, BUILTIN, "INT16", PrintINT16); @@ -379,7 +382,7 @@ InitBuiltInTypes() /* ************************************************************ */ static void -InitEnumeratedTypes() +InitEnumeratedTypes (void) { TYPE p; @@ -880,7 +883,7 @@ InitEnumeratedTypes() /* ************************************************************ */ static void -InitSetTypes() +InitSetTypes (void) { TYPE p; @@ -984,8 +987,8 @@ InitSetTypes() /* Print Routines for builtin record types */ static int -PrintCHAR2B(buf) - unsigned char *buf; +PrintCHAR2B ( + unsigned char *buf) { PrintField(buf, 0, 1, CARD8, "byte1"); PrintField(buf, 1, 1, CARD8, "byte2"); @@ -993,8 +996,8 @@ PrintCHAR2B(buf) } static int -PrintPOINT(buf) - unsigned char *buf; +PrintPOINT ( + unsigned char *buf) { PrintField(buf, 0, 2, INT16, "x"); PrintField(buf, 2, 2, INT16, "y"); @@ -1002,8 +1005,8 @@ PrintPOINT(buf) } static int -PrintRECTANGLE(buf) - unsigned char *buf; +PrintRECTANGLE ( + unsigned char *buf) { PrintField(buf, 0, 2, INT16, "x"); PrintField(buf, 2, 2, INT16, "y"); @@ -1013,8 +1016,8 @@ PrintRECTANGLE(buf) } static int -PrintARC(buf) - unsigned char *buf; +PrintARC ( + unsigned char *buf) { PrintField(buf, 0, 2, INT16, "x"); PrintField(buf, 2, 2, INT16, "y"); @@ -1026,8 +1029,8 @@ PrintARC(buf) } static int -PrintHOST(buf) - unsigned char *buf; +PrintHOST ( + unsigned char *buf) { short n; PrintField(buf, 0, 1, HOSTFAMILY, "family"); @@ -1066,8 +1069,8 @@ PrintHOST(buf) } static int -PrintTIMECOORD(buf) - unsigned char *buf; +PrintTIMECOORD ( + unsigned char *buf) { PrintField(buf, 0, 4, TIMESTAMP, "time"); PrintField(buf, 4, 2, CARD16, "x"); @@ -1076,8 +1079,8 @@ PrintTIMECOORD(buf) } static int -PrintFONTPROP(buf) - unsigned char *buf; +PrintFONTPROP ( + unsigned char *buf) { PrintField(buf, 0, 4, ATOM, "name"); PrintField(buf, 4, 4, INT32, "value"); @@ -1085,8 +1088,8 @@ PrintFONTPROP(buf) } static int -PrintCHARINFO(buf) - unsigned char *buf; +PrintCHARINFO ( + unsigned char *buf) { PrintField(buf, 0, 2, INT16, "left-side-bearing"); PrintField(buf, 2, 2, INT16, "right-side-bearing"); @@ -1098,8 +1101,8 @@ PrintCHARINFO(buf) } static int -PrintSEGMENT(buf) - unsigned char *buf; +PrintSEGMENT ( + unsigned char *buf) { PrintField(buf, 0, 2, INT16, "x1"); PrintField(buf, 2, 2, INT16, "y1"); @@ -1109,8 +1112,8 @@ PrintSEGMENT(buf) } static int -PrintCOLORITEM(buf) - unsigned char *buf; +PrintCOLORITEM ( + unsigned char *buf) { PrintField(buf, 0, 4, CARD32, "pixel"); PrintField(buf, 4, 2, CARD16, "red"); @@ -1121,8 +1124,8 @@ PrintCOLORITEM(buf) } static int -PrintRGB(buf) - unsigned char *buf; +PrintRGB ( + unsigned char *buf) { PrintField(buf, 0, 2, CARD16, "red"); PrintField(buf, 2, 2, CARD16, "green"); @@ -1131,8 +1134,8 @@ PrintRGB(buf) } static int -PrintFORMAT(buf) - unsigned char *buf; +PrintFORMAT ( + unsigned char *buf) { PrintField(buf, 0, 1, CARD8, "depth"); PrintField(buf, 1, 1, CARD8, "bits-per-pixel"); @@ -1141,8 +1144,8 @@ PrintFORMAT(buf) } static int -PrintSCREEN(buf) - unsigned char *buf; +PrintSCREEN ( + unsigned char *buf) { short n /* number of elements in List of DEPTH */ ; long m /* length (in bytes) of List of DEPTH */ ; @@ -1169,8 +1172,8 @@ PrintSCREEN(buf) } static int -PrintDEPTH(buf) - unsigned char *buf; +PrintDEPTH ( + unsigned char *buf) { short n /* number of elements in List of VISUALTYPE */ ; short m /* length (in bytes) of List of VISUALTYPE */ ; @@ -1183,8 +1186,8 @@ PrintDEPTH(buf) } static int -PrintVISUALTYPE(buf) - unsigned char *buf; +PrintVISUALTYPE ( + unsigned char *buf) { PrintField(buf, 0, 4, VISUALID, "visual-id"); PrintField(buf, 4, 1, COLORCLASS, "class"); @@ -1199,7 +1202,7 @@ PrintVISUALTYPE(buf) /* ************************************************************ */ static void -InitRecordTypes() +InitRecordTypes (void) { (void) DefineType(CHAR2B, RECORD, "CHAR2B", PrintCHAR2B); (void) DefineType(POINT, RECORD, "POINT", PrintPOINT); @@ -1226,7 +1229,7 @@ InitRecordTypes() /* ************************************************************ */ static void -InitValuesTypes() +InitValuesTypes (void) { TYPE p; @@ -37,5 +37,19 @@ #define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) +extern unsigned char LookForWCPFlag; +extern unsigned char WCPRequest; +extern unsigned char WCPError; + +extern void WcpQueryVersion (FD fd, unsigned char *buf); +extern void WcpQueryVersionReply (FD fd, unsigned char *buf); +extern void WcpPutImage (FD fd, unsigned char *buf); +extern void WcpGetImage (FD fd, unsigned char *buf); +extern void WcpGetImageReply (FD fd, unsigned char *buf); +extern void WcpCreateColorCursor (FD fd, unsigned char *buf); +extern void WcpCreateLut (FD fd, unsigned char *buf); +extern void WcpFreeLut (FD fd, unsigned char *buf); +extern void WcpCopyArea (FD fd, unsigned char *buf); + #endif @@ -500,7 +500,7 @@ struct ConnState long NumberofBytesNeeded; long NumberofBytesProcessed; - long (*ByteProcessing)(); + long (*ByteProcessing)(FD fd, unsigned char *buf, long n); long SequenceNumber; }; @@ -514,30 +514,37 @@ typedef struct _Value { unsigned long *values; } ValueRec, *ValuePtr; -extern ValuePtr GetValueRec (); -extern CreateValueRec (); -extern DeleteValueRec (); -extern SetValueRec (); -extern PrintValueRec (); +extern ValuePtr GetValueRec (unsigned long key); +extern void CreateValueRec (unsigned long key, int size, unsigned long *def); +extern void DeleteValueRec (unsigned long key); +extern void SetValueRec (unsigned long key, unsigned char *control, + short clength, short ctype, unsigned char *values); +extern void PrintValueRec (unsigned long key, unsigned long cmask, + short ctype); /* ************************************************************ */ /* */ /* */ /* ************************************************************ */ -/* declaraction of the types of some common functions */ +/* declaration of the types of some common functions */ -extern unsigned long ILong(); -extern unsigned short IShort(); -extern unsigned short IByte(); -extern Boolean IBool(); +extern unsigned long ILong(unsigned char buf[]); +extern unsigned short IShort(unsigned char buf[]); +extern unsigned short IChar2B(unsigned char buf[]); +extern unsigned short IByte(unsigned char buf[]); +extern Boolean IBool(unsigned char buf[]); -extern PrintString8(), PrintTString8 (); -extern PrintString16(), PrintTString16 (); +extern int PrintString8(unsigned char buf[], int number, char *name); +extern int PrintString16(unsigned char buf[], int number, char *name); +extern void PrintTString8(unsigned char buf[], long number, char *name); +extern void PrintTString16(unsigned char buf[], long number, char *name); -extern long PrintList(); -extern long PrintListSTR(); -extern long pad(); +extern long PrintList (unsigned char *buf, long number, short ListType, + char *name); +extern long PrintListSTR (unsigned char *buf, long number, char *name); + +extern long pad(long n); extern char *REQUESTHEADER, *EVENTHEADER, *ERRORHEADER, *REPLYHEADER; |