x11vnc: small tweaks to Xdummy, rx11vnc*. Apply SMALL_FOOTPRINT to -appshare text. Copyright year change.

4 files changed, 10 insertions, 3 deletions

diff --git a/x11vnc/misc/README b/x11vnc/misc/README
index 713c95b..abb60f6 100644
--- a/x11vnc/misc/README
+++ b/x11vnc/misc/README
@@ -31,3 +31,5 @@ Misc. scripts:
    shm_clear	list or remove orphaned shm slots from hard x11vnc crashes.
    x11vnc_loop	kludge to run in bg attaching x11vnc to X login.  Better to
 		use Xsetup mechanism.
+   Xdummy       An LD_PRELOAD kludge to run the Xorg "dummy" device driver
+		like Xvfb.
diff --git a/x11vnc/misc/Xdummy b/x11vnc/misc/Xdummy
index 452eb4d..03fc44b 100755
--- a/x11vnc/misc/Xdummy
+++ b/x11vnc/misc/Xdummy
@@ -196,6 +196,9 @@ Options:
 			config file.  Use this to have a smaller geometry
 			than the one in the system config file.
 
+			The option -geometry can be used instead of -geom;
+			x11vnc calls Xdummy and Xvfb this way.
+
 	-depth n	Use pixel color depth n (e.g. 8, 16, or 24). This
 			makes sure the X config file has a Screen.Display
 			subsection of this depth.  Note this option is
@@ -432,7 +435,9 @@ do
 	"-uid") XDUMMY_UID="$2"; shift
 		export XDUMMY_UID
                 ;;
-	"-geom") geom="$2"; shift
+	"-geom")     geom="$2"; shift
+                ;;
+	"-geometry") geom="$2"; shift
                 ;;
 	"-depth") depth="$2"; args="$args -depth $2";
 		  shift
diff --git a/x11vnc/misc/rx11vnc b/x11vnc/misc/rx11vnc
index 27e6d06..cf9c78b 100755
--- a/x11vnc/misc/rx11vnc
+++ b/x11vnc/misc/rx11vnc
@@ -94,7 +94,7 @@ if [ $tunnel ]; then
 	# before we can connect.
 	#
 	time=15
-	$rsh -f $redir $host "$cmd $disp; echo END; sleep $time" > $tmp
+	$rsh -t -f $redir $host "$cmd $disp; echo END; sleep $time" > $tmp
 
 	i=0
 	while [ $i -lt $time ]
diff --git a/x11vnc/misc/rx11vnc.pl b/x11vnc/misc/rx11vnc.pl
index cf4b437..e6ab0a1 100755
--- a/x11vnc/misc/rx11vnc.pl
+++ b/x11vnc/misc/rx11vnc.pl
@@ -141,7 +141,7 @@ $cmd = $x11vnc_cmd;
 $cmd =~ s/%DISP/$disp/;
 
 # This is the ssh cmd for the local side (this machine):
-$ssh_cmd = "ssh -f $remote_user $redir $host '$cmd; echo END; sleep $sleep_time'";
+$ssh_cmd = "ssh -t -f $remote_user $redir $host '$cmd; echo END; sleep $sleep_time'";
 $ssh_cmd =~ s/  / /g;
 print STDERR "running ssh command:\n\n$ssh_cmd\n\n";