Merge branch 'keithp'

Conflicts:

	common.c
	decode11.c
	fd.c
	fd.h
	print11.c
	prtype.c
	scope.c
	scope.h
	server.c
	table11.c
	x11.h
	xscope.man

1 files changed, 6 insertions, 1 deletions

diff --git a/proto.h b/proto.h
index 397cb6b..c8f06d3 100644
--- a/proto.h
+++ b/proto.h
@@ -7,7 +7,7 @@ void panic(char *s);
 void *Malloc(long n);
 void Free(void *p);
 void SetSignalHandling(void);
-void SetUpConnectionSocket(int iport);
+void SetUpConnectionSocket(int iport, int (*connectionFunc)());
 /* decode11.c */
 void InitReplyQ(void);
 void FlushReplyQ(FD fd);
@@ -231,6 +231,7 @@ void GetModifierMappingReply(unsigned char *buf);
 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);
@@ -249,6 +250,8 @@ FD ServerHalf(FD fd);
 char *ClientName(FD fd);
 void NewConnection(FD fd);
 /* 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);
@@ -261,6 +264,8 @@ 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);