update versions for next rel. add some more shortcuts to user:opts

configure.ac

 # Process this file with autoconf to produce a configure script.
-AC_INIT(LibVNCServer, 0.8.2, http://sourceforge.net/projects/libvncserver)
-AM_INIT_AUTOMAKE(LibVNCServer, 0.8.2)
+AC_INIT(LibVNCServer, 0.9pre, http://sourceforge.net/projects/libvncserver)
+AM_INIT_AUTOMAKE(LibVNCServer, 0.9pre)
 AM_CONFIG_HEADER(rfbconfig.h)
 AX_PREFIX_CONFIG_H([rfb/rfbconfig.h])
 

prepare_x11vnc_dist.sh

 #!/bin/bash
 
-VERSION="0.8.2"
+VERSION="0.8.3"
 
 cd "$(dirname "$0")"
 

x11vnc/help.c

@@ -620,17 +620,20 @@ void print_help(int mode) {
 "                       above command is run as the user who just authenticated\n"
 "                       via the login and password prompt.\n"
 "\n"
-"                       Also in the case of -unixpw, the user logging in can\n"
-"                       place a colon at the end of his username and supply\n"
-"                       a few options: scale=, scale_cursor= (or sc=), solid,\n"
-"                       id=, clear_mods (or cm), clear_keys (or ck), repeat, or\n"
-"                       speeds= separated by commas if there is more than one.\n"
+"                       Also in the case of -unixpw, the user logging in\n"
+"                       can place a colon at the end of his username and\n"
+"                       supply a few options: scale=, scale_cursor= (or sc=),\n"
+"                       solid (or so), id=, clear_mods (or cm), clear_keys\n"
+"                       (or ck), repeat, speeds= (or sp=), or readtimeout=\n"
+"                       (or rd=) separated by commas if there is more than one.\n"
 "                       After the user logs in successfully, these options will\n"
 "                       be applied to the VNC screen.  For example,\n"
 "\n"
-"                          login: fred:scale=3/4,repeat\n"
+"                          login: fred:scale=3/4,sc=1,repeat\n"
 "                          Password: ...\n"
 "\n"
+"                          login: runge:sp=modem,rd=120,solid=root:\n"
+"\n"
 "                       for convenience m/n implies scale= e.g. fred:3/4\n"
 "                       To disable this set the environment variable\n"
 "                       X11VNC_NO_UNIXPW_OPTS=1.  To set any other options,\n"

x11vnc/user.c

@@ -1038,8 +1038,9 @@ void user_supplied_opts(char *opts) {
 	char *p, *str;
 	char *allow[] = {
 		"skip-display", "skip-auth", "skip-shared",
-		"scale", "scale_cursor", "sc", "solid", "id",
-		"clear_mods", "cm", "clear_keys", "ck", "repeat", "speeds",
+		"scale", "scale_cursor", "sc", "solid", "so", "id",
+		"clear_mods", "cm", "clear_keys", "ck", "repeat",
+		"speeds", "sp", "readtimeout", "rd",
 		NULL
 	};
 
@@ -1083,22 +1084,26 @@ void user_supplied_opts(char *opts) {
 			} else if (strstr(p, "scale=") == p) {
 				if (scale_str) free(scale_str);
 				scale_str = strdup(p + strlen("scale="));
-			} else if (strstr(p, "scale_cursor=") == p) {
+			} else if (strstr(p, "scale_cursor=") == p ||
+			    strstr(p, "sc=") == p) {
 				if (scale_cursor_str) free(scale_cursor_str);
-				scale_cursor_str = strdup(p +
-				    strlen("scale_cursor="));
-			} else if (strstr(p, "sc=") == p) {
-				if (scale_cursor_str) free(scale_cursor_str);
-				scale_cursor_str = strdup(p + strlen("sc="));
-			} else if (!strcmp(p, "solid")) {
+				q = strchr(p, '=') + 1;
+				scale_cursor_str = strdup(q);
+			} else if (!strcmp(p, "solid") || !strcmp(p, "so")) {
 				use_solid_bg = 1;
 				if (!solid_str) {
 					solid_str = strdup(solid_default);
 				}
-			} else if (strstr(p, "solid=") == p) {
+			} else if (strstr(p, "solid=") == p ||
+			    strstr(p, "so=") == p) {
 				use_solid_bg = 1;
 				if (solid_str) free(solid_str);
-				solid_str = strdup(p + strlen("solid="));
+				q = strchr(p, '=') + 1;
+				if (!strcmp(q, "R")) {
+					solid_str = strdup("root:");
+				} else {
+					solid_str = strdup(q);
+				}
 			} else if (strstr(p, "id=") == p) {
 				unsigned long win;
 				q = p + strlen("id=");
@@ -1115,9 +1120,11 @@ void user_supplied_opts(char *opts) {
 				clear_mods = 2;
 			} else if (!strcmp(p, "repeat")) {
 				no_autorepeat = 0;
-			} else if (strstr(p, "speeds=") == p) {
+			} else if (strstr(p, "speeds=") == p ||
+			    strstr(p, "sp=") == p) {
 				if (speeds_str) free(speeds_str);
-				speeds_str = strdup(p + strlen("speeds="));
+				q = strchr(p, '=') + 1;
+				speeds_str = strdup(q);
 				q = speeds_str;
 				while (*q != '\0') {
 					if (*q == '-') {
@@ -1125,7 +1132,13 @@ void user_supplied_opts(char *opts) {
 					}
 					q++;
 				}
+			} else if (strstr(p, "readtimeout=") == p ||
+			    strstr(p, "rd=") == p) {
+				q = strchr(p, '=') + 1;
+				rfbMaxClientWait = atoi(q) * 1000;
 			}
+		} else {
+			rfbLog("skipping option: %s\n", p);
 		}
 		p = strtok(NULL, ",");
 	}

x11vnc/x11vnc.h

@@ -119,7 +119,6 @@
 #endif
 
 #define noREL8x
-#define REL8x
 
 /*
  * Beginning of support for small binary footprint build for embedded
@@ -130,7 +129,7 @@
  * should be done too (manually for now).
  *
  * If there is interest more of the bloat can be removed...  Currently
- * these shrink the binary from 500K to about 270K.
+ * these shrink the binary from 1100K to about 600K.
  */
 #ifndef SMALL_FOOTPRINT
 #define SMALL_FOOTPRINT 0

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.8.2 lastmod: 2006-07-12";
+char lastmod[] = "0.8.3 lastmod: 2006-07-15";
 
 /* X display info */