x11vnc: -capslock -skip_lockkeys; Alt keys under -rawfb cons.

1 files changed, 52 insertions, 2 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index c070323..14713c2 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -425,6 +425,7 @@ void print_help(int mode) {
 "                       and last line be \"__BEGIN_VIEWONLY__\" to have 2\n"
 "                       full-access passwords)\n"
 "\n"
+#ifndef REL81
 "-unixpw [list]         Use Unix username and password authentication.  x11vnc\n"
 "                       uses the su(1) program to verify the user's password.\n"
 "                       [list] is an optional comma separated list of allowed\n"
@@ -1055,6 +1056,7 @@ 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"
+#endif
 "-usepw                 If no other password method was supplied on the command\n"
 "                       line, first look for ~/.vnc/passwd and if found use it\n"
 "                       with -rfbauth; next, look for ~/.vnc/passwdfile and\n"
@@ -1063,9 +1065,11 @@ void print_help(int mode) {
 "                       the -rfbauth option.  If none of these succeed x11vnc\n"
 "                       exits immediately.\n"
 "\n"
+#ifndef REL81
 "                       Note: -unixpw currently does not count as a password\n"
 "                       method by this option.\n"
 "\n"
+#endif
 "-storepasswd pass file Store password \"pass\" as the VNC password in the\n"
 "                       file \"file\".  Once the password is stored the\n"
 "                       program exits.  Use the password via \"-rfbauth file\"\n"
@@ -1356,6 +1360,36 @@ void print_help(int mode) {
 "                       e.g. !, @, [, are only accessible via -xkb mode and if\n"
 "                       so then automatically enable the mode.  To disable this\n"
 "                       automatic detection use -noxkb.\n"
+"\n"
+"-capslock              When in -modtweak (the default) or -xkb mode,\n"
+"                       if a keysym in the range A-Z comes in check the X\n"
+"                       server to see if the Caps_Lock is set.  If it is do\n"
+"                       not artificially press Shift to generate the keysym.\n"
+"                       This will enable the CapsLock key to behave correctly\n"
+"                       in some circumstances: namely *both* the VNC viewer\n"
+"                       machine and the x11vnc X server are in the CapsLock\n"
+"                       on state.  If one side has CapsLock on and the other\n"
+"                       off and the keyboard is not behaving as you think it\n"
+"                       should you should correct the CapsLock states (hint:\n"
+"                       pressing CapsLock inside and outside of the viewer can\n"
+"                       help toggle them both to the correct state).  However,\n"
+"                       for best results do not use this option, but rather\n"
+"                       *only* enable CapsLock on the VNC viewer side (i.e. by\n"
+"                       pressing CapsLock outside of the viewer window, also\n"
+"                       -skip_lockkeys below).  Also try -nomodtweak for a\n"
+"                       possible workaround.\n"
+"\n"
+"-skip_lockkeys         Have x11vnc ignore all Caps_Lock, Shift_Lock, Num_Lock,\n"
+"                       Scroll_Lock keysyms received from viewers.  The idea is\n"
+"                       you press Caps_Lock on the VNC Viewer side but that does\n"
+"                       not change the lock state in the x11vnc-side X server.\n"
+"                       Nevertheless your capitalized letters come in over\n"
+"                       the wire and are applied correctly to the x11vnc-side\n"
+"                       X server.  Note this mode probably won't do what you\n"
+"                       want in -nomodtweak mode.  Also, a kludge for KP_n\n"
+"                       digits is always done it this mode: they are mapped to\n"
+"                       regular digit keysyms.  See also -capslock above.\n"
+"\n"
 "-skip_keycodes string  Ignore the comma separated list of decimal keycodes.\n"
 "                       Perhaps these are keycodes not on your keyboard but\n"
 "                       your X server thinks exist.  Currently only applies\n"
@@ -1410,6 +1444,9 @@ void print_help(int mode) {
 "                       \"Button1\", ..., etc. E.g: \"-remap Super_R-Button2\"\n"
 "                       (useful for pasting on a laptop)\n"
 "\n"
+"                       To disable a keysym (i.e. make it so it will not be\n"
+"                       injected), remap it to \"NoSymbol\" or \"None\".\n"
+"\n"
 "                       Dead keys: \"dead\" (or silent, mute) keys are keys that\n"
 "                       do not produce a character but must be followed by a 2nd\n"
 "                       keystroke.  This is often used for accenting characters,\n"
@@ -2401,6 +2438,10 @@ void print_help(int mode) {
 "                         format to HI240, RGB565, RGB24, RGB32, RGB555, and\n"
 "                         GREY respectively.  See -rawfb video for details.\n"
 "\n"
+"                       If cmd is \"CONS\" or \"CONSn\" where n is a Linux\n"
+"                       console number, then the linux console keystroke\n"
+"                       insertion (see -rawfb cons) is performed.\n"
+"\n"
 "-gui [gui-opts]        Start up a simple tcl/tk gui based on the the remote\n"
 "                       control options -remote/-query described below.\n"
 "                       Requires the \"wish\" program to be installed on the\n"
@@ -2642,6 +2683,10 @@ void print_help(int mode) {
 "                       nomodtweak      enable  -nomodtweak mode.\n"
 "                       xkb             enable  -xkb modtweak mode.\n"
 "                       noxkb           disable -xkb modtweak mode.\n"
+"                       capslock        enable  -capslock mode.\n"
+"                       nocapslock      disable -capslock mode.\n"
+"                       skip_lockkeys   enable  -skip_lockkeys mode.\n"
+"                       noskip_lockkeys disable -skip_lockkeys mode.\n"
 "                       skip_keycodes:str enable -xkb -skip_keycodes \"str\".\n"
 "                       sloppy_keys     enable  -sloppy_keys mode.\n"
 "                       nosloppy_keys   disable -sloppy_keys mode.\n"
@@ -2835,8 +2880,9 @@ void print_help(int mode) {
 "                       listen lookup nolookup accept afteraccept gone shm\n"
 "                       noshm flipbyteorder noflipbyteorder onetile noonetile\n"
 "                       solid_color solid nosolid blackout xinerama noxinerama\n"
-"                       xtrap noxtrap xrandr noxrandr xrandr_mode padgeom quiet\n"
-"                       q noquiet modtweak nomodtweak xkb noxkb skip_keycodes\n"
+"                       xtrap noxtrap xrandr noxrandr xrandr_mode padgeom\n"
+"                       quiet q noquiet modtweak nomodtweak xkb noxkb capslock\n"
+"                       nocapslock skip_lockkeys noskip_lockkeys skip_keycodes\n"
 "                       sloppy_keys nosloppy_keys skip_dups noskip_dups\n"
 "                       add_keysyms noadd_keysyms clear_mods noclear_mods\n"
 "                       clear_keys noclear_keys remap repeat norepeat fb nofb\n"
@@ -2874,8 +2920,12 @@ void print_help(int mode) {
 "                       scale_str scaled_x scaled_y scale_numer scale_denom\n"
 "                       scale_fac scaling_blend scaling_nomult4 scaling_pad\n"
 "                       scaling_interpolate inetd privremote unsafe safer nocmds\n"
+#ifndef REL81
 "                       passwdfile unixpw unixpw_nis unixpw_list ssl ssl_pem\n"
 "                       sslverify stunnel stunnel_pem https usepw using_shm\n"
+#else
+"                       passwdfile usepw using_shm\n"
+#endif
 "                       logfile o flag rc norc h help V version lastmod bg\n"
 "                       sigpipe threads readrate netrate netlatency pipeinput\n"
 "                       clients client_count pid ext_xtest ext_xtrap ext_xrecord\n"