x11vnc: set things up (NCACHE = -1) to not have -ncache on by default.

7 files changed, 46 insertions, 13 deletions

diff --git a/x11vnc/ChangeLog b/x11vnc/ChangeLog
index 7ebc4ed..c44e212 100644
--- a/x11vnc/ChangeLog
+++ b/x11vnc/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-21  Karl Runge <runge@karlrunge.com>
+	* x11vnc: set things up (NCACHE = -1) to not have -ncache
+	  on by default; just give a blurb about it.
+
 2007-05-16  Karl Runge <runge@karlrunge.com>
 	* x11vnc: print out peer host and port for debugging SSL. 
 	* ssvnc: rand check, SOCKS support, PORT=, Verify all Certs
diff --git a/x11vnc/README b/x11vnc/README
index 434574e..d31abaf 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -1,5 +1,5 @@
 
-x11vnc README file                         Date: Fri May 18 22:13:05 EDT 2007
+x11vnc README file                         Date: Mon May 21 17:57:42 EDT 2007
 
 The following information is taken from these URLs:
 
@@ -10172,7 +10172,8 @@ ssvnc.exe
    mobile use and you want the profiles you create to stay with the drive
    (otherwise you'd have to browse to the drive directory each time you
    load or save). WARNING: if you use ssvnc from an "Internet Cafe", i.e.
-   an untrusted computer, an intruder may be capturing keystrokes etc.
+   an untrusted computer, someone may have set it up to be capturing your
+   keystrokes, etc.
 
    Dynamic VNC Server Port determination: If you are running SSVNC on
    Unix and are using SSH to start the remote VNC server and the VNC
@@ -10934,7 +10935,7 @@ x11vnc: a VNC server for real X displays
    Here are all of x11vnc command line options:
 % x11vnc -opts      (see below for -help long descriptions)
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.1 lastmod: 2007-05-18
+x11vnc: allow VNC connections to real X11 displays. 0.9.1 lastmod: 2007-05-21
 
 x11vnc options:
   -display disp            -auth file               -N                     
@@ -11048,7 +11049,7 @@ libvncserver-tight-extension options:
 
 % x11vnc -help
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.1 lastmod: 2007-05-18
+x11vnc: allow VNC connections to real X11 displays. 0.9.1 lastmod: 2007-05-21
 
 (type "x11vnc -opts" to just list the options.)
 
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 77ea6de..da8ac5c 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -4076,10 +4076,11 @@ void xopen_display_fail_message(char *disp) {
 	fprintf(stderr, "\n");
 	fprintf(stderr, " * An X server (the one you wish to view) must"
 	    " be running before x11vnc is\n");
-	fprintf(stderr, "   started: x11vnc does not start the X server.\n");
+	fprintf(stderr, "   started: x11vnc does not start the X server.  (however, see the\n");
+	fprintf(stderr, "   recent -create option if that is what you really want).\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, " * You must use -display <disp>, -OR- set and"
-	    " export your DISPLAY\n");
+	    " export your $DISPLAY\n");
 	fprintf(stderr, "   environment variable to refer to the display of"
 	    " the desired X server.\n");
 	fprintf(stderr, " - Usually the display is simply \":0\" (in fact"
diff --git a/x11vnc/options.c b/x11vnc/options.c
index 2ccc750..5d052b6 100644
--- a/x11vnc/options.c
+++ b/x11vnc/options.c
@@ -206,9 +206,11 @@ int wireframe_local = 1;
 #ifdef NO_NCACHE
 #define NCACHE 0 
 #else
-#define NCACHE -12
+#define xxNCACHE -12
+#define NCACHE -1
 #endif
 #endif
+
 #ifdef MACOSX
 int ncache = 0;
 int ncache_pad = 24;
@@ -216,6 +218,7 @@ int ncache_pad = 24;
 int ncache = NCACHE;
 int ncache_pad = 0;
 #endif
+
 #ifndef NCACHE_XROOTPMAP
 #define NCACHE_XROOTPMAP 1
 #endif
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index 52d3be8..ab5336a 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -2,7 +2,7 @@
 .TH X11VNC "1" "May 2007" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.9.1, lastmod: 2007-05-18
+         version: 0.9.1, lastmod: 2007-05-21
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index cdf31ab..56ad395 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -1493,7 +1493,7 @@ void ncache_beta_tester_message(void) {
 
 char msg[] = 
 "\n"
-"***************************************************************************\n"
+"******************************************************************************\n"
 "\n"
 "Hello!  Exciting News!!\n"
 "\n"
@@ -1526,6 +1526,20 @@ char msg[] =
 "waiting for connections:\n"
 ;
 
+char msg2[] = 
+"\n"
+"******************************************************************************\n"
+"Have you tried the x11vnc '-ncache' VNC client-side pixel caching feature yet?\n"
+"\n"
+"The scheme stores pixel data offscreen on the VNC viewer side for faster\n"
+"retrieval.  It should work with any VNC viewer.  Try it by running:\n"
+"\n"
+"    x11vnc -ncache 10 ...\n"
+"\n"
+"more info: http://www.karlrunge.com/x11vnc/#faq-client-caching\n"
+"\n"
+;
+
 	if (raw_fb_str && !macosx_console) {
 		return;
 	}
@@ -1535,9 +1549,13 @@ char msg[] =
 #ifdef NO_NCACHE
 	return;
 #endif
-	
-	fprintf(stderr, msg, ncache);
 
+	if (ncache == 0) {
+		fprintf(stderr, msg2);
+		ncache0 = ncache = 0;
+	} else {
+		fprintf(stderr, msg, ncache);
+	}
 }
 
 #define	SHOW_NO_PASSWORD_WARNING \
@@ -1565,6 +1583,7 @@ int main(int argc, char* argv[]) {
 	int got_httpdir = 0, try_http = 0;
 	int orig_use_xdamage = use_xdamage;
 	XImage *fb0 = NULL;
+	int ncache_msg = 0;
 
 	/* used to pass args we do not know about to rfbGetScreen(): */
 	int argc_vnc_max = 1024;
@@ -3144,10 +3163,15 @@ int main(int argc, char* argv[]) {
 
 	if (ncache < 0) {
 		ncache_beta_tester = 1;
+		ncache_msg = 1;
+		if (ncache == -1) {
+			ncache = 0;
+		}
 		ncache = -ncache;
 		if (try_http || got_httpdir) {
 			/* JVM usually not set to handle all the memory */
 			ncache = 0;
+			ncache_msg = 0;
 		}
 	}
 
@@ -3920,7 +3944,7 @@ int main(int argc, char* argv[]) {
 	}
 	set_vnc_desktop_name();
 
-	if (ncache_beta_tester && ncache != 0) {
+	if (ncache_beta_tester && (ncache != 0 || ncache_msg)) {
 		ncache_beta_tester_message();
 	}
 
diff --git a/x11vnc/x11vnc_defs.c b/x11vnc/x11vnc_defs.c
index 2642ca0..6e6bf1f 100644
--- a/x11vnc/x11vnc_defs.c
+++ b/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.1 lastmod: 2007-05-18";
+char lastmod[] = "0.9.1 lastmod: 2007-05-21";
 
 /* X display info */