summaryrefslogtreecommitdiffstats
path: root/x11vnc/help.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/help.c')
-rw-r--r--x11vnc/help.c59
1 files changed, 55 insertions, 4 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index fadcf32..4b81efe 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -114,6 +114,10 @@ void print_help(int mode) {
" before startup. Same as -xauth file. See Xsecurity(7),\n"
" xauth(1) man pages for more info.\n"
"\n"
+" Use '-auth guess' to have x11vnc use its -findauth\n"
+" mechanism (described below) to try to guess the\n"
+" XAUTHORITY filename and use it.\n"
+"\n"
"-N If the X display is :N, try to set the VNC display to\n"
" also be :N This just sets the -rfbport option to 5900+N\n"
" The program will exit immediately if that port is not\n"
@@ -137,6 +141,14 @@ void print_help(int mode) {
" X session. Note: the reopened state may be unstable.\n"
" Set X11VNC_REOPEN_DISPLAY=n to reopen n times.\n"
"\n"
+" Update: as of 0.9.9, x11vnc tries to automatically avoid\n"
+" being killed by the display manager by delaying creating\n"
+" windows or using XFIXES. So you shouldn't need to use\n"
+" KillInitClients=false as long as you log in quickly\n"
+" enough (within 45 seconds of connecting.) You can\n"
+" disable this by setting X11VNC_AVOID_WINDOWS=never.\n"
+" You can also set it to the number of seconds to delay.\n"
+"\n"
"-reflect host:N Instead of connecting to and polling an X display,\n"
" connect to the remote VNC server host:N and be a\n"
" reflector/repeater for it. This is useful for trying\n"
@@ -413,6 +425,18 @@ void print_help(int mode) {
"-timeout n Exit unless a client connects within the first n seconds\n"
" after startup.\n"
"\n"
+" If there have been no connection attempts after n\n"
+" seconds x11vnc exits immediately. If a client is\n"
+" trying to connect but has not progressed to the normal\n"
+" operating state, x11vnc gives it a few more seconds\n"
+" to finish and exits if it does not make it to the\n"
+" normal state.\n"
+"\n"
+" For reverse connections via -connect or -connect_or_exit\n"
+" a timeout of n seconds will be set for all reverse\n"
+" connects. If the connect timeout alarm goes off,\n"
+" x11vnc will exit immediately.\n"
+"\n"
"-sleepin n At startup sleep n seconds before proceeding (e.g. to\n"
" allow redirs and listening clients to start up)\n"
"\n"
@@ -1025,6 +1049,18 @@ void print_help(int mode) {
" (i.e. all the X displays on the local machine that you\n"
" have access rights to).\n"
"\n"
+"-findauth [disp] Apply the -find/-finddpy heuristics to try to guess the\n"
+" XAUTHORITY file for DISPLAY 'disp'. If 'disp' is not\n"
+" supplied, then the value in the -display earlier in\n"
+" the cmdline is used; failing that $DISPLAY is used;\n"
+" and failing that \":0\" is used.\n"
+"\n"
+" If nothing is printed out, that means no XAUTHORITY was\n"
+" found for 'disp'. If \"XAUTHORITY=\" is printed out,\n"
+" that means use the default (i.e. do not set XAUTHORITY).\n"
+" If \"XAUTHORITY=/path/to/file\" is printed out, then\n"
+" use that file.\n"
+"\n"
"-create First try to find the user's display using FINDDISPLAY,\n"
" if that doesn't succeed create an X session via the\n"
" FINDCREATEDISPLAY method. This is an alias for\n"
@@ -1106,6 +1142,10 @@ void print_help(int mode) {
" in before the user hits Escape. The username is ignored\n"
" but the colon options are not.\n"
"\n"
+" The default message is 2 lines in a small font, set\n"
+" the env. var. X11VNC_SYSTEM_GREETER1=true for a 1 line\n"
+" message in a larger font.\n"
+"\n"
" If the user pressed Escape the FINDCREATEDISPLAY command\n"
" will be run with the env. var. X11VNC_XDM_ONLY=1.\n"
"\n"
@@ -2592,6 +2632,8 @@ void print_help(int mode) {
" force it by prefixing color with \"gnome:\", \"kde:\",\n"
" \"cde:\", \"xfce:\", or \"root:\".\n"
"\n"
+" Update: -solid no longer works on KDE4.\n"
+"\n"
" This mode works in a limited way on the Mac OS X Console\n"
" with one color ('kelp') using the screensaver writing\n"
" to the background. Look in \"~/Library/Screen Savers\"\n"
@@ -3043,6 +3085,15 @@ void print_help(int mode) {
"\n"
"-noxfixes Do not use the XFIXES extension to draw the exact cursor\n"
" shape even if it is available.\n"
+"\n"
+" Note: To work around a crash in Xorg 1.5 and later\n"
+" some people needed to use -noxfixes. The Xorg crash\n"
+" occurred right after a Display Manager (e.g. GDM) login.\n"
+" Starting with x11vnc 0.9.9 it tries to automatically\n"
+" avoid using XFIXES until it is sure a window manager\n"
+" is running. See the -reopen option for more info and\n"
+" how to use X11VNC_AVOID_WINDOWS=never to disable it.\n"
+"\n"
"-alphacut n When using the XFIXES extension for the cursor shape,\n"
" cursors with transparency will not usually be displayed\n"
" exactly (but opaque ones will). This option sets n as\n"
@@ -5099,9 +5150,9 @@ void print_help(int mode) {
" macnoresize macresize nomacnoresize maciconanim macmenu\n"
" macnomenu nomacmenu macuskbd nomacuskbd noremote\n"
"\n"
-" aro= noop display vncdisplay autoport loop loopbg\n"
-" desktopname guess_desktop guess_dbus http_url\n"
-" auth xauth users rootshift clipshift scale_str\n"
+" aro= noop display vncdisplay icon_mode autoport\n"
+" loop loopbg desktopname guess_desktop guess_dbus\n"
+" http_url auth xauth users rootshift clipshift scale_str\n"
" scaled_x scaled_y scale_numer scale_denom scale_fac_x\n"
" scale_fac_y scaling_blend scaling_nomult4 scaling_pad\n"
" scaling_interpolate inetd privremote unsafe safer\n"
@@ -5218,7 +5269,7 @@ void print_help(int mode) {
" stunnel, ssl, unixpw, WAIT, zeroconf, id, accept,\n"
" afteraccept, gone, pipeinput, v4l-info, rawfb-setup,\n"
" dt, gui, ssh, storepasswd, passwdfile, custom_passwd,\n"
-" crash.\n"
+" findauth, crash.\n"
"\n"
" See each option's help to learn the associated external\n"
" command. Note that the -nocmds option takes precedence\n"