x11vnc: add Files mode to user controlled input. more ultra/tight filexfer tweaks. rfbversion remote control. noncache/nc unixpw user opt.

1 files changed, 31 insertions, 24 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 0d9f2fe..6f9b23b 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -363,7 +363,7 @@ void print_help(int mode) {
 "                       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"
+"                       not do filetransfer when it sees 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"
@@ -449,13 +449,14 @@ void print_help(int mode) {
 "\n"
 "-input string          Fine tuning of allowed user input.  If \"string\" does\n"
 "                       not contain a comma \",\" the tuning applies only to\n"
-"                       normal clients.  Otherwise the part before \",\" is for\n"
-"                       normal clients and the part after for view-only clients.\n"
-"                       \"K\" is for Keystroke input, \"M\" for Mouse-motion\n"
-"                       input, \"B\" for Button-click input, and \"C\" is for\n"
-"                       Clipboard input.  Their presence in the string enables\n"
+"                       normal clients.  Otherwise the part before \",\" is\n"
+"                       for normal clients and the part after for view-only\n"
+"                       clients.  \"K\" is for Keystroke input, \"M\" for\n"
+"                       Mouse-motion input, \"B\" for Button-click input, \"C\"\n"
+"                       is for Clipboard input, and \"F\" is for File transfer\n"
+"                       (ultravnc only).  Their presence in the string enables\n"
 "                       that type of input.  E.g. \"-input M\" means normal\n"
-"                       users can only move the mouse and  \"-input KMBC,M\"\n"
+"                       users can only move the mouse and  \"-input KMBCF,M\"\n"
 "                       lets normal users do anything and enables view-only\n"
 "                       users to move the mouse.  This option is ignored when\n"
 "                       a global -viewonly is in effect (all input is discarded\n"
@@ -788,10 +789,11 @@ void print_help(int mode) {
 "                       place a colon at the end of his username and supply\n"
 "                       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=), or\n"
-"                       rotate= (or ro=) separated by commas if there is more\n"
-"                       than one.  After the user logs in successfully, these\n"
-"                       options will be applied to the VNC screen.  For example,\n"
+"                       repeat, speeds= (or sp=), readtimeout= (or rd=),\n"
+"                       rotate= (or ro=), or noncache (or nc) 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"
 "\n"
 "                          login: fred:scale=3/4,sc=1,repeat\n"
 "                          Password: ...\n"
@@ -3401,8 +3403,11 @@ 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"
-"                       tightfilexfer        enable  filetransfer for new clients.\n"
-"                       notightfilexfer      disable filetransfer for new clients.\n"
+"                       tightfilexfer   enable  filetransfer for NEW clients.\n"
+"                       notightfilexfer disable filetransfer for NEW clients.\n"
+"                       ultrafilexfer   enable  filetransfer for clients.\n"
+"                       noultrafilexfer disable filetransfer for clients.\n"
+"                       rfbversion:n.m  set -rfbversion for new clients.\n"
 /* access */
 "                       http            enable  http client connections.\n"
 "                       nohttp          disable http client connections.\n"
@@ -3717,7 +3722,8 @@ void print_help(int mode) {
 "                       nooverlay_yescursor overlay_nocursor 8to24 no8to24\n"
 "                       8to24_opts 24to32 no24to32 visual scale scale_cursor\n"
 "                       viewonly noviewonly shared noshared forever noforever\n"
-"                       once timeout filexfer nofilexfer deny lock nodeny unlock\n"
+"                       once timeout tightfilexfer notightfilexfer ultrafilexfer\n"
+"                       noultrafilexfer rfbversion deny lock nodeny unlock\n"
 "                       avahi mdns noavahi nomdns connect allowonce allow\n"
 "                       localhost nolocalhost listen lookup nolookup accept\n"
 "                       afteraccept gone shm noshm flipbyteorder noflipbyteorder\n"
@@ -3746,16 +3752,17 @@ void print_help(int mode) {
 "                       nowireframe nowf wireframelocal wfl nowireframelocal\n"
 "                       nowfl wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
 "                       scr_skip scr_inc scr_keys scr_term scr_keyrepeat\n"
-"                       scr_parms scrollcopyrect scr noscrollcopyrect noscr\n"
-"                       fixscreen noxrecord xrecord reset_record pointer_mode pm\n"
-"                       input_skip allinput noallinput input grabkbd nograbkbd\n"
-"                       grabptr nograbptr grabalways nograbalways client_input\n"
-"                       ssltimeout speeds wmdt debug_pointer dp nodebug_pointer\n"
-"                       nodp debug_keyboard dk nodebug_keyboard nodk deferupdate\n"
-"                       defer wait_ui wait_bog nowait_bog slow_fb wait\n"
-"                       readtimeout nap nonap sb screen_blank fbpm nofbpm dpms\n"
-"                       nodpms clientdpms noclientdpms forcedpms noforcedpms\n"
-"                       noserverdpms serverdpms fs gaps grow fuzz snapfb\n"
+"                       scr_parms scrollcopyrect scr noscrollcopyrect\n"
+"                       noscr fixscreen noxrecord xrecord reset_record\n"
+"                       pointer_mode pm input_skip allinput noallinput input\n"
+"                       grabkbd nograbkbd grabptr nograbptr grabalways\n"
+"                       nograbalways client_input ssltimeout speeds wmdt\n"
+"                       debug_pointer dp nodebug_pointer nodp debug_keyboard\n"
+"                       dk nodebug_keyboard nodk deferupdate defer wait_ui\n"
+"                       wait_bog nowait_bog slow_fb wait readtimeout nap nonap\n"
+"                       sb screen_blank fbpm nofbpm dpms nodpms clientdpms\n"
+"                       noclientdpms forcedpms noforcedpms noserverdpms\n"
+"                       serverdpms noultraext ultraext fs gaps grow fuzz snapfb\n"
 "                       nosnapfb rawfb uinput_accel uinput_thresh uinput_reset\n"
 "                       uinput_always progressive rfbport http nohttp httpport\n"
 "                       httpdir enablehttpproxy noenablehttpproxy alwaysshared\n"