x11vnc: prepare_x11vnc_dist.sh for 0.9.10. -xdummy_xvfb,

        -svc_xdummy_xvfb and -create_x shorthand. lxde session.
        Xdummy improvements and root no longer required.

1 files changed, 28 insertions, 18 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index d360e7a..40fd3ec 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -1117,6 +1117,11 @@ void print_help(int mode) {
 "-xdummy                As in -create, except Xdummy instead of Xvfb.\n"
 "-xvnc                  As in -create, except Xvnc instead of Xvfb.\n"
 "-xvnc_redirect         As in -create, except Xvnc.redirect instead of Xvfb.\n"
+"-xdummy_xvfb           Sets WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb\n"
+"\n"
+"-create_x str          Sets WAIT:cmd=FINDCREATEDISPLAY-<str>  Can be on cmdline\n"
+"                       after anything that sets WAIT:.. and other things\n"
+"                       (e.g. -svc, -xdmsvc) to adjust the X server list.\n"
 "\n"
 "-svc                   Terminal services mode based on SSL access.  Alias for\n"
 "                       -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw -users\n"
@@ -1124,6 +1129,7 @@ void print_help(int mode) {
 "\n"
 "-svc_xdummy            As -svc except Xdummy instead of Xvfb.\n"
 "-svc_xvnc              As -svc except Xvnc instead of Xvfb.\n"
+"-svc_xdummy_xvfb       As -svc with Xdummy,Xvfb.\n"
 "\n"
 "-xdmsvc                Display manager Terminal services mode based on SSL.\n"
 "                       Alias for -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp\n"
@@ -1295,11 +1301,13 @@ void print_help(int mode) {
 "                       mode when a virtual X server such as Xvfb is going\n"
 "                       to be created.  It sets the width and height of\n"
 "                       the new display, and optionally the color depth as\n"
-"                       well. You can also supply \"gnome\", \"kde\", \"twm\",\n"
+"                       well.\n"
+"\n"
+"                       You can also supply \"gnome\", \"kde\", \"twm\",\n"
 "                       \"fvwm\", \"mwm\", \"dtwm\", \"wmaker\", \"xfce\",\n"
-"                       \"enlightenment\", \"Xsession\", or \"failsafe\"\n"
-"                       (same as \"xterm\") to have the created display use\n"
-"                       that mode for the user session.\n"
+"                       \"lxde\", \"enlightenment\", \"Xsession\", or\n"
+"                       \"failsafe\" (same as \"xterm\") to have the created\n"
+"                       display use that mode for the user session.\n"
 "\n"
 "                       Specify \"tag=...\" to set the unique FD_TAG desktop\n"
 "                       session tag described below.  Note: this option will\n"
@@ -1398,17 +1406,21 @@ void print_help(int mode) {
 "                       Xdummy:\n"
 "\n"
 "                       The Xdummy wrapper is part of the x11vnc source code\n"
-"                       (x11vnc/misc/Xdummy)  It should be available in PATH and\n"
-"                       have run \"Xdummy -install\" once to create the shared\n"
-"                       library.  Xdummy requires root permission and only works\n"
-"                       on Linux.  (Note: specify FD_XDUMMY_NOROOT=1 to skip\n"
-"                       a check for the root id; evidently your sudo(1) will\n"
-"                       take care of everything.  The -xdummy and -svc_xdummy\n"
-"                       options imply FD_XDUMMY_NOROOT=1).\n"
+"                       (x11vnc/misc/Xdummy)  It should be available in PATH\n"
+"                       and have run \"Xdummy -install\" once to create the\n"
+"                       shared library.  Xdummy only works on Linux.  As of\n"
+"                       12/2009 it no longer needs to be run as root, and the\n"
+"                       default is to not run as root.  In some circumstances\n"
+"                       permissions may require running it as root, in these\n"
+"                       cases specify FD_XDUMMY_RUN_AS_ROOT=1, this is the same\n"
+"                       as supplying -root to the Xdummy cmdline.\n"
 "\n"
 "                       Xvfb is available on most platforms and does not\n"
 "                       require root.\n"
 "\n"
+"                       An advantage of Xdummy over Xvfb is that Xdummy supports\n"
+"                       RANDR dynamic screen resizing.\n"
+"\n"
 "                       When x11vnc exits (i.e. user disconnects) the X\n"
 "                       server session stays running in the background.\n"
 "                       The FINDDISPLAY will find it directly next time.\n"
@@ -1466,13 +1478,11 @@ void print_help(int mode) {
 "                       More FD tricks:  FD_CUPS=port or FD_CUPS=host:port\n"
 "                       will set the cups printing environment.  Similarly for\n"
 "                       FD_ESD=port or FD_ESD=host:port for esddsp sound\n"
-"                       redirection.  FD_XDUMMY_NOROOT means the Xdummy\n"
-"                       server does not need to be started as root (e.g. it\n"
-"                       will sudo automatically).  Set FD_EXTRA to a command\n"
-"                       to be run a few seconds after the X server starts up.\n"
-"                       Set FD_TAG to be a unique name for the session, it is\n"
-"                       set as an X property, that makes FINDDISPLAY only find\n"
-"                       sessions with that tag value.\n"
+"                       redirection.  Set FD_EXTRA to a command to be run a\n"
+"                       few seconds after the X server starts up.  Set FD_TAG\n"
+"                       to be a unique name for the session, it is set as an\n"
+"                       X property, that makes FINDDISPLAY only find sessions\n"
+"                       with that tag value.\n"
 "\n"
 "                       If you want the FINDCREATEDISPLAY session to contact an\n"
 "                       XDMCP login manager (xdm/gdm/kdm) on the same machine,\n"