API change: Bool, KeySym, Pixel get prefix "rfb"; constants in rfbconfig.h get prefix "LIBVNCSERVER_"

11 files changed, 99 insertions, 114 deletions

diff --git a/libvncclient/Makefile.in b/libvncclient/Makefile.in
index 6f563e7..47b4f73 100644
--- a/libvncclient/Makefile.in
+++ b/libvncclient/Makefile.in
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,6 +12,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -59,21 +55,18 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
 CCLD = @CCLD@
 CXX = @CXX@
 DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 RPMSOURCEDIR = @RPMSOURCEDIR@
-STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
+
 CFLAGS = -g -I.. -I. -Wall
 
 libvncclient_a_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c
@@ -98,7 +92,7 @@ noinst_PROGRAMS = client_test
 client_test_LDADD = libvncclient.a
 subdir = libvncclient
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h
+CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(lib_LIBRARIES)
 
@@ -116,15 +110,14 @@ client_test_DEPENDENCIES = libvncclient.a
 client_test_LDFLAGS =
 
 DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/rfb
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/client_test.Po ./$(DEPDIR)/cursor.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/listen.Po ./$(DEPDIR)/rfbproto.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/sockets.Po ./$(DEPDIR)/vncviewer.Po
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/client_test.Po $(DEPDIR)/cursor.Po \
+@AMDEP_TRUE@	$(DEPDIR)/listen.Po $(DEPDIR)/rfbproto.Po \
+@AMDEP_TRUE@	$(DEPDIR)/sockets.Po $(DEPDIR)/vncviewer.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -140,24 +133,23 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  libvncclient/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
 AR = ar
-libLIBRARIES_INSTALL = $(INSTALL_DATA)
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
 	@$(POST_INSTALL)
 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
@@ -166,7 +158,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
 uninstall-libLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  p="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
 	  rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
@@ -190,21 +181,21 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbproto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vncviewer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cursor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/listen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rfbproto.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sockets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vncviewer.Po@am__quote@
 
 distclean-depend:
-	-rm -rf ./$(DEPDIR)
+	-rm -rf $(DEPDIR)
 
 .c.o:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
 
 .c.obj:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -214,61 +205,53 @@ distclean-depend:
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
+	mkid -fID $$unique $(LISP)
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
 GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	@for file in $(DISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -293,7 +276,6 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -301,7 +283,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/libvncclient/corre.c b/libvncclient/corre.c
index d7f2fe6..baf91cc 100644
--- a/libvncclient/corre.c
+++ b/libvncclient/corre.c
@@ -29,7 +29,7 @@
 #define HandleCoRREBPP CONCAT2E(HandleCoRRE,BPP)
 #define CARDBPP CONCAT3E(uint,BPP,_t)
 
-static Bool
+static rfbBool
 HandleCoRREBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 {
     rfbRREHeader hdr;
diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c
index f6a7816..9c8463d 100644
--- a/libvncclient/cursor.c
+++ b/libvncclient/cursor.c
@@ -43,7 +43,7 @@
  * why we call it "software cursor").
  ********************************************************************/
 
-Bool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc)
+rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc)
 {
   int bytesPerPixel;
   size_t bytesPerRow, bytesMaskData;
diff --git a/libvncclient/hextile.c b/libvncclient/hextile.c
index e09fbc9..14128ff 100644
--- a/libvncclient/hextile.c
+++ b/libvncclient/hextile.c
@@ -30,7 +30,7 @@
 #define CARDBPP CONCAT3E(uint,BPP,_t)
 #define GET_PIXEL CONCAT2E(GET_PIXEL,BPP)
 
-static Bool
+static rfbBool
 HandleHextileBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 {
   CARDBPP bg, fg;
diff --git a/libvncclient/listen.c b/libvncclient/listen.c
index 2461dcf..1e6f68b 100644
--- a/libvncclient/listen.c
+++ b/libvncclient/listen.c
@@ -43,7 +43,8 @@ listenForIncomingConnections(rfbClient* client)
 
   listenSocket = ListenAtTcpPort(client->listenPort);
 
-  if ((listenSocket < 0)) exit(1);
+  if ((listenSocket < 0))
+    return;
 
   rfbClientLog("%s -listen: Listening on port %d\n",
 	  client->programName,client->listenPort);
@@ -66,8 +67,10 @@ listenForIncomingConnections(rfbClient* client)
 
     if (FD_ISSET(listenSocket, &fds)) {
       client->sock = AcceptTcpConnection(listenSocket);
-      if (client->sock < 0) exit(1);
-      if (!SetNonBlocking(client->sock)) exit(1);
+      if (client->sock < 0)
+	return;
+      if (!SetNonBlocking(client->sock))
+	return;
 
       /* Now fork off a new process to deal with it... */
 
@@ -75,7 +78,7 @@ listenForIncomingConnections(rfbClient* client)
 
       case -1: 
 	perror("fork"); 
-	exit(1);
+	return;
 
       case 0:
 	/* child - return to caller */
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 72d71d4..8bad811 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -27,10 +27,10 @@
 #include <errno.h>
 #include <pwd.h>
 #include <rfb/rfbclient.h>
-#ifdef HAVE_LIBZ
+#ifdef LIBVNCSERVER_HAVE_LIBZ
 #include <zlib.h>
 #endif
-#ifdef HAVE_LIBJPEG
+#ifdef LIBVNCSERVER_HAVE_LIBJPEG
 #include <jpeglib.h>
 #endif
 #include <stdarg.h>
@@ -40,7 +40,7 @@
  * rfbClientLog prints a time-stamped message to the log file (stderr).
  */
 
-Bool rfbEnableClientLogging=TRUE;
+rfbBool rfbEnableClientLogging=TRUE;
 
 void
 rfbClientLog(const char *format, ...)
@@ -124,21 +124,21 @@ void CopyRectangleFromRectangle(rfbClient* client, int src_x, int src_y, int w,
   }
 }
 
-static Bool HandleRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleCoRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleCoRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleCoRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleHextile8(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleHextile16(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleHextile32(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleZlib8(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleZlib16(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleZlib32(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleTight8(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleTight16(rfbClient* client, int rx, int ry, int rw, int rh);
-static Bool HandleTight32(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleCoRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleCoRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleCoRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleHextile8(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleHextile16(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleHextile32(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleZlib8(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleZlib16(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleZlib32(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleTight8(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleTight16(rfbClient* client, int rx, int ry, int rw, int rh);
+static rfbBool HandleTight32(rfbClient* client, int rx, int ry, int rw, int rh);
 
 static long ReadCompactLen (rfbClient* client);
 
@@ -159,7 +159,7 @@ static int raw_buffer_size = -1;
 static char *raw_buffer;
 
 static z_stream decompStream;
-static Bool decompStreamInited = FALSE;
+static rfbBool decompStreamInited = FALSE;
 
 
 /*
@@ -174,25 +174,25 @@ static char zlib_buffer[ZLIB_BUFFER_SIZE];
 
 /* Four independent compression streams for zlib library. */
 static z_stream zlibStream[4];
-static Bool zlibStreamActive[4] = {
+static rfbBool zlibStreamActive[4] = {
   FALSE, FALSE, FALSE, FALSE
 };
 
 /* Filter stuff. Should be initialized by filter initialization code. */
-static Bool cutZeros;
+static rfbBool cutZeros;
 static int rectWidth, rectColors;
 static char tightPalette[256*4];
 static uint8_t tightPrevRow[2048*3*sizeof(uint16_t)];
 
 /* JPEG decoder state. */
-static Bool jpegError;
+static rfbBool jpegError;
 
 
 /*
  * ConnectToRFBServer.
  */
 
-Bool
+rfbBool
 ConnectToRFBServer(rfbClient* client,const char *hostname, int port)
 {
   unsigned int host;
@@ -218,7 +218,7 @@ static void rfbEncryptBytes(unsigned char *bytes, char *passwd);
  * InitialiseRFBConnection.
  */
 
-Bool
+rfbBool
 InitialiseRFBConnection(rfbClient* client)
 {
   rfbProtocolVersionMsg pv;
@@ -368,7 +368,7 @@ InitialiseRFBConnection(rfbClient* client)
  * SetFormatAndEncodings.
  */
 
-Bool
+rfbBool
 SetFormatAndEncodings(rfbClient* client)
 {
   rfbSetPixelFormatMsg spf;
@@ -376,9 +376,9 @@ SetFormatAndEncodings(rfbClient* client)
   rfbSetEncodingsMsg *se = (rfbSetEncodingsMsg *)buf;
   uint32_t *encs = (uint32_t *)(&buf[sz_rfbSetEncodingsMsg]);
   int len = 0;
-  Bool requestCompressLevel = FALSE;
-  Bool requestQualityLevel = FALSE;
-  Bool requestLastRectEncoding = FALSE;
+  rfbBool requestCompressLevel = FALSE;
+  rfbBool requestQualityLevel = FALSE;
+  rfbBool requestLastRectEncoding = FALSE;
 
   spf.type = rfbSetPixelFormat;
   spf.format = client->format;
@@ -519,7 +519,7 @@ SetFormatAndEncodings(rfbClient* client)
  * SendIncrementalFramebufferUpdateRequest.
  */
 
-Bool
+rfbBool
 SendIncrementalFramebufferUpdateRequest(rfbClient* client)
 {
   return SendFramebufferUpdateRequest(client, 0, 0, client->si.framebufferWidth,
@@ -531,8 +531,8 @@ SendIncrementalFramebufferUpdateRequest(rfbClient* client)
  * SendFramebufferUpdateRequest.
  */
 
-Bool
-SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, Bool incremental)
+rfbBool
+SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, rfbBool incremental)
 {
   rfbFramebufferUpdateRequestMsg fur;
 
@@ -554,7 +554,7 @@ SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, Bool
  * SendPointerEvent.
  */
 
-Bool
+rfbBool
 SendPointerEvent(rfbClient* client,int x, int y, int buttonMask)
 {
   rfbPointerEventMsg pe;
@@ -574,8 +574,8 @@ SendPointerEvent(rfbClient* client,int x, int y, int buttonMask)
  * SendKeyEvent.
  */
 
-Bool
-SendKeyEvent(rfbClient* client, uint32_t key, Bool down)
+rfbBool
+SendKeyEvent(rfbClient* client, uint32_t key, rfbBool down)
 {
   rfbKeyEventMsg ke;
 
@@ -590,7 +590,7 @@ SendKeyEvent(rfbClient* client, uint32_t key, Bool down)
  * SendClientCutText.
  */
 
-Bool
+rfbBool
 SendClientCutText(rfbClient* client, char *str, int len)
 {
   rfbClientCutTextMsg cct;
@@ -611,7 +611,7 @@ SendClientCutText(rfbClient* client, char *str, int len)
  * HandleRFBServerMessage.
  */
 
-Bool
+rfbBool
 HandleRFBServerMessage(rfbClient* client)
 {
   rfbServerToClientMsg msg;
diff --git a/libvncclient/rre.c b/libvncclient/rre.c
index a0b75e6..94158c9 100644
--- a/libvncclient/rre.c
+++ b/libvncclient/rre.c
@@ -29,7 +29,7 @@
 #define HandleRREBPP CONCAT2E(HandleRRE,BPP)
 #define CARDBPP CONCAT3E(uint,BPP,_t)
 
-static Bool
+static rfbBool
 HandleRREBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 {
   rfbRREHeader hdr;
diff --git a/libvncclient/sockets.c b/libvncclient/sockets.c
index d631b02..77dec7c 100644
--- a/libvncclient/sockets.c
+++ b/libvncclient/sockets.c
@@ -34,7 +34,7 @@
 
 void PrintInHex(char *buf, int len);
 
-Bool errorMessageOnReadFailure = TRUE;
+rfbBool errorMessageOnReadFailure = TRUE;
 
 #define BUF_SIZE 8192
 static char buf[BUF_SIZE];
@@ -55,7 +55,7 @@ static int buffered = 0;
  *    events are processed, as there is no XtAppMainLoop in the program.
  */
 
-Bool
+rfbBool
 ReadFromRFBServer(rfbClient* client, char *out, unsigned int n)
 {
   if (n <= buffered) {
@@ -138,7 +138,7 @@ ReadFromRFBServer(rfbClient* client, char *out, unsigned int n)
  * Write an exact number of bytes, and don't return until you've sent them.
  */
 
-Bool
+rfbBool
 WriteToRFBServer(rfbClient* client, char *buf, int n)
 {
   fd_set fds;
@@ -322,7 +322,7 @@ AcceptTcpConnection(int listenSock)
  * SetNonBlocking sets a socket into non-blocking mode.
  */
 
-Bool
+rfbBool
 SetNonBlocking(int sock)
 {
   if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
@@ -337,7 +337,7 @@ SetNonBlocking(int sock)
  * StringToIPAddr - convert a host string to an IP address.
  */
 
-Bool
+rfbBool
 StringToIPAddr(const char *str, unsigned int *addr)
 {
   struct hostent *hp;
@@ -367,7 +367,7 @@ StringToIPAddr(const char *str, unsigned int *addr)
  * Test if the other end of a socket is on the same machine.
  */
 
-Bool
+rfbBool
 SameMachine(int sock)
 {
   struct sockaddr_in peeraddr, myaddr;
diff --git a/libvncclient/tight.c b/libvncclient/tight.c
index 1fadd4c..77919f4 100644
--- a/libvncclient/tight.c
+++ b/libvncclient/tight.c
@@ -80,12 +80,12 @@ static void FilterPaletteBPP (rfbClient* client, int numRows, CARDBPP *destBuffe
 static void FilterGradientBPP (rfbClient* client, int numRows, CARDBPP *destBuffer);
 
 #if BPP != 8
-static Bool DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h);
+static rfbBool DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h);
 #endif
 
 /* Definitions */
 
-static Bool
+static rfbBool
 HandleTightBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 {
   CARDBPP fill_colour;
@@ -297,7 +297,7 @@ HandleTightBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 
 /*
    The following variables are defined in rfbproto.c:
-     static Bool cutZeros;
+     static rfbBool cutZeros;
      static int rectWidth, rectColors;
      static uint8_t tightPalette[256*4];
      static uint8_t tightPrevRow[2048*3*sizeof(CARD16)];
@@ -526,13 +526,13 @@ FilterPaletteBPP (rfbClient* client, int numRows, CARDBPP *dst)
 
 /*
    The following variables are defined in rfbproto.c:
-     static Bool jpegError;
+     static rfbBool jpegError;
      static struct jpeg_source_mgr jpegSrcManager;
      static JOCTET *jpegBufferPtr;
      static size_t *jpegBufferLen;
 */
 
-static Bool
+static rfbBool
 DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h)
 {
   struct jpeg_decompress_struct cinfo;
diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index 54fcb51..6288485 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -28,7 +28,7 @@
 
 static void Dummy(rfbClient* client) {
 }
-static Bool DummyPoint(rfbClient* client, int x, int y) {
+static rfbBool DummyPoint(rfbClient* client, int x, int y) {
   return TRUE;
 }
 static void DummyRect(rfbClient* client, int x, int y, int w, int h) {
@@ -36,7 +36,7 @@ static void DummyRect(rfbClient* client, int x, int y, int w, int h) {
 static char* NoPassword(rfbClient* client) {
   return "";
 }
-static Bool MallocFrameBuffer(rfbClient* client) {
+static rfbBool MallocFrameBuffer(rfbClient* client) {
   if(client->frameBuffer)
     free(client->frameBuffer);
   client->frameBuffer=malloc(client->width*client->height*client->format.bitsPerPixel/8);
@@ -94,7 +94,7 @@ rfbClient* rfbGetClient(int* argc,char** argv,
   return client;
 }
 
-Bool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort)
+rfbBool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort)
 {
   /* Unless we accepted an incoming connection, make a TCP connection to the
      given VNC server */
diff --git a/libvncclient/zlib.c b/libvncclient/zlib.c
index 25d6422..23e30db 100644
--- a/libvncclient/zlib.c
+++ b/libvncclient/zlib.c
@@ -30,7 +30,7 @@
 #define HandleZlibBPP CONCAT2E(HandleZlib,BPP)
 #define CARDBPP CONCAT2E(uint,BPP,_t)
 
-static Bool
+static rfbBool
 HandleZlibBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 {
   rfbZlibHeader hdr;