Synchronize ssvnc source, etc. Nearly the 1.0.24 release...

2 files changed, 47 insertions, 6 deletions

diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1 b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
index b279595..fa506ca 100644
--- a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
+++ b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file LICENCE.TXT that comes with the
 .\" TightVNC distribution.
 .\"
-.TH ssvnc 1 "December 2008" "" "SSVNC"
+.TH ssvnc 1 "September 2009" "" "SSVNC"
 .SH NAME
 ssvnc \- a GUI wrapper for SSL and SSH VNC connections.
 .SH SYNOPSIS
@@ -67,9 +67,15 @@ The related commands \fBsshvnc\fR and \fBtsvnc\fR start up the GUI in
 simplified modes: SSH Only Mode, and Terminal Services Mode, respectively.
 See below and the application Help for more information on the modes.
 
+You can also place certain settings in your ~/.ssvncrc, see the
+SSVNC Help panel ('Tips') for more info.
+
 There are also some command line options described as follows.
 .SH OPTIONS
 .TP
+\fB\-help\fR, \fB\-h\fR
+Prints out to the terminal a brief description and the options.
+.TP
 \fB\--help\fR
 Starts up the GUI as though the 'Help' button was pressed to show the
 main Help panel.
@@ -180,9 +186,31 @@ You can put a few global parameters (e.g. mode=sshvnc) in your
 \fB$HOME/.ssvncrc\fR file (\fBssvnc_rc\fR on Windows); see the
 application Help for more information.
 
+.SH FONTS
+
+The following is from Tip 18 in the Help panel.
+
+Fonts: To change the tk fonts, set these environment variables
+before starting up ssvnc: SSVNC_FONT_DEFAULT and SSVNC_FONT_FIXED.
+For example:
+
+% env SSVNC_FONT_DEFAULT='helvetica -20 bold' ssvnc
+
+% env SSVNC_FONT_FIXED='courier -14' ssvnc
+
+or set both of them at once.
+
+To acheive the same effect, you can also
+set parameters in your ~/.ssvncrc file, for example:
+
+font_default=helvetica -20 bold
+
+font_fixed=courier -14
+
 .SH SEE ALSO
 \fBssvncviewer\fB(1), \fBvncviewer\fR(1), \fBstunnel\fR(8), \fBssh\fR(1), \fBx11vnc\fR(1), \fBvncserver\fR(1) 
 http://www.karlrunge.com/x11vnc http://www.karlrunge.com/x11vnc/ssvnc.html
 .SH AUTHORS
 Karl J. Runge <runge@karlrunge.com> wrote the SSVNC gui (tcl/tk) and
-associated wrapper scripts.
+associated wrapper scripts, and added features to the unix vncviewer
+source code. 
diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1 b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1
index 10698f5..78575ef 100644
--- a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1
+++ b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1
@@ -11,7 +11,7 @@
 .\" License as specified in the file LICENCE.TXT that comes with the
 .\" TightVNC distribution.
 .\"
-.TH ssvncviewer 1 "June 2009" "" "SSVNC"
+.TH ssvncviewer 1 "September 2009" "" "SSVNC"
 .SH NAME
 ssvncviewer \- an X viewer client for VNC
 .SH SYNOPSIS
@@ -225,6 +225,18 @@ time tries to play it safe by not allowing anyone on
 the network to put (many) desktops on your screen over
 a long window of time. Use -multilisten for no limit.
 .TP
+\fB\-acceptpopup\fR
+In \fB\-listen\fR (reverse connection listening) mode when
+a reverse VNC connection comes in show a popup asking
+whether to Accept or Reject the connection.  The IP
+address of the connecting host is shown.  Same as
+setting the env. var. SSVNC_ACCEPT_POPUP=1.
+.TP
+\fB\-acceptpopupsc\fR
+As in \fB\-acceptpopup\fR except assume UltraVNC Single
+Click (SC) server.  Retrieve User and ComputerName
+info from UltraVNC Server and display in the Popup.
+.TP
 \fB\-use64\fR
 In \fB\-bgr233\fR mode, use 64 colors instead of 256.
 .TP
@@ -422,7 +434,7 @@ the username and password.
 
 IMPORTANT NOTE: The UltraVNC MS-Logon Diffie-Hellman
 exchange is very weak and can be brute forced to recover
-your username and password in a few hours or seconds of CPU
+your username and password in a few seconds of CPU
 time.  To be safe, be sure to use an additional encrypted
 tunnel (e.g. SSL or SSH) for the entire VNC session.
 .TP
@@ -765,7 +777,8 @@ remote TCP port number.
 .SH AUTHORS
 Original VNC was developed in AT&T Laboratories Cambridge. TightVNC
 additions was implemented by Constantin Kaplinsky. Many other people
-participated in development, testing and support.
+participated in development, testing and support.  Karl J. Runge 
+added all of the SSVNC related features and improvements.
 
 \fBMan page authors:\fR
 .br
@@ -777,4 +790,4 @@ Tim Waugh <twaugh@redhat.com>,
 .br
 Constantin Kaplinsky <const@ce.cctpu.edu.ru>
 .br
-Karl Runge <runge@karlrunge.com>
+Karl J. Runge <runge@karlrunge.com>