x11vnc: Fix problems in --without-x builds. Fix crash

with -QD query for dbus info.  Adjust window size for
small screens in -gui.  Improve F1 help for xdm, etc.
include ssvnc 1.0.25 source.

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 fa506ca..46bea26 100644
--- a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
+++ b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
@@ -2,13 +2,13 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for the SSVNC vncviewer
 .\"
-.\" Copyright (C) 2006-2008 Karl J. Runge <runge@karlrunge.com>
+.\" Copyright (C) 2006-2009 Karl J. Runge <runge@karlrunge.com>
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file LICENCE.TXT that comes with the
 .\" TightVNC distribution.
 .\"
-.TH ssvnc 1 "September 2009" "" "SSVNC"
+.TH ssvnc 1 "December 2009" "" "SSVNC"
 .SH NAME
 ssvnc \- a GUI wrapper for SSL and SSH VNC connections.
 .SH SYNOPSIS
@@ -24,6 +24,10 @@ ssvnc \- a GUI wrapper for SSL and SSH VNC connections.
 .RI [\| options \|]\ [\| host-or-profile \]
 .br
 .B ssvnc
+.IR \-cmd
+.RI [\| ssvnc_cmd-args \|]
+.br
+.B ssvnc
 .IR \--help
 .br
 .SH DESCRIPTION
@@ -47,10 +51,10 @@ Or supply user@hostname:display and click on the "Use SSH" option, then
 press the "Connect" button to connect to the server via an SSH tunnel.
 E.g. "fred@far-away.east:0".
 
-As an easter egg, we note it is also possible to disable the use of SSL/SSH 
+Note it is also possible to disable the use of SSL/SSH 
 encryption tunnels by using a vnc:// or Vnc:// prefix before
 host:display.  Shift+Ctrl-E is a short-cut to add/remove it.
-See also the \fB-noenc\fR option below.
+See also the \fB-noenc\fR option below for the 'No Encryption' button.
 
 Normally you do not specify any command line options.  You simply
 run \fBssvnc\fR and use the GUI that starts up.
@@ -70,6 +74,12 @@ 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.
 
+The \fB-cmd\fR option does not start the GUI, it runs the command
+line utility \fBssvnc_cmd\fR directly with the given arguments.
+\fBssvnc_cmd\fR can launch the viewer directly (\fB-viewer ...\fR)
+or, by default, the \fBss_vncviewer\fR SSL/SSH tunnel wrapper script.
+See its help output for more information.
+
 There are also some command line options described as follows.
 .SH OPTIONS
 .TP
@@ -80,6 +90,12 @@ Prints out to the terminal a brief description and the options.
 Starts up the GUI as though the 'Help' button was pressed to show the
 main Help panel.
 .TP
+\fB\-cmd\fR \fI[ssvnc_cmd-args]\fR
+Launch the ssvnc_cmd utility command directly (no GUI) with the given
+arguments (for use when ssvnc_cmd is not in one's PATH.) If neither
+ssvnc_cmd nor ssvncviewer is in PATH, one can launch the viewer
+directly via: ssvnc -cmd -viewer [viewer-args]
+.TP
 \fB\-profiles\fR
 List the saved SSVNC profiles you have created.  A profile
 is a destination host with specific parameter settings.
@@ -122,7 +138,8 @@ Start off in a mode where a 'No Encryption' check button is present.
 You can toggle the mode with Ctrl-E.
 Same as SSVNC_DISABLE_ENCRYPTION_BUTTON=1. Or \fInoenc=1\fR in ~/.ssvncrc.
 Selecting no encryption is the same as the vnc:// and Vnc:// prefixes
-described below.  \fB-enc\fR implies the opposite.
+described below.  The \fB\-noenc\fR mode is now the default, use \fB-enc\fR
+or \fInoenc=0\fR for the opposite behavior.
 .TP
 \fB\-killstunnel\fR
 On Windows, automatically terminate the STUNNEL process when the viewer
diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1 b/x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1
index 12e7bca..a9dd71f 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 "September 2009" "" "SSVNC"
+.TH ssvncviewer 1 "December 2009" "" "SSVNC"
 .SH NAME
 ssvncviewer \- an X viewer client for VNC
 .SH SYNOPSIS
@@ -465,6 +465,18 @@ as possible instead of waiting until the end of the current
 framebuffer update coming in.  Helps 'pipeline' the updates.
 This is currently the default, use \fB-nopipeline\fR to disable.
 .TP
+\fB\-appshare\fR
+Enable features for use with x11vnc's \fB\-appshare\fR mode where
+instead of sharing the full desktop only the application's
+windows are shared.  Viewer multilisten mode is used to
+create the multiple windows: \fB\-multilisten\fR is implied.
+See 'x11vnc \fB\-appshare\fR \fB\-help\fR' more information on the mode.
+Features enabled in the viewer under \fB\-appshare\fR are:
+Minimum extra text in the title, auto \fB\-ycrop\fR is disabled,
+x11vnc \fB\-remote_prefix\fR X11VNC_APPSHARE_CMD: message channel,
+x11vnc initial window position hints.  See also Escape Keys
+below for additional key and mouse bindings.
+.TP
 \fB\-escape \fR\fIstr\fR
 This sets the 'Escape Keys' modifier sequence and enables
 escape keys mode.  When the modifier keys escape sequence
@@ -511,6 +523,18 @@ Clicking Mouse Button3 brings up the Popup Menu.
 The above mappings are \fBalways\fR active in ViewOnly mode, unless you set
 the Escape Keys value to 'never'.
 
+x11vnc -appshare hot-keys:  x11vnc has a simple application sharing mode
+that enables the viewer-side to move, resize, or raise the remote toplevel
+windows.  To enable it, hold down Shift + the Escape Keys and press these:
+
+Arrow keys: move the remote window around in its desktop.
+
+PageUp/PageDn/Home/End:  resize the remote window.
+
++/-: raise or lower the remote window.
+
+M or Button1 move win to local position;  D or Button3: delete remote win.
+
 If the Escape Keys value below is set to 'default' then a default list of
 of modifier keys is used.  For Unix it is: Alt_L,Super_L and for MacOSX it
 is Control_L,Meta_L.  Note: the Super_L key usually has a Windows(TM) Flag