x11vnc: add clear_locks (Caps_Lock, etc) action.

1 files changed, 20 insertions, 13 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 3ea9606..96004b8 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -1723,7 +1723,7 @@ void print_help(int mode) {
 "                       If the remote SSH server is on a non-standard port\n"
 "                       (i.e. not 22) use user@host:port:disp+secs.\n"
 "\n"
-"                       Note that the ssh process may NOT be killed when\n"
+"                       Note that the ssh process MAY NOT be killed when\n"
 "                       x11vnc exits.  It tries by looking at ps(1) output.\n"
 "\n"
 "-usepw                 If no other password method was supplied on the command\n"
@@ -2226,9 +2226,12 @@ void print_help(int mode) {
 "                       KeyRelease for each one. The Lock modifiers are skipped.\n"
 "                       Used to clear the state if the display was accidentally\n"
 "                       left with any pressed down.\n"
-"-clear_keys            As -clear_mods, except try to release any pressed key.\n"
+"-clear_keys            As -clear_mods, except try to release ANY pressed key.\n"
 "                       Note that this option and -clear_mods can interfere\n"
 "                       with a person typing at the physical keyboard.\n"
+"-clear_all             As -clear_keys, except try to release any CapsLock,\n"
+"                       NumLock, etc. locks as well.\n"
+"\n"
 "-remap string          Read Keysym remappings from file named \"string\".\n"
 "                       Format is one pair of Keysyms per line (can be name\n"
 "                       or hex value) separated by a space.  If no file named\n"
@@ -3863,6 +3866,9 @@ void print_help(int mode) {
 "                       noclear_mods    disable -clear_mods mode.\n"
 "                       clear_keys      enable  -clear_keys mode and clear them.\n"
 "                       noclear_keys    disable -clear_keys mode.\n"
+"                       clear_locks     do the clear_locks action.\n"
+"                       clear_all       do the clear_all action.\n"
+"                       keystate        have x11vnc print current keystate.\n"
 /* filename */
 "                       remap:str       set -remap \"str\" (empty to disable).\n"
 "                                       See -remap for the form of \"str\"\n"
@@ -4084,17 +4090,18 @@ void print_help(int mode) {
 "                       8to24_opts 24to32 no24to32 visual scale scale_cursor\n"
 "                       viewonly noviewonly shared noshared forever noforever\n"
 "                       once timeout tightfilexfer notightfilexfer ultrafilexfer\n"
-"                       noultrafilexfer rfbversion deny lock nodeny unlock avahi\n"
-"                       mdns noavahi nomdns connect proxy  allowonce allow\n"
-"                       localhost nolocalhost listen lookup nolookup accept\n"
-"                       afteraccept gone shm noshm flipbyteorder noflipbyteorder\n"
-"                       onetile noonetile solid_color solid nosolid blackout\n"
-"                       xinerama noxinerama xtrap noxtrap xrandr noxrandr\n"
-"                       xrandr_mode rotate padgeom quiet q noquiet modtweak\n"
-"                       nomodtweak xkb noxkb capslock nocapslock skip_lockkeys\n"
-"                       noskip_lockkeys skip_keycodes sloppy_keys nosloppy_keys\n"
-"                       skip_dups noskip_dups add_keysyms noadd_keysyms\n"
-"                       clear_mods noclear_mods clear_keys noclear_keys\n"
+"                       noultrafilexfer rfbversion deny lock nodeny unlock\n"
+"                       avahi mdns noavahi nomdns connect proxy  allowonce\n"
+"                       allow localhost nolocalhost listen lookup nolookup\n"
+"                       accept afteraccept gone shm noshm flipbyteorder\n"
+"                       noflipbyteorder onetile noonetile solid_color solid\n"
+"                       nosolid blackout xinerama noxinerama xtrap noxtrap\n"
+"                       xrandr noxrandr xrandr_mode rotate padgeom quiet\n"
+"                       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 clear_all clear_locks keystate\n"
 "                       remap repeat norepeat fb nofb bell nobell sel nosel\n"
 "                       primary noprimary setprimary nosetprimary clipboard\n"
 "                       noclipboard setclipboard nosetclipboard seldir\n"