diff options
Diffstat (limited to 'x11vnc/help.c')
| -rw-r--r-- | x11vnc/help.c | 95 |
1 files changed, 72 insertions, 23 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c index f2c9a6a..4089448 100644 --- a/x11vnc/help.c +++ b/x11vnc/help.c @@ -296,6 +296,10 @@ void print_help(int mode) { " the notation \"m/n\" may be used to denote fractions\n" " exactly, e.g. -scale 2/3\n" "\n" +" To scale asymmetrically in the horizontal and vertical\n" +" directions, specify a WxH geometry to stretch to:\n" +" e.g. '-scale 1024x768', or also '-scale 0.9x0.75'\n" +"\n" " Scaling Options: can be added after \"fraction\" via\n" " \":\", to supply multiple \":\" options use commas.\n" " If you just want a quick, rough scaling without\n" @@ -316,6 +320,8 @@ void print_help(int mode) { " and height to be multiples of scaling denominator\n" " (e.g. 3 for 2/3).\n" "\n" +"-geometry WxH Same as -scale WxH\n" +"\n" "-scale_cursor frac By default if -scale is supplied the cursor shape is\n" " scaled by the same factor. Depending on your usage,\n" " you may want to scale the cursor independently of the\n" @@ -1734,9 +1740,9 @@ void print_help(int mode) { " choice of implementation).\n" "\n" " cipher can be one of: arc4, aesv2, aes-cfb, blowfish,\n" -" or 3des. See the OpenSSL documentation for more info.\n" -" The keysize is 128 bits. Here is one way to make a\n" -" keyfile with that many bits:\n" +" aes256, or 3des. See the OpenSSL documentation for\n" +" more info. The keysize is 128 bits (except for aes256).\n" +" Here is one way to make a keyfile with that many bits:\n" "\n" " dd if=/dev/random of=./my.key bs=16 count=1\n" "\n" @@ -1774,6 +1780,18 @@ void print_help(int mode) { " although you may be forced to if the other side of the\n" " tunnel is not under your control.\n" "\n" +" To skip the salt and EVP_BytesToKey MD5 entirely (no\n" +" hashing is done: the keydata is directly inserted into\n" +" the cipher) specify \"-1\" for the salt, e.g.\n" +"\n" +" -enc blowfish@-1,16:./my.key\n" +"\n" +" The message digest can also be changed to something\n" +" besides the default MD5. Use cipher@md+n,m where \"md\"\n" +" can be one of sha, sha1, md5, or ripe. For example:\n" +"\n" +" -enc arc4@sha+8,16:./my.key\n" +"\n" " The SSVNC vnc viewer project supplies a symmetric\n" " encryption tool named \"ultravnc_dsm_helper\" that can\n" " be used on the viewer side. For example:\n" @@ -1783,14 +1801,20 @@ void print_help(int mode) { " where h:p is the hostname and port of the x11vnc server.\n" " ultravnc_dsm_helper may also be used standalone to\n" " provide a symmetric encryption tunnel for any viewer\n" -" or server (VNC or otherwise.)\n" +" or server (VNC or otherwise.) The cipher (1st arg)\n" +" is basically the same syntax as we use above.\n" "\n" " Also see the 'Non-Ultra DSM' SSVNC option for the\n" " 'UltraVNC DSM Encryption Plugin' advanced option.\n" "\n" -"-https [port] Choose a separate HTTPS port (-ssl mode only).\n" +" For both ways of using the viewer, you can specify the\n" +" salt,ivec sizes (in GUI or, e.g. arc4@8,16).\n" "\n" -" In -ssl mode, it turns out you can use the\n" +"-https [port] Use a special, separate HTTPS port (-ssl mode only)\n" +" for HTTPS Java viewer applet downloading. I.e. not 5900\n" +" and not 5800 (the defaults.)\n" +"\n" +" BACKGROUND: In -ssl mode, it turns out you can use the\n" " single VNC port (e.g. 5900) for both VNC and HTTPS\n" " connections. (HTTPS is used to retrieve a SSL-aware\n" " VncViewer.jar applet that is provided with x11vnc).\n" @@ -1808,14 +1832,15 @@ void print_help(int mode) { " or VNC Viewer applet. That's right 3 separate \"Are\n" " you sure you want to connect?\" dialogs!)\n" "\n" -" So use the -https option to provide a separate, more\n" -" reliable HTTPS port that x11vnc will listen on. If\n" +" USAGE: So use the -https option to provide a separate,\n" +" more reliable HTTPS port that x11vnc will listen on. If\n" " [port] is not provided (or is 0), one is autoselected.\n" " The URL to use is printed out at startup.\n" "\n" " The SSL Java applet directory is specified via the\n" -" -httpdir option. If not supplied it will try to guess\n" -" the directory as though the -http option was supplied.\n" +" -httpdir option. If not supplied, -https will try\n" +" to guess the directory as though the -http option\n" +" was supplied.\n" "\n" "-httpsredir [port] In -ssl mode with the Java applet retrieved via HTTPS,\n" " when the HTML file containing applet parameters\n" @@ -3261,6 +3286,25 @@ void print_help(int mode) { " and ServerInput. The others managed by libvncserver\n" " (textchat, 1/n scaling, rfbEncodingUltra) are not.\n" "\n" +"-chatwindow Place a local UltraVNC chat window on the X11 display\n" +" that x11vnc is polling. That way the person on the VNC\n" +" viewer-side can chat with the person at the physical\n" +" X11 console. (e.g. helpdesk w/o telephone)\n" +"\n" +" For this to work the SSVNC package (version 1.0.21 or\n" +" later) MUST BE installed on the system where x11vnc runs\n" +" and the 'ssvnc' command must be available in $PATH.\n" +" The ssvncviewer is used as a chat window helper.\n" +" See http://www.karlrunge.com/x11vnc/ssvnc.html\n" +"\n" +" This option implies '-rfbversion 3.6' so as to trick\n" +" UltraVNC viewers, otherwise they assume chat is not\n" +" available. To specify a different rfbversion, place\n" +" it after the -chatwindow option on the cmdline.\n" +"\n" +" See also the remote control 'chaton' and 'chatoff'\n" +" actions. These can also be set from the tkx11vnc GUI.\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" @@ -4158,6 +4202,10 @@ void print_help(int mode) { " serverdpms disable -noserverdpms mode.\n" " noultraext enable -noultraext mode.\n" " ultraext disable -noultraext mode.\n" +" chatwindow enable local chatwindow mode.\n" +" nochatwindow disable local chatwindow mode.\n" +" chaton begin chat using local window.\n" +" chatoff end chat using local window.\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" @@ -4293,16 +4341,17 @@ void print_help(int mode) { " 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 grablocal\n" -" client_input ssltimeout speeds wmdt debug_pointer dp\n" -" nodebug_pointer nodp debug_keyboard dk nodebug_keyboard\n" -" nodk keycode deferupdate defer wait_ui wait_bog\n" -" nowait_bog slow_fb xrefresh 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" +" fixscreen noxrecord xrecord reset_record pointer_mode\n" +" pm input_skip allinput noallinput input grabkbd\n" +" nograbkbd grabptr nograbptr grabalways nograbalways\n" +" grablocal client_input ssltimeout speeds wmdt\n" +" debug_pointer dp nodebug_pointer nodp debug_keyboard\n" +" dk nodebug_keyboard nodk keycode deferupdate defer\n" +" wait_ui wait_bog nowait_bog slow_fb xrefresh wait\n" +" readtimeout nap nonap sb screen_blank fbpm nofbpm dpms\n" +" nodpms clientdpms noclientdpms forcedpms noforcedpms\n" +" noserverdpms serverdpms noultraext ultraext chatwindow\n" +" nochatwindow chaton chatoff 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" @@ -4319,9 +4368,9 @@ void print_help(int mode) { " macnomenu nomacmenu macuskbd nomacuskbd noremote\n" "\n" " aro= noop display vncdisplay desktopname guess_desktop\n" -" http_url auth xauth users rootshift clipshift\n" -" scale_str scaled_x scaled_y scale_numer scale_denom\n" -" scale_fac scaling_blend scaling_nomult4 scaling_pad\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" " nocmds passwdfile unixpw unixpw_nis unixpw_list ssl\n" " ssl_pem sslverify stunnel stunnel_pem https httpsredir\n" |