summaryrefslogtreecommitdiffstats
path: root/x11vnc/help.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/help.c')
-rw-r--r--x11vnc/help.c37
1 files changed, 27 insertions, 10 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index cce3e2e..0d9f2fe 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -346,13 +346,13 @@ void print_help(int mode) {
" will cause it to abort. Specifying both -inetd and -q\n"
" and no -o will automatically close the stderr.\n"
"\n"
-"-nofilexfer Disable the TightVNC file transfer extension. (same as\n"
-" -disablefiletransfer). Note that when the -viewonly\n"
-" option is supplied all file transfers are disabled.\n"
-" Also clients that log in viewonly cannot transfer files.\n"
-" However, if the remote control mechanism is used to\n"
-" change the global or per-client viewonly state the\n"
-" filetransfer permissions will NOT change.\n"
+"-tightfilexfer Enable the TightVNC file transfer extension. Note that\n"
+" that when the -viewonly option is supplied all file\n"
+" transfers are disabled. Also clients that log in\n"
+" viewonly cannot transfer files. However, if the remote\n"
+" control mechanism is used to change the global or\n"
+" per-client viewonly state the filetransfer permissions\n"
+" will NOT change.\n"
"\n"
"-ultrafilexfer Note, to *enable* UltraVNC filetransfer (currently\n"
" disabled by default, this may change...) and to get it\n"
@@ -360,6 +360,11 @@ void print_help(int mode) {
" options: \"-rfbversion 3.6 -permitfiletransfer\"\n"
" \"-ultrafilexfer\" is an alias for this combination.\n"
"\n"
+" Note that sadly you cannot do both -tightfilexfer and\n"
+" -ultrafilexfer at the same time because the latter\n"
+" requires setting the version to 3.6 and tightvnc will\n"
+" not do filetransfer at that version number.\n"
+"\n"
"-http Instead of using -httpdir (see below) to specify\n"
" where the Java vncviewer applet is, have x11vnc try\n"
" to *guess* where the directory is by looking relative\n"
@@ -798,6 +803,12 @@ void print_help(int mode) {
" your long \"login:\" line press the Up arrow once\n"
" (before typing anything else).\n"
"\n"
+" Another option is \"geom=WxH\" or \"geom=WxHxD\"\n"
+" (or ge=). This only has an effect in FINDCREATEDISPLAY\n"
+" mode when a virtual X server such as Xvfb is going to\n"
+" be created. It sets the width and height of the new\n"
+" display, and optionally the color depth as well.\n"
+"\n"
" To disable the option setting set the environment\n"
" variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.\n"
" To set any other options, the user can use the gui\n"
@@ -871,7 +882,7 @@ void print_help(int mode) {
" definitely getting a desktop (either real or virtual)\n"
" on the machine. E.g. a desktop service:\n"
"\n"
-" 5915 stream tcp nowait root /usr/sbin/tcpd /.../x11vnc\n"
+" 5900 stream tcp nowait root /usr/sbin/tcpd /.../x11vnc\n"
" -inetd -q -http -ssl SAVE -unixpw -users unixpw=\\\n"
" -passwd secret -prog /.../x11vnc \\\n"
" -display WAIT:cmd=FINDCREATEDISPLAY\n"
@@ -2734,6 +2745,10 @@ void print_help(int mode) {
" monitor in dpms powered off state. Use this option to\n"
" skip powering off the monitor.\n"
"\n"
+"-noultraext Disable the following UltraVNC extensions: SingleWindow\n"
+" and ServerInput. The others managed by libvncserver\n"
+" (textchat, 1/n scaling, rfbEncodingUltra) are not.\n"
+"\n"
"-noxdamage Do not use the X DAMAGE extension to detect framebuffer\n"
" changes even if it is available. Use -xdamage if your\n"
" default is to have it off.\n"
@@ -3386,8 +3401,8 @@ void print_help(int mode) {
" timeout:n reset -timeout to n, if there are\n"
" currently no clients, exit unless one\n"
" connects in the next n secs.\n"
-" filexfer enable filetransfer for new clients.\n"
-" nofilexfer disable filetransfer for new clients.\n"
+" tightfilexfer enable filetransfer for new clients.\n"
+" notightfilexfer disable filetransfer for new clients.\n"
/* access */
" http enable http client connections.\n"
" nohttp disable http client connections.\n"
@@ -3600,6 +3615,8 @@ void print_help(int mode) {
" noclientdpms disable -clientdpms mode.\n"
" noserverdpms enable -noserverdpms mode.\n"
" serverdpms disable -noserverdpms mode.\n"
+" noultraext enable -noultraext mode.\n"
+" ultraext disable -noultraext mode.\n"
" xdamage enable xdamage polling hints.\n"
" noxdamage disable xdamage polling hints.\n"
" xd_area:A set -xd_area max pixel area to \"A\"\n"