x11vnc: fix build error if libssl is missing or --without-ssl supplied.

ChangeLog

+2007-06-14  Karl Runge <runge@karlrunge.com>
+	* configure.ac: add a note on what you must do if you want to
+	  re-run autoconf from the LibVNCServer-X.Y.Z.tar.gz tarball.
+
 2007-05-26  Karl Runge <runge@karlrunge.com>
 	* configure.ac, Makefile.am, x11vnc/Makefile.am: change 
 	  configure to make more of a split between libvncserver and

classes/ssl/ultra.vnc

@@ -20,6 +20,7 @@ $USER's $DESKTOP desktop ($DISPLAY)
 <param name=PORT value=$PORT>
 <param name="Open New Window" value=yes>
 <param name="ignoreMSLogonCheck" value=yes>
+<param name="delayAuthPanel" value=yes>
 $PARAMS
 </APPLET>
 <BR>

classes/ssl/ultrasigned.vnc

@@ -20,6 +20,7 @@ $USER's $DESKTOP desktop ($DISPLAY)
 <param name=PORT value=$PORT>
 <param name="Open New Window" value=yes>
 <param name="ignoreMSLogonCheck" value=yes>
+<param name="delayAuthPanel" value=yes>
 $PARAMS
 </APPLET>
 <BR>

configure.ac

@@ -675,8 +675,20 @@ AC_CONFIG_FILES([Makefile
 	test/Makefile
 	libvncserver-config
 	LibVNCServer.spec])
+#
 # x11vnc only:
+#
 if test "$build_x11vnc" = "yes"; then
+	#
+	# NOTE: if you are using the LibVNCServer-X.Y.Z.tar.gz source
+	# tarball and nevertheless want to run autoconf (i.e. aclocal,
+	# autoheader, automake, autoconf) AGAIN (perhaps you have a
+	# special target system, e.g. embedded) then you will need to
+	# comment out the following 'AC_CONFIG_FILES' line to avoid
+	# automake error messages like:
+	#
+	# configure.ac:690: required file `x11vnc/Makefile.in' not found
+	#
 	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile])
 fi
 

x11vnc/ChangeLog

+2007-06-14  Karl Runge <runge@karlrunge.com>
+	* x11vnc: add detectors if ultravnc chat or file xfer took place,
+	  if so ping clients more frequently.  Fix compile bug if libssl
+	  not available.
+	* ssvnc: add ultravnc ftp jar feature. Add certificate management
+	  "Verify All Certs".
+
 2007-05-26  Karl Runge <runge@karlrunge.com>
 	* x11vnc: set to version 0.9.2, back to NCACHE -12 for testing.
 	  in -unixpw, initial Escape means no echo username (see ssvnc).

x11vnc/misc/enhanced_tightvnc_viewer/README

@@ -95,16 +95,21 @@ The enhanced TightVNC viewer features are:
 
 	- ZRLE VNC encoding support (RealVNC's encoding)
 
+	- Cursor alphablending with x11vnc at 32bpp (-alpha option)
+
+	- Option "-unixpw ..." for use with "x11vnc -unixpw" login dialogs.
+
+	- Support for UltraVNC extensions: Single Window, Disable
+	  Server-side Input, 1/n Server side scaling, Text Chat (shell
+	  terminal UI). Both UltraVNC and x11vnc servers support these
+	  extensions
+
 	- Extremely low color modes: 64 and 8 colors in 8bpp
 	  (-use64/-bgr222, -use8/-bgr111)
 
 	- Medium color mode: 16bpp mode even for 32bpp Viewer display
 	  (-16bpp/-bgr565)
 
-	- Cursor alphablending with x11vnc at 32bpp (-alpha option)
-
-	- Maintains its own BackingStore if the X server does not
-
 	- x11vnc's client-side caching -ncache method cropping option
 	  (-ycrop n). This will "hide" the large pixel buffer cache
 	  below the actual display. Set to actual height or use -1 for
@@ -113,6 +118,14 @@ The enhanced TightVNC viewer features are:
 	- Scrollbar width setting: -sbwidth n, the default is very thin,
 	  2 pixels, for less distracting -ycrop usage.
 
+	- Improvements to the Popup menu, all of these can now be changed
+	  dynamically via the menu: ViewOnly, Toggle Bell, CursorShape
+	  updates, X11 Cursor, Cursor Alphablending, Toggle Tight/ZRLE,
+	  Toggle JPEG, FullColor/16bpp/8bpp (256/64/8 colors), Greyscale
+	  for low color modes.
+
+	- Maintains its own BackingStore if the X server does not
+
 	- The default for localhost:0 connections is not raw encoding
 	  (local machine). Default assumes you are using SSH tunnel. Use
 	  -rawlocal to revert.
@@ -123,17 +136,6 @@ The enhanced TightVNC viewer features are:
 	- Fix for Popup menu positioning for old window managers
 	  (-popupfix option).
 
-	- Improvements to the Popup menu, all of these can now be changed
-	  dynamically via the menu: ViewOnly, Toggle Bell, CursorShape
-	  updates, X11 Cursor, Cursor Alphablending, Toggle Tight/ZRLE,
-	  Toggle JPEG, FullColor/16bpp/8bpp (256/64/8 colors), Greyscale
-	  for low color modes.
-
-	- Support for UltraVNC extensions: Single Window, Disable
-	  Server-side Input, 1/n Server side scaling, Text Chat (shell
-	  terminal UI). Both UltraVNC and x11vnc servers support these
-	  extensions
-
 	- Run vncviewer -help for all options.
 
 
@@ -161,7 +163,7 @@ Unix and Mac OS X:
 
     Unpack the archive:
 
-        % gzip -dc ssvnc-1.0.15.tar.gz | tar xvf -
+        % gzip -dc ssvnc-1.0.18.tar.gz | tar xvf -
 
     Run the GUI:
 
@@ -171,18 +173,24 @@ Unix and Mac OS X:
 
     On MacOSX you could also click on the SSVNC app in the Finder.
 
-    The smaller file "ssvnc_no_windows-1.0.15.tar.gz"
+    The smaller file "ssvnc_no_windows-1.0.18.tar.gz"
     could have been used as well.
 
     On MacOSX there is also a SSVNC.app directory icon you can click on
     in Finder to start the application.
 
+    On MacOSX if you don't like the Chicken of the VNC (e.g. no local
+    cursors, no screen size rescaling, and no password prompting), and you
+    have the XDarwin X server installed, you can set DISPLAY before starting
+    ssvnc (or type DISPLAY=... in Host:Disp and hit Return).  Then our
+    enhanced TightVNC viewer will be used instead of COTVNC.
+
 
 Windows:
 
     Unzip, using WinZip or a similar utility, the zip file:
 
-        ssvnc-1.0.15.zip
+        ssvnc-1.0.18.zip
 
     Run the GUI, e.g.:
 
@@ -194,7 +202,7 @@ Windows:
 
     select Open, and then OK to launch it.
 
-    The smaller file "ssvnc_windows_only-1.0.15.zip"
+    The smaller file "ssvnc_windows_only-1.0.18.zip"
     could have been used as well.
 
     You can make a Windows shortcut to this program if you want to.

x11vnc/misc/enhanced_tightvnc_viewer/bin/Darwin.Power.Macintosh/vncviewer.sh

@@ -5,6 +5,15 @@
 
 dir=`dirname "$0"`
 
+if [ "X$SSVNC_DYLD_LIBRARY_PATH" != "X" ]; then
+	if [ "X$DYLD_LIBRARY_PATH" = "X" ] ; then
+		DYLD_LIBRARY_PATH=$SSVNC_DYLD_LIBRARY_PATH
+	else
+		DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$SSVNC_DYLD_LIBRARY_PATH
+	fi
+	export DYLD_LIBRARY_PATH
+fi
+
 if [ "X$DISPLAY" != "X" ]; then
 	"$dir/vncviewer.x11" "$@"
 else

x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc

@@ -126,6 +126,11 @@ fi
 SSVNC_BASEDIR="$dir"
 export SSVNC_BASEDIR
 
+if [ -f "$dir/util/ultraftp.jar" ]; then
+	SSVNC_ULTRA_FTP_JAR="$dir/util/ultraftp.jar"
+	export SSVNC_ULTRA_FTP_JAR
+fi
+
 if [ "X$WISH" = "Xwish" ]; then
 	exec ssvnc.tcl "$@"
 else

x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd

@@ -86,6 +86,13 @@ fi
 PATH=$PATH:/usr/bin:/bin
 export PATH
 
+if [ "X$FULLNAME" = "XKarl J. Runge" ]; then
+	VNCVIEWER_POPUP_FIX=1
+	export VNCVIEWER_POPUP_FIX
+
+	PATH=`echo "$PATH" | sed -e 's,runge/bin/override,-------------,'`
+fi
+
 # Set this for ss_vncviewer to pick up:
 #
 if [ "X$1" = "X-cotvnc" ]; then
@@ -195,6 +202,11 @@ else
 	PATH="$dir:$dir/$name:$dir/util:$PATH"
 fi
 
+if [ -f "$dir/util/ultraftp.jar" ]; then
+	SSVNC_ULTRA_FTP_JAR="$dir/util/ultraftp.jar"
+	export SSVNC_ULTRA_FTP_JAR
+fi
+
 base=`basename "$0"`
 if [ "X$1" = "X-ssl" ]; then
 	shift	

x11vnc/misc/enhanced_tightvnc_viewer/src/patches/_bundle

 #!/bin/sh
 
 rm -rf ./src/tmp/* || exit 1
-vers=1.0.17
+vers=1.0.18
 
 cd .. || exit 1
 

x11vnc/options.c

@@ -371,6 +371,8 @@ int force_dpms = 0;
 int client_dpms = 0;
 int no_ultra_dpms = 0;
 int no_ultra_ext = 0;
+int saw_ultra_chat = 0;
+int saw_ultra_file = 0;
 
 int watch_selection = 1;	/* normal selection/cutbuffer maintenance */
 int watch_primary = 1;		/* more dicey, poll for changes in PRIMARY */

x11vnc/options.h

@@ -270,6 +270,8 @@ extern int force_dpms;
 extern int client_dpms;
 extern int no_ultra_dpms;
 extern int no_ultra_ext;
+extern int saw_ultra_chat;
+extern int saw_ultra_file;
 
 extern int watch_selection;
 extern int watch_primary;

x11vnc/scan.c

@@ -2704,8 +2704,13 @@ static void ping_clients(int tile_cnt) {
 		rfbLog("reset rfbMaxClientWait to %d msec.\n",
 		    rfbMaxClientWait);
 	}
-	if (tile_cnt) {
+	if (tile_cnt > 0) {
 		last_send = now;
+	} else if (tile_cnt < 0) {
+		if (now >= last_send - tile_cnt) {
+			mark_rect_as_modified(0, 0, 1, 1, 1);
+			last_send = now;
+		}
 	} else if (now - last_send > 2) {
 		/* Send small heartbeat to client */
 		mark_rect_as_modified(0, 0, 1, 1, 1);
@@ -3344,6 +3349,8 @@ if (tile_count) fprintf(stderr, "XX copytile: %.4f  tile_count: %d\n", dnow() -
 	/* Work around threaded rfbProcessClientMessage() calls timeouts */
 	if (use_threads) {
 		ping_clients(tile_diffs);
+	} else if (saw_ultra_chat || saw_ultra_file) {
+		ping_clients(-1);
 	} else if (use_openssl && !tile_diffs) {
 		ping_clients(0);
 	}

x11vnc/sslhelper.c

@@ -34,6 +34,11 @@ int https_sock = -1;
 pid_t openssl_last_helper_pid = 0;
 char *openssl_last_ip = NULL;
 
+static char *certret = NULL;
+static int certret_fd = -1;
+static mode_t omode;
+char *certret_str = NULL;
+
 void raw_xfer(int csock, int s_in, int s_out);
 
 #if !LIBVNCSERVER_HAVE_LIBSSL
@@ -1315,11 +1320,6 @@ if (db) fprintf(stderr, "buf: '%s'\n", buf);
 	return 1;
 }
 
-static char *certret = NULL;
-static int certret_fd = -1;
-static mode_t omode;
-char *certret_str = NULL;
-
 void accept_openssl(int mode, int presock) {
 	int sock = -1, listen = -1, cport, csock, vsock;	
 	int peerport = 0;

x11vnc/x11vnc.1

 .\" This file was automatically generated from x11vnc -help output.
-.TH X11VNC "1" "May 2007" "x11vnc " "User Commands"
+.TH X11VNC "1" "June 2007" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.9.2, lastmod: 2007-05-26
+         version: 0.9.2, lastmod: 2007-06-14
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...

x11vnc/x11vnc_defs.c

@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.9.2 lastmod: 2007-05-26";
+char lastmod[] = "0.9.2 lastmod: 2007-06-14";
 
 /* X display info */
 

x11vnc/xevents.c

@@ -1376,6 +1376,7 @@ void set_server_input(rfbClientPtr cl, int grab) {
 	}
 #endif
 }
+
 void set_text_chat(rfbClientPtr cl, int len, char *txt) {
 	int dochat = 1;
 	rfbClientIteratorPtr iter;
@@ -1384,6 +1385,7 @@ void set_text_chat(rfbClientPtr cl, int len, char *txt) {
 	if (no_ultra_ext || ! dochat) {
 		return;
 	}
+
 #if 0
 	rfbLog("set_text_chat: len=%d\n", len);
 	rfbLog("set_text_chat: len=0x%x txt='", len);
@@ -1395,6 +1397,9 @@ void set_text_chat(rfbClientPtr cl, int len, char *txt) {
 		rfbCloseClient(cl);
 		return;
 	}
+
+	saw_ultra_chat = 1;
+
 	iter = rfbGetClientIterator(screen);
 	while( (cl2 = rfbClientIteratorNext(iter)) ) {
 		unsigned int ulen = (unsigned int) len;
@@ -1440,6 +1445,9 @@ if (0) fprintf(stderr, "get_file_transfer_permitted called\n");
 	if (!input.files) {
 		return FALSE;
 	}
+	if (screen->permitFileTransfer) {
+		saw_ultra_file = 1;
+	}
 	return screen->permitFileTransfer;
 }