x11vnc: -proxy, -ssh options. ncache bug in -8to24, Selection "targets" bugfix.

prepare_x11vnc_dist.sh

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

x11vnc/8to24.c

@@ -1721,10 +1721,12 @@ if (db24 > 1) fprintf(stderr, "bpp8to24 %d %d %d %d %.4f\n", x1, y1, x2, y2, dno
 	call_count++;
 
 	/* clip to display just in case: */
-	x1 = nfix(x1, dpy_x);
-	y1 = nfix(y1, dpy_y);
-	x2 = nfix(x2, dpy_x+1);
-	y2 = nfix(y2, dpy_y+1);
+	if (!ncache) {
+		x1 = nfix(x1, dpy_x);
+		y1 = nfix(y1, dpy_y);
+		x2 = nfix(x2, dpy_x+1);
+		y2 = nfix(y2, dpy_y+1);
+	}
 
 	if (wireframe_in_progress) {
 		/*
@@ -1765,6 +1767,7 @@ if (db24 > 1) fprintf(stderr, "bpp8to24 %d %d %d %d %.4f\n", x1, y1, x2, y2, dno
 
 					idx = (int) (*uc);
 
+if (0 && line % 100 == 0 && j % 32 == 0) fprintf(stderr, "%d %d %u  x1=%d y1=%d\n", line, j, root_rgb[idx], x1, y1);
 #if 0
 					if (do_hibits) {
 						hi = idx << 24;

x11vnc/ChangeLog

+2007-10-27  Karl Runge <runge@karlrunge.com>
+	* x11vnc: fix ncache bug and others under -8to24, -ssh
+	  option, socks and other proxies in -proxy option.
+	  compiler warnings.  fix TARGETS selection request bug
+	  (java, konsole).
+
 2007-10-03  Karl Runge <runge@karlrunge.com>
 	* x11vnc: add xfce to createdisplay
 

x11vnc/cleanup.c

@@ -133,6 +133,10 @@ void clean_up_exit (int ret) {
 	if (avahi) {
 		avahi_cleanup();
 	}
+	if (ssh_pid > 0) {
+		kill(ssh_pid, SIGTERM);
+		ssh_pid = 0;
+	}
 
 #ifdef MACOSX
 	if (client_connect_file) {

x11vnc/keyboard.c

@@ -1755,7 +1755,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			if (khints && keysym < 0x100) {
 				/* low keysyms, ascii, only */
 				int ks = (int) keysym;
-				int ok = 1, lbest, l;
+				int ok = 1, lbest = 0, l;
 				short sbest = -1;
 				for (l=0; l < found; l++) {
 					if (kc_f[l] < 0x100) {
@@ -1820,7 +1820,7 @@ static void xkb_tweak_keyboard(rfbBool down, rfbKeySym keysym,
 			/* next just check for "best" one that is down */
 			if (Kc_f == -1 && anydown) {
 				int l;
-				int best = -1, lbest;
+				int best = -1, lbest = 0;
 				/*
 				 * If it is already down, that is
 				 * a great hint.  Use it.

x11vnc/macosxCGP.c

 /* -- macosxCGP.c -- */
 
+void macosxCGP_unused(void) {}
+
 #if (defined(__MACH__) && defined(__APPLE__))
 
 #include <ApplicationServices/ApplicationServices.h>

x11vnc/macosxCGS.c

@@ -5,6 +5,7 @@
  * and the other stuff, otherwise it does not work properly, mouse drags
  * will not work!!
  */
+void macosxCGS_unused(void) {}
 
 #if (defined(__MACH__) && defined(__APPLE__))
 

x11vnc/options.c

@@ -35,6 +35,8 @@ int https_port_redir = 0;
 char *ssl_verify = NULL;
 int ssl_initialized = 0;
 int ssl_timeout_secs = -1;
+char *ssh_str = NULL;
+pid_t ssh_pid = 0;
 int usepw = USEPW;
 char *blackout_str = NULL;	/* -blackout */
 int blackout_ptr = 0;
@@ -176,6 +178,7 @@ char *client_connect = NULL;	/* strings for -connect option */
 char *client_connect_file = NULL;
 int connect_or_exit = 0;
 int vnc_connect = 1;		/* -vncconnect option */
+char *connect_proxy = NULL;
 
 int show_cursor = 1;		/* show cursor shapes */
 int show_multiple_cursors = 0;	/* show X when on root background, etc */

x11vnc/options.h

@@ -35,6 +35,8 @@ extern int https_port_redir;
 extern char *ssl_verify;
 extern int ssl_initialized;
 extern int ssl_timeout_secs;
+extern char *ssh_str;
+extern pid_t ssh_pid;
 extern int usepw;
 extern char *blackout_str;
 extern int blackout_ptr;
@@ -148,6 +150,7 @@ extern char *client_connect;
 extern char *client_connect_file;
 extern int connect_or_exit;
 extern int vnc_connect;
+extern char *connect_proxy;
 
 extern int show_cursor;
 extern int show_multiple_cursors;

x11vnc/remote.c

@@ -1380,6 +1380,25 @@ char *process_remote_cmd(char *cmd, int stringonly) {
 		/* this is a reverse connection */
 		reverse_connect(p);
 
+	} else if (strstr(p, "proxy") == p) {
+		COLON_CHECK("proxy:")
+		if (query) {
+			snprintf(buf, bufn, "ans=%s%s%s", p, co,
+			    NONUL(connect_proxy));
+			goto qry;
+		}
+		p += strlen("proxy:");
+		if (connect_proxy) {
+			free(connect_proxy);
+			connect_proxy = NULL;
+		}
+		if (!strcmp(p, "") || !strcasecmp(p, "none")) {
+			rfbLog("remote_cmd: disabled -proxy\n");
+		} else {
+			connect_proxy = strdup(p);
+			rfbLog("remote_cmd: set -proxy %s\n", connect_proxy);
+		}
+
 	} else if (strstr(p, "allowonce") == p) {
 		COLON_CHECK("allowonce:")
 		if (query) {
@@ -2910,6 +2929,18 @@ char *process_remote_cmd(char *cmd, int stringonly) {
 		ncache_old_wm = 0;
 		rfbLog("remote_cmd: disabled -ncache_old_wm\n");
 
+	} else if (strstr(p, "ncache_pad") == p) {
+		int orig = ncache_pad, n;
+		COLON_CHECK("ncache_pad:")
+		if (query) {
+			snprintf(buf, bufn, "ans=%s%s%d", p, co, ncache_pad);
+			goto qry;
+		}
+		p += strlen("ncache_pad:");
+		n = atoi(p);
+
+		rfbLog("remote_cmd: setting ncache_pad %d to: %d\n", orig, n);
+
 	} else if (!strcmp(p, "ncache")) {
 		if (query) {
 			snprintf(buf, bufn, "ans=%s:%d", p, !!ncache);

x11vnc/screen.c

@@ -25,6 +25,7 @@
 #include "macosxCG.h"
 #include "avahi.h"
 #include "solid.h"
+#include "inet.h"
 
 #include <rfb/rfbclient.h>
 
@@ -1242,7 +1243,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 		unsigned int vals[1024], val;
 		int x, y, fd, w = 1024, h = 768;
 		if (strstr(n, "0x")) {
-			if (sscanf(n, "0x%lx", &val) != 1) {
+			if (sscanf(n, "0x%x", &val) != 1) {
 				val = 0;
 			}
 		}

x11vnc/selection.c

@@ -62,6 +62,7 @@ void selection_request(XEvent *ev, char *type) {
 	char *str;
 	unsigned int length;
 	unsigned char *data;
+	static Atom xa_targets = None;
 # ifndef XA_LENGTH
 	unsigned long XA_LENGTH;
 # endif
@@ -103,34 +104,69 @@ void selection_request(XEvent *ev, char *type) {
 			req_event->target, req_event->property);
 	}
 
+	if (xa_targets == None) {
+		xa_targets = XInternAtom(dpy, "TARGETS", False);
+	}
+
 	/* the window may have gone away, so trap errors */
 	trapped_xerror = 0;
 	old_handler = XSetErrorHandler(trap_xerror);
 
 	if (ev->xselectionrequest.target == XA_LENGTH) {
 		/* length request */
+		int ret;
+		long llength = (long) length;
 
-		XChangeProperty(ev->xselectionrequest.display,
+		ret = XChangeProperty(ev->xselectionrequest.display,
 		    ev->xselectionrequest.requestor,
 		    ev->xselectionrequest.property,
 		    ev->xselectionrequest.target, 32, PropModeReplace,
-		    (unsigned char *) &length, sizeof(unsigned int));
+		    (unsigned char *) &llength, 1);	/* had sizeof(unsigned int) = 4 before... */
+		if (debug_sel) {
+			rfbLog("LENGTH: XChangeProperty() -> %d\n", ret);
+		}
+
+	} else if (xa_targets != None && ev->xselectionrequest.target == xa_targets) {
+		/* targets request */
+		int ret;
+		Atom targets[2];
+		targets[0] = (Atom) xa_targets;
+		targets[1] = (Atom) XA_STRING;
+
+		data = (unsigned char *)str;
+
+		ret = XChangeProperty(ev->xselectionrequest.display,
+		    ev->xselectionrequest.requestor,
+		    ev->xselectionrequest.property,
+		    ev->xselectionrequest.target, 32, PropModeReplace,
+		    (unsigned char *) targets, 2);
+		if (debug_sel) {
+			rfbLog("TARGETS: XChangeProperty() -> %d -- sz1: %d  sz2: %d\n",
+			    ret, sizeof(targets[0]), sizeof(targets)/sizeof(targets[0]));
+		}
 
 	} else {
 		/* data request */
+		int ret;
 
 		data = (unsigned char *)str;
 
-		XChangeProperty(ev->xselectionrequest.display,
+		ret = XChangeProperty(ev->xselectionrequest.display,
 		    ev->xselectionrequest.requestor,
 		    ev->xselectionrequest.property,
 		    ev->xselectionrequest.target, 8, PropModeReplace,
 		    data, length);
+		if (debug_sel) {
+			rfbLog("DATA: XChangeProperty() -> %d\n", ret);
+		}
 	}
 
 	if (! trapped_xerror) {
-		XSendEvent(req_event->display, req_event->requestor, False, 0,
+		int ret = XSendEvent(req_event->display, req_event->requestor, False, 0,
 		    (XEvent *)&notify_event);
+		if (debug_sel) {
+			rfbLog("XSendEvent() -> %d\n", ret);
+		}
 	} 
 	if (trapped_xerror) {
 		rfbLog("selection_request: ignored XError while sending "

x11vnc/tkx11vnc

@@ -382,8 +382,10 @@ Tuning
 	ncache_cr
 	ncache_no_moveraise
 	ncache_no_dtchange
+	ncache_old_wm
 	ncache_no_rootpixmap
 	ncache_keep_anims
+	ncache_pad:
 	=RA ncache_reset_rootpixmap
 	=GAL LOFF
 	--

x11vnc/tkx11vnc.h

@@ -393,8 +393,10 @@ char gui_code[] = "";
 "	ncache_cr\n"
 "	ncache_no_moveraise\n"
 "	ncache_no_dtchange\n"
+"	ncache_old_wm\n"
 "	ncache_no_rootpixmap\n"
 "	ncache_keep_anims\n"
+"	ncache_pad:\n"
 "	=RA ncache_reset_rootpixmap\n"
 "	=GAL LOFF\n"
 "	--\n"

x11vnc/user.c

@@ -1314,6 +1314,7 @@ void user_supplied_opts(char *opts) {
 
 static void vnc_redirect_timeout (int sig) {
 	write(2, "timeout: no clients connected.\n", 31);
+	if (sig) {};
 	exit(0);
 }
 
@@ -1513,6 +1514,10 @@ int wait_for_client(int *argc, char** argv, int http) {
 
 	initialize_signals();
 
+	if (ssh_str != NULL) {
+		ssh_remote_tunnel(ssh_str, screen->port);
+	}
+
 	if (! raw_fb) {
 		chg_raw_fb = 1;
 		/* kludge to get RAWFB_RET with dpy == NULL guards */
@@ -1600,7 +1605,6 @@ int wait_for_client(int *argc, char** argv, int http) {
 				accept_openssl(OPENSSL_INETD, -1);
 			}
 		} else {
-			int gotone = 0;
 			if (first_conn_timeout) {
 				if (first_conn_timeout < 0) {
 					first_conn_timeout = -first_conn_timeout;

x11vnc/userinput.c

@@ -151,6 +151,14 @@ int get_wm_frame_pos(int *px, int *py, int *x, int *y, int *w, int *h,
 	*w = attr.width;
 	*h = attr.height;
 
+#if 0
+	/* more accurate, but the animation is bogus anyway */
+	if (attr.border_width > 0) {
+		*w += 2 * attr.border_width;
+		*h += 2 * attr.border_width;
+	}
+#endif
+
 	if (win != NULL) {
 		*win = descend_pointer(5, c, NULL, 0);
 	}
@@ -871,6 +879,7 @@ static void draw_box(int x, int y, int w, int h, int restore) {
 			memcpy(dst, src, (x1-x0)*pixelsize);
 		}
 		if (y_min >= 0) {
+if (0) fprintf(stderr, "Mark-1 %d %d %d %d\n", x0, y_min, x1, y_max+1);
 			mark_rect_as_modified(x0, y_min, x1, y_max+1, 0);
 		}
 		save[i]->saved = 0;
@@ -1012,6 +1021,7 @@ if (0) fprintf(stderr, "  DrawBox: %04dx%04d+%04d+%04d B=%d rest=%d lw=%d %.4f\n
 		}
 		/* mark it for sending: */
 		if (save[i]->saved) {
+if (0) fprintf(stderr, "Mark-2 %d %d %d %d\n", x0, y_min, x1, y_max+1);
 			mark_rect_as_modified(x0, y_min, x1, y_max+1, 0);
 		}
 	}
@@ -1859,9 +1869,19 @@ if (0 || debug_scroll > 1) fprintf(stderr, "<<<-rfbDoCopyRect req: %d mod: %d cp
 				src = main_fb + (y1-dy)*stride + (x1-dx)*Bpp;
 
 			} else if (c == 1) {
-				if (! cmap8to24_fb || cmap8to24_fb == rfb_fb) {
+				if (!cmap8to24 || !cmap8to24_fb) {
 					continue;
 				}
+				if (cmap8to24_fb == rfb_fb) {
+					if (mode == DCR_FBOnly) {
+						;
+					} else if (mode == DCR_Direct) {
+						;
+					} else if (mode == DCR_Normal) {
+						continue;
+					}
+				}
+if (0) fprintf(stderr, "copyrect: cmap8to24_fb: mode=%d\n", mode);
 				if (cmap8to24 && depth == 8) {
 					Bpp = 4 * Bpp0;
 					stride = 4 * stride0;
@@ -3257,6 +3277,7 @@ if (db2) fprintf(stderr, "sw: %d/%lx\n", k, swin);
 					stack_list[k].y = attr.y;
 					stack_list[k].width = attr.width;
 					stack_list[k].height = attr.height;
+					stack_list[k].border_width = attr.border_width;
 					stack_list[k].depth = attr.depth;
 					stack_list[k].class = attr.class;
 					stack_list[k].backing_store =
@@ -3276,6 +3297,7 @@ if (db2) fprintf(stderr, "sw: %d/%lx\n", k, swin);
 			attr.depth  = stack_list[k].depth;
 			attr.width  = stack_list[k].width;
 			attr.height = stack_list[k].height;
+			attr.border_width = stack_list[k].border_width;
 			attr.map_state = stack_list[k].map_state;
 
 			if (attr.map_state != IsViewable) {
@@ -4981,9 +5003,9 @@ if ((ncache || db) && ncdb) fprintf(stderr, "sent_copyrect: %d - obs: %d  frame:
 	rfbPE(1000);
 	wireframe_in_progress = 0;
 
-	if (0) {
-	/* No longer needed.  see draw_box() */
-	    if (frame_changed && cmap8to24 && multivis_count) {
+	if (1) {
+	/* In principle no longer needed...  see draw_box() */
+	    if (frame_changed && cmap8to24 /* && multivis_count */) {
 		/* handle -8to24 kludge, mark area and check 8bpp... */
 		int x1, x2, y1, y2, f = 16;
 		x1 = nmin(box_x, orig_x) - f;
@@ -4994,8 +5016,16 @@ if ((ncache || db) && ncdb) fprintf(stderr, "sent_copyrect: %d - obs: %d  frame:
 		x2 = nfix(x2, dpy_x+1);
 		y1 = nfix(y1, dpy_y);
 		y2 = nfix(y2, dpy_y+1);
-		check_for_multivis();
-		mark_rect_as_modified(x1, y1, x2, y2, 0);
+		if (0) {
+			check_for_multivis();
+			mark_rect_as_modified(x1, y1, x2, y2, 0);
+		} else {
+			if (1) {
+				bpp8to24(x1, y1, x2, y2);
+			} else {
+				bpp8to24(0, 0, dpy_x, dpy_y);
+			}
+		}
 	    }
 	}
 
@@ -6011,9 +6041,16 @@ int lookup_old_stack_index(int ic) {
 	cache_list[k].y = attr.y;  \
 	cache_list[k].width = attr.width;  \
 	cache_list[k].height = attr.height;  \
+	cache_list[k].border_width = attr.border_width;  \
 	cache_list[k].map_state = attr.map_state; \
 	cache_list[k].time = dnow();
 
+#if 0
+	cache_list[k].width = attr.width   + 2*attr.border_width;  \
+	cache_list[k].height = attr.height + 2*attr.border_width;  \
+
+#endif
+
 #define CLEAR(k) \
 	if (0) fprintf(stderr, "CLEAR(%d)\n", k); \
 	cache_list[k].bs_x = -1;  \
@@ -8119,7 +8156,9 @@ void set_ncache_xrootpmap(void) {
 			dst += main_bytes_per_line;
 		}
 		XDestroyImage(image);
+		X_UNLOCK;
 		scale_mark_xrootpmap();
+		X_LOCK;
 	} else {
 		int yn = (ncache+1) * dpy_y;
 		zero_fb(0, yn, dpy_x, yn + dpy_y);

x11vnc/util.c

@@ -405,7 +405,7 @@ double rfac(void) {
 }
 
 void check_allinput_rate(void) {
-	static double last_all_input_check = 0.0, last_all_input_start = 0.0;
+	static double last_all_input_check = 0.0;
 	static int set = 0;
 	if (! set) {
 		set = 1;

x11vnc/win_utils.c

@@ -315,6 +315,7 @@ void update_stack_list(void) {
 			stack_list[k].y = attr.y;
 			stack_list[k].width = attr.width;
 			stack_list[k].height = attr.height;
+			stack_list[k].border_width = attr.border_width;
 			stack_list[k].depth = attr.depth;
 			stack_list[k].class = attr.class;
 			stack_list[k].backing_store = attr.backing_store;

x11vnc/winattr_t.h

@@ -9,6 +9,7 @@ typedef struct winattr {
 	int valid;
 	int x, y;
 	int width, height;
+	int border_width;
 	int depth;
 	int class;
 	int backing_store;

x11vnc/x11vnc.c

@@ -398,6 +398,7 @@ static int tsdo_timeout_flag;
 
 static void tsdo_timeout (int sig) {
 	tsdo_timeout_flag = 1;
+	if (sig) {};
 }
 
 #define TASKMAX 32
@@ -474,6 +475,7 @@ int tsdo(int port, int lsock, int *conn) {
 		raw_xfer(rsock, csock, csock);
 		exit(0);
 	}
+	return 0;
 }
 
 void set_redir_properties(void);
@@ -570,7 +572,7 @@ void terminal_services(char *list) {
 
 	for (i=0; i<n; i++) {
 		atom[i] = XInternAtom(dpy, tag[i], False);
-		if (db) fprintf(stderr, "tag: %s atom: %d\n", tag[i], atom[i]);
+		if (db) fprintf(stderr, "tag: %s atom: %d\n", tag[i], (int) atom[i]);
 		if (atom[i] == None) {
 			continue;
 		}
@@ -897,7 +899,7 @@ void check_redir_services(void) {
 	Atom a;
 	char prop[513];
 	time_t tsd_last;
-	int i, restart = 0;
+	int restart = 0;
 	pid_t pid = 0;
 
 	if (! dpy) {
@@ -962,6 +964,130 @@ void check_redir_services(void) {
 #endif
 }
 
+void ssh_remote_tunnel(char *instr, int lport) {
+	char *p, *q, *cmd, *ssh;
+	char *s = strdup(instr);
+	int sleep = 300, disp = 0, sport = 0;
+	int rc, len, rport;
+
+	/* user@host:port:disp+secs */
+
+	/* +sleep */
+	q = strrchr(s, '+');
+	if (q) {
+		sleep = atoi(q+1);
+		if (sleep <= 0) {
+			sleep = 1;
+		}
+		*q = '\0';
+	}
+	/* :disp */
+	q = strrchr(s, ':');
+	if (q) {
+		disp = atoi(q+1);
+		*q = '\0';
+	}
+	
+	/* :sshport */
+	q = strrchr(s, ':');
+	if (q) {
+		sport = atoi(q+1);
+		*q = '\0';
+	}
+
+	if (getenv("SSH")) {
+		ssh = getenv("SSH");
+	} else {
+		ssh = "ssh";
+	}
+
+	len = 0;
+	len += strlen(ssh) + strlen(s) + 500;
+	cmd = (char *) malloc(len);
+
+	if (disp >= 0 && disp <= 200) {
+		rport = disp + 5900;
+	} else if (disp < 0) {
+		rport = -disp;
+	} else {
+		rport = disp;
+	}
+
+	if (sport > 0) {
+		sprintf(cmd, "%s -f -p %d -R '%d:localhost:%d' '%s' 'sleep %d'", ssh, sport, rport, lport, s, sleep);
+	} else {
+		sprintf(cmd, "%s -f       -R '%d:localhost:%d' '%s' 'sleep %d'", ssh,        rport, lport, s, sleep);
+	}
+
+	if (no_external_cmds || !cmd_ok("ssh")) {
+		rfbLogEnable(1);
+		rfbLog("cannot run external commands in -nocmds mode:\n");
+		rfbLog("   \"%s\"\n", cmd);
+		rfbLog("   exiting.\n");
+		clean_up_exit(1);
+	}
+
+	close_exec_fds();
+	fprintf(stderr, "\n");
+	rfbLog("running: %s\n", cmd);
+	rc = system(cmd);
+
+	if (rc != 0) {
+		free(cmd);
+		free(s);
+		rfbLog("ssh remote listen failed.\n");
+		clean_up_exit(1);
+	}
+
+	if (1) {
+		FILE *pipe;
+		int mypid = (int) getpid();
+		int bestpid = -1;
+		int best = -1;
+		char line[1024];
+		char *ps = "ps -ef";
+		/* not portable... but it is really good to terminate the ssh when done. */
+		/* ps -ef | egrep 'ssh2.*-R.*5907:localhost:5900.*runge@celias.lbl.gov.*sleep 300' | grep -v grep | awk '{print $2}' */
+		if (strstr(UT.sysname, "Linux")) {
+			ps = "ps wwwwwaux";
+		} else if (strstr(UT.sysname, "BSD")) {
+			ps = "ps wwwwwaux";
+		}
+		sprintf(cmd, "env COLUMNS=256 %s | egrep '%s.*-R *%d:localhost:%d.*%s.*sleep *%d' | grep -v grep | awk '{print $2}'", ps, ssh, rport, lport, s, sleep);
+		pipe = popen(cmd, "r");
+		if (pipe) {
+			while (fgets(line, 1024, pipe) != NULL) {
+				int p = atoi(line);
+				if (p > 0) {
+					int score;
+					if (p > mypid) 	{
+						score = p - mypid;
+					} else {
+						score = p - mypid + 32768;
+						if (score < 0) {
+							score = 32768;
+						}
+					}
+					if (best < 0 || score < best) {
+						best = score;
+						bestpid = p;
+					}
+				}
+			}
+			pclose(pipe);
+		}
+
+		if (bestpid != -1) {
+			ssh_pid = (pid_t) bestpid;
+			rfbLog("guessed ssh pid=%d, will terminate it on exit.\n", bestpid);
+		}
+	}
+
+	free(cmd);
+	free(s);
+
+}
+
 void check_filexfer(void) {
 	static time_t last_check = 0;
 	rfbClientIteratorPtr iter;
@@ -2463,6 +2589,9 @@ int main(int argc, char* argv[]) {
 			if (!strcmp(arg, "-connect_or_exit")) {
 				connect_or_exit = 1;
 			}
+		} else if (!strcmp(arg, "-proxy")) {
+			CHECK_ARGC
+			connect_proxy = strdup(argv[++i]);
 		} else if (!strcmp(arg, "-vncconnect")) {
 			vnc_connect = 1;
 		} else if (!strcmp(arg, "-novncconnect")) {
@@ -2672,6 +2801,9 @@ int main(int argc, char* argv[]) {
 #endif
 		} else if (!strcmp(arg, "-nopw")) {
 			nopw = 1;
+		} else if (!strcmp(arg, "-ssh")) {
+			CHECK_ARGC
+			ssh_str = strdup(argv[++i]);
 		} else if (!strcmp(arg, "-usepw")) {
 			usepw = 1;
 		} else if (!strcmp(arg, "-storepasswd")) {
@@ -3670,7 +3802,7 @@ int main(int argc, char* argv[]) {
 				if (! s) s = getenv("SSH_CLIENT");
 				if (! s) s = "SSH_CONNECTION";
 				fprintf(stderr, "\n");
-				rfbLog("Skipping -ssl/-stunnel contraint in"
+				rfbLog("Skipping -ssl/-stunnel constraint in"
 				    " -unixpw\n");
 				rfbLog("mode, assuming your SSH encryption"
 				    " is: %s\n", s);
@@ -4568,6 +4700,9 @@ if (0) fprintf(stderr, "XA: %s\n", getenv("XAUTHORITY"));
 		if (try_http && ! got_httpdir && check_httpdir()) {
 			http_connections(1);
 		}
+		if (ssh_str != NULL) {
+			ssh_remote_tunnel(ssh_str, screen->port);
+		}
 	}
 
 	initialize_tiles();

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.3 lastmod: 2007-09-30";
+char lastmod[] = "0.9.4 lastmod: 2007-10-27";
 
 /* X display info */
 

x11vnc/xrecord.c

@@ -633,6 +633,7 @@ if (db > 1) fprintf(stderr, "record_CA-%d\n", k++);
 				scr_attr_cache[i].y = attr.y;
 				scr_attr_cache[i].width = attr.width;
 				scr_attr_cache[i].height = attr.height;
+				scr_attr_cache[i].border_width = attr.border_width;
 				scr_attr_cache[i].depth = attr.depth;
 				scr_attr_cache[i].class = attr.class;
 				scr_attr_cache[i].backing_store =