Tweak settings and docs for create_display. Add FD_EXTRA finishing cmd.

1 files changed, 22 insertions, 13 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index e701cf4..da45cb0 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -1025,11 +1025,12 @@ void print_help(int mode) {
 "                       this string and the chvt(1) program will also be run.\n"
 "                       Any remaining output is taken as XAUTHORITY data.\n"
 "                       It can be either of the form XAUTHORITY=<file> or raw\n"
-"                       xauthority data for the display (e.g. \"xauth extract -\n"
-"                       $DISPLAY\" output).\n"
+"                       xauthority data for the display. For example;\n"
+"\n"
+"                            xauth extract - $DISPLAY\"\n"
 "\n"
 "                       In the case of -unixpw (but not -unixpw_nis), then the\n"
-"                       above command is run as the user who just authenticated\n"
+"                       cmd= command is run as the user who just authenticated\n"
 "                       via the login and password prompt.\n"
 "\n"
 "                       Also in the case of -unixpw, the user logging in can\n"
@@ -1037,7 +1038,7 @@ void print_help(int mode) {
 "                       a few options: scale=, scale_cursor= (or sc=), solid\n"
 "                       (or so), id=, clear_mods (or cm), clear_keys (or ck),\n"
 "                       repeat, speeds= (or sp=), readtimeout= (or rd=),\n"
-"                       rotate= (or ro=), or noncache (or nc) separated by\n"
+"                       rotate= (or ro=), or noncache (or nc), all separated by\n"
 "                       commas if there is more than one.  After the user logs\n"
 "                       in successfully, these options will be applied to the\n"
 "                       VNC screen.  For example,\n"
@@ -1087,9 +1088,12 @@ void print_help(int mode) {
 "                       process that will not switch, but it is only encoding\n"
 "                       and decoding the encrypted stream at that point.\n"
 "\n"
+"                       Automatic Finding of User X Sessions:\n"
+"\n"
 "                       As a special case, WAIT:cmd=FINDDISPLAY will run a\n"
 "                       script that works on most Unixes to determine a user's\n"
 "                       DISPLAY variable and xauthority data (see who(1)).\n"
+"\n"
 "                       The option \"-find\" is an alias for this mode.\n"
 "\n"
 "                       To have this default script printed to stdout (e.g. for\n"
@@ -1125,6 +1129,8 @@ void print_help(int mode) {
 "                       can also be set by the connecting user via \"nd=\"\n"
 "                       using \"+\" instead of \",\"\n"
 "\n"
+"                       Automatic Creation of User X Sessions:\n"
+"\n"
 "                       An interesting option is WAIT:cmd=FINDCREATEDISPLAY\n"
 "                       that is like FINDDISPLAY in that is uses the same method\n"
 "                       to find an existing display.  However, if it does not\n"
@@ -1172,12 +1178,14 @@ void print_help(int mode) {
 "\n"
 "                       Where /.../x11vnc is the full path to x11vnc.\n"
 "\n"
+"                       See the -svc/-service option alias above.\n"
+"\n"
 "                       If for some reason you do not want x11vnc to ever\n"
 "                       try to find an existing display set the env. var\n"
 "                       X11VNC_FINDDISPLAY_ALWAYS_FAILS=1 (also -env ...)\n"
 "\n"
 "                       Use WAIT:cmd=FINDCREATEDISPLAY-print to print out the\n"
-"                       script used.\n"
+"                       script that is used for this.\n"
 "\n"
 "                       You can specify the preferred X server order via e.g.,\n"
 "                       WAIT:cmd=FINDCREATEDISPLAY-Xdummy,Xvfb,X  and/or leave\n"
@@ -1194,20 +1202,21 @@ void print_help(int mode) {
 "                       -geometry, and -depth and other X server options).\n"
 "\n"
 "                       You can set the environment variable FD_GEOM (or\n"
-"                       X11VNC_CREATE_GEOM) to WxH or WxHxD to set the width and\n"
-"                       height and optionally the color depth of the created\n"
-"                       display.  You can also set FD_SESS to be the session\n"
-"                       (short name of the windowmanager: kde, gnome, twm,\n"
-"                       failsafe, etc.). FD_OPTS as extra options to pass to\n"
-"                       the X server. You can also set FD_PROG to be the full\n"
-"                       path to the session/windowmanager program.\n"
+"                       X11VNC_CREATE_GEOM) to WxH or WxHxD to set the width\n"
+"                       and height and optionally the color depth of the\n"
+"                       created display.  You can also set FD_SESS to be the\n"
+"                       session (short name of the windowmanager: kde, gnome,\n"
+"                       twm, failsafe, etc.). FD_OPTS contains extra options\n"
+"                       to pass to the X server. You can also set FD_PROG to\n"
+"                       be the full path to the session/windowmanager program.\n"
 "\n"
 "                       More FD tricks:  FD_CUPS=port or FD_CUPS=host:port\n"
 "                       will set the cups printing environment.  Similarly\n"
 "                       for FD_ESD=port or FD_ESD=host:port for esddsp sound\n"
 "                       redirection.  FD_XDUMMY_NOROOT means the Xdummy server\n"
 "                       does not need to be started as root (e.g. it will sudo\n"
-"                       automatically)\n"
+"                       automatically).  Set FD_EXTRA to a command to be run\n"
+"                       a few seconds after the X server starts up.\n"
 "\n"
 "                       If you want the FINDCREATEDISPLAY session to contact an\n"
 "                       XDMCP login manager (xdm/gdm/kdm) on the same machine,\n"