fixed maxRectsPerUpdate with Tight encoding bug; some autoconfing; stderr should not be used in a library (use rfbLog instead)

5 files changed, 69 insertions, 54 deletions

diff --git a/vncterm/LinuxVNC.c b/vncterm/LinuxVNC.c
index 3165147..fd8265a 100644
--- a/vncterm/LinuxVNC.c
+++ b/vncterm/LinuxVNC.c
@@ -48,7 +48,7 @@ void do_key(Bool down,KeySym keySym,rfbClientPtr cl)
 
       if(keySym<0x100) {
 	int ret;
-	//fprintf(stderr,"do_key: %c (0x%lx)\n",(char)keySym,keySym);
+	//rfbLog("do_key: %c (0x%lx)\n",(char)keySym,keySym);
 	ret=ioctl(tty_inject_device,TIOCSTI,&keySym);
 	if(ret<0) {
 	  static char device[64];
@@ -57,7 +57,7 @@ void do_key(Bool down,KeySym keySym,rfbClientPtr cl)
 	  tty_inject_device=open(device,O_WRONLY);
 	  ret=ioctl(tty_inject_device,TIOCSTI,&keySym);
 	  if(ret<0)
-	    fprintf(stderr,"Couldn't reopen device %s!\n",device);
+	    rfbLog("Couldn't reopen device %s!\n",device);
 	}
       }
     }
@@ -88,7 +88,7 @@ int main(int argc,char **argv)
 
   if(argc>1) {
     if((tty=atoi(argv[1]))<1) {
-      fprintf(stderr,"Usage: %s [tty_number [vnc args]]\n",argv[0]);
+      rfbLog("Usage: %s [tty_number [vnc args]]\n",argv[0]);
       exit(1);
     } else {
       argv++;
@@ -100,10 +100,10 @@ int main(int argc,char **argv)
 
   sprintf(tty_device,"/dev/tty%d",tty);
   if((tty_inject_device=open(tty_device,O_WRONLY))<0) {
-    fprintf(stderr,"Couldn't open tty device %s!\n",tty_device);
+    rfbLog("Couldn't open tty device %s!\n",tty_device);
     exit(1);
   }
-  fprintf(stderr,"Using device %s.\n",tty_device);
+  rfbLog("Using device %s.\n",tty_device);
 
   if(ioctl(tty_inject_device,TIOCGWINSZ,&dimensions)>=0) {
     width=dimensions.ws_col;
@@ -142,7 +142,7 @@ int main(int argc,char **argv)
     if(!console->currentlyMarking) {
       tty_file=fopen(tty_device,"rb");
       if(!tty_file) {
-	fprintf(stderr,"cannot open device \"%s\"\n",
+	rfbLog("cannot open device \"%s\"\n",
 		tty_device);
 	exit(1);
       }
@@ -166,7 +166,7 @@ int main(int argc,char **argv)
 	    console->x=(i%console->width);
 	    console->y=(i/console->width);
 	    /*
-	      fprintf(stderr,"changes: %d,%d (%d!=%d || %d!=%d)\n",
+	      rfbLog("changes: %d,%d (%d!=%d || %d!=%d)\n",
 	      console->x,console->y,
 	      buffer[4+2*i],console->screenBuffer[i],
 	      buffer[5+2*i],console->attributeBuffer[i]);
diff --git a/vncterm/Makefile.in b/vncterm/Makefile.in
index 955c884..b440001 100644
--- a/vncterm/Makefile.in
+++ b/vncterm/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -43,9 +43,13 @@ 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@
@@ -55,18 +59,21 @@ 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@
@@ -75,7 +82,6 @@ X_PRE_LIBS = @X_PRE_LIBS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
-
 CONSOLE_SRCS = VNConsole.c
 
 noinst_HEADERS = VNConsole.h vga.h
@@ -100,18 +106,18 @@ CONFIG_CLEAN_FILES =
 noinst_PROGRAMS = VNCommand$(EXEEXT) example$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-@LINUX_TRUE@am_LinuxVNC_OBJECTS = LinuxVNC.$(OBJEXT) VNConsole.$(OBJEXT)
-@LINUX_FALSE@am_LinuxVNC_OBJECTS =
+am__objects_1 = VNConsole.$(OBJEXT)
+@LINUX_TRUE@am_LinuxVNC_OBJECTS = LinuxVNC.$(OBJEXT) $(am__objects_1)
 LinuxVNC_OBJECTS = $(am_LinuxVNC_OBJECTS)
 LinuxVNC_LDADD = $(LDADD)
 LinuxVNC_DEPENDENCIES = ../libvncserver.a
 LinuxVNC_LDFLAGS =
-am_VNCommand_OBJECTS = VNCommand.$(OBJEXT) VNConsole.$(OBJEXT)
+am_VNCommand_OBJECTS = VNCommand.$(OBJEXT) $(am__objects_1)
 VNCommand_OBJECTS = $(am_VNCommand_OBJECTS)
 VNCommand_LDADD = $(LDADD)
 VNCommand_DEPENDENCIES = ../libvncserver.a
 VNCommand_LDFLAGS =
-am_example_OBJECTS = example.$(OBJEXT) VNConsole.$(OBJEXT)
+am_example_OBJECTS = example.$(OBJEXT) $(am__objects_1)
 example_OBJECTS = $(am_example_OBJECTS)
 example_LDADD = $(LDADD)
 example_DEPENDENCIES = ../libvncserver.a
@@ -123,8 +129,9 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/LinuxVNC.Po $(DEPDIR)/VNCommand.Po \
-@AMDEP_TRUE@	$(DEPDIR)/VNConsole.Po $(DEPDIR)/example.Po
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/LinuxVNC.Po ./$(DEPDIR)/VNCommand.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/VNConsole.Po ./$(DEPDIR)/example.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -144,9 +151,8 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  vncterm/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -154,16 +160,16 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
-	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -189,19 +195,19 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/LinuxVNC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/VNCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/VNConsole.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/example.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LinuxVNC.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VNCommand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VNConsole.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.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@
@@ -211,53 +217,61 @@ distclean-depend:
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
+ETAGS = etags
+ETAGSFLAGS =
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(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 $(LISP)
+	mkid -fID $$unique
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(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)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__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)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	@list='$(DISTFILES)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
+	    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; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -282,6 +296,7 @@ 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:
@@ -289,7 +304,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/vncterm/VNCommand.c b/vncterm/VNCommand.c
index 694f401..26d003c 100644
--- a/vncterm/VNCommand.c
+++ b/vncterm/VNCommand.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
   if(programArg0<argc) {
     int in[2],out[2],err[2],pid;
     if(pipe(in)<0 || pipe(out)<0 || pipe(err)<0) {
-      fprintf(stderr,"Couldn't make pipes!");
+      rfbLog("Couldn't make pipes!");
       return(1);
     }
 
@@ -118,6 +118,6 @@ int main(int argc, char **argv)
       }
     }
   }
-  fprintf(stderr,"exit\n");
+  rfbLog("exit\n");
   return(0);
 }
diff --git a/vncterm/VNConsole.c b/vncterm/VNConsole.c
index 72e2fdc..cd80288 100644
--- a/vncterm/VNConsole.c
+++ b/vncterm/VNConsole.c
@@ -52,7 +52,7 @@ void vcDrawCursor(vncConsolePtr c)
 {
   rfbDrawCursor(c->rfbScreen);
   if(c->cursorActive && !c->cursorIsDrawn && c->y<c->height && c->x<c->width) {
-    /* fprintf(stderr,"DrawCursor: %d,%d\n",c->x,c->y); */
+    /* rfbLog("DrawCursor: %d,%d\n",c->x,c->y); */
     vcDrawOrHideCursor(c);
   }
 }
@@ -63,7 +63,7 @@ void vcHideCursor(vncConsolePtr c)
   if(c->currentlyMarking)
     vcUnmark(c);
   if(c->cursorIsDrawn) {
-    /* fprintf(stderr,"HideCursor: %d,%d\n",c->x,c->y); */
+    /* rfbLog("HideCursor: %d,%d\n",c->x,c->y); */
     vcDrawOrHideCursor(c);
   }
 }
@@ -158,7 +158,7 @@ void vcScroll(vncConsolePtr c,int lineCount)
   if(lineCount==0)
     return;
 
-  /* fprintf(stderr,"begin scroll\n"); */
+  /* rfbLog("begin scroll\n"); */
   vcHideCursor(c);
   c->dontDrawCursor=TRUE;
 
@@ -197,7 +197,7 @@ void vcScroll(vncConsolePtr c,int lineCount)
   memset(c->attributeBuffer+y1/c->cHeight*c->width,0x07,
 	 (y2-y1)/c->cHeight*c->width);
 #endif
-  /* fprintf(stderr,"end scroll\n"); */
+  /* rfbLog("end scroll\n"); */
 }  
 
 void vcCheckCoordinates(vncConsolePtr c)
@@ -256,7 +256,7 @@ void vcPutCharColour(vncConsolePtr c,unsigned char ch,unsigned char foreColour,u
       } while(c->x%8);
       break;
     default:
-       fprintf(stderr,"putchar of unknown character: %c(%d).\n",ch,ch);
+       rfbLog("putchar of unknown character: %c(%d).\n",ch,ch);
       vcPutChar(c,' ');
     }
   } else {
@@ -420,7 +420,7 @@ void vcPtrAddEventProc(int buttonMask,int x,int y,rfbClientPtr cl)
       c->markEnd=pos;
       vcToggleMarkCell(c,pos);
     } else {
-      DEBUG(fprintf(stderr,"markStart: %d, markEnd: %d, pos: %d\n",
+      DEBUG(rfbLog("markStart: %d, markEnd: %d, pos: %d\n",
 	      c->markStart,c->markEnd,pos));
       if(c->markEnd!=pos) {
 	if(c->markEnd<pos) {
diff --git a/vncterm/example.c b/vncterm/example.c
index fd77d54..e9d49b9 100644
--- a/vncterm/example.c
+++ b/vncterm/example.c
@@ -19,7 +19,7 @@ int main(int argc,char **argv)
     l=strlen(buffer)-1;
     while(l>=0 && buffer[l]=='\n')
       buffer[l]=0;
-    //fprintf(stderr,"%s (%d)",buffer,strlen(buffer));
+    //rfbLog("%s (%d)",buffer,strlen(buffer));
     if(!strcmp(buffer,"quit"))
       return(0);
     if(!strcmp(buffer,"s"))