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, 44 insertions, 15 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index b22b19a..5183029 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -87,6 +87,10 @@ void print_help(int mode) {
" to 5900+N. The program will exit immediately if that\n"
" port is not available.\n"
"\n"
+"-autoport n Automatically probe for a free VNC port starting at n.\n"
+" The default is to start probing at 5900. Use this to\n"
+" stay away from other VNC servers near 5900.\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"
@@ -758,18 +762,25 @@ void print_help(int mode) {
" in addition to this option.\n"
"\n"
#endif
-"-find Find the user's display using FINDDISPLAY. It is an\n"
-" alias for \"-display WAIT:cmd=FINDDISPLAY\".\n"
+"-find Find the user's display using FINDDISPLAY. It is\n"
+" an alias for \"-display WAIT:cmd=FINDDISPLAY\".\n"
+" Use -finddpy to run the FINDDISPLAY program and exit.\n"
"\n"
"-create First try to find the user's display using FINDDISPLAY,\n"
" if that doesn't work create an X session via the\n"
" FINDCREATEDISPLAY method. This is an alias for\n"
" \"-display WAIT:cmd=FINDCREATEDISPLAY-Xvfb\".\n"
"\n"
+"-xdummy As -create except Xdummy instead of Xvfb. Implies\n"
+" FD_XDUMMY_NOROOT=1.\n"
+"\n"
"-svc Terminal services mode. Also \"-service\". Alias for\n"
" -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw\n"
" -users unixpw= -ssl SAVE\n"
"\n"
+"-svc_xdummy As -svc except Xdummy instead of Xvfb. Implies\n"
+" FD_XDUMMY_NOROOT=1.\n"
+"\n"
"-xdmsvc Terminal services mode. Also \"-xdm_service\". Alias for\n"
" -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw\n"
" -users unixpw= -ssl SAVE\n"
@@ -901,13 +912,15 @@ void print_help(int mode) {
" for the user. This is the only time x11vnc tries to\n"
" actually start up an X server.\n"
"\n"
-" By default FINDCREATEDISPLAY will try Xdummy and\n"
-" then Xvfb. The Xdummy wrapper is part of the x11vnc\n"
-" source code (x11vnc/misc/Xdummy) It should be available\n"
-" in PATH and have run \"Xdummy -install\" once to create\n"
-" the shared library. Xdummy requires root permission\n"
-" and only works on Linux. Xvfb is available on most\n"
-" platforms and does not require root.\n"
+" By default FINDCREATEDISPLAY will try Xdummy and then\n"
+" Xvfb. The Xdummy wrapper is part of the x11vnc source\n"
+" code (x11vnc/misc/Xdummy) It should be available in\n"
+" PATH and have run \"Xdummy -install\" once to create\n"
+" the shared library. Xdummy requires root permission and\n"
+" only works on Linux. (Note: specify FD_XDUMMY_NOROOT=1\n"
+" to skip a check for the root id; evidently your sudo(1)\n"
+" will take care of everything). Xvfb is available on\n"
+" most platforms and does not require root.\n"
"\n"
" When x11vnc exits (i.e. user disconnects) the X\n"
" server session stays running in the background.\n"
@@ -959,6 +972,13 @@ void print_help(int mode) {
" the X server. You can also set FD_PROG to be the full\n"
" 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"
+"\n"
" If you want the FINDCREATEDISPLAY session to contact an\n"
" XDMCP login manager (xdm/gdm/kdm) on the same machine,\n"
" then use \"Xvfb.xdmcp\" instead of \"Xvfb\", etc.\n"
@@ -1504,9 +1524,9 @@ void print_help(int mode) {
" -httpdir option. If not supplied it will try to guess\n"
" the directory as though the -http option was supplied.\n"
"\n"
-"-httpsredir [port] In -ssl mode with the Java applet retrieved via HTTPS:\n"
+"-httpsredir [port] In -ssl mode with the Java applet retrieved via HTTPS,\n"
" when the HTML file containing applet parameters\n"
-" ('index.vnc' or 'proxy.vnc') is sent do not set the\n"
+" ('index.vnc' or 'proxy.vnc') is sent do NOT set the\n"
" applet PORT parameter to the actual VNC port but set it\n"
" to \"port\" instead. If \"port\" is not supplied, then\n"
" the port number is guessed from the Host: HTTP header.\n"
@@ -1520,9 +1540,12 @@ void print_help(int mode) {
" redir from mygateway.com:443 to workstation:5900.\n"
"\n"
" This spares the user from having to type in\n"
-" https://mygateway.com/?PORT=443 into their web browser\n"
-" (note 443 is the default https port; other ports must\n"
-" be explicity indicated: https://mygateway.com:8000/...)\n"
+" https://mygateway.com/?PORT=443 into their web\n"
+" browser. Note taht port 443 is the default https port;\n"
+" other ports must be explicity indicated, for example:\n"
+" https://mygateway.com:8000/?PORT=8000. To avoid having\n"
+" to include the PORT= in the browser URL, simply supply\n"
+" \"-httpsredir\" to x11vnc.\n"
"\n"
#endif
"-usepw If no other password method was supplied on the command\n"
@@ -1826,6 +1849,12 @@ void print_help(int mode) {
" viewers that cannot do this (portions of the screen\n"
" may be clipped, unused, etc).\n"
"\n"
+" Note: the default now is to check for XRANDR events, but\n"
+" do not trap every X call that may fail due to resize.\n"
+" If a resize event is received, the full -xrandr mode\n"
+" is enabled. To disable even checking for events supply:\n"
+" -noxrandr.\n"
+"\n"
" \"mode\" defaults to \"resize\", which means create a\n"
" new, resized, framebuffer and hope all viewers can cope\n"
" with the change. \"newfbsize\" means first disconnect\n"
@@ -3712,7 +3741,7 @@ void print_help(int mode) {
" noncache_no_dtchange disable ncache_no_dtchange mode.\n"
" ncache_no_rootpixmap enable ncache_no_rootpixmap.\n"
" noncache_no_rootpixmap disable ncache_no_rootpixmap.\n"
-" ncache_reset_rootpixmap recheck the root pixmap\n"
+" ncache_reset_rootpixmap recheck the root pixmap, ncrp\n"
" ncache_keep_anims enable ncache_keep_anims.\n"
" noncache_keep_anims disable ncache_keep_anims.\n"
" wireframe enable -wireframe mode. same as \"wf\"\n"