Thread safety. Fix -clip -in -rawfb. Try to avoid Xorg stuck

key bug.

1 files changed, 27 insertions, 8 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 9e61b0b..824028b 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -903,6 +903,9 @@ void print_help(int mode) {
 "                       if [list] starts with the \"%%\" character.  See the\n"
 "                       quick_pw() function in the source for details.\n"
 "\n"
+"                       Use -nounixpw to disable unixpw mode if it was enabled\n"
+"                       earlier in the cmd line (e.g. -svc mode)\n"
+"\n"
 "-unixpw_nis [list]     As -unixpw above, however do not use su(1) but rather\n"
 "                       use the traditional getpwnam(3) + crypt(3) method to\n"
 "                       verify passwords. All of the above -unixpw options and\n"
@@ -2745,10 +2748,13 @@ void print_help(int mode) {
 "-repeat                VNC clients are connected and VNC keyboard input is\n"
 "                       not idle for more than 5 minutes.  This works around a\n"
 "                       repeating keystrokes bug (triggered by long processing\n"
-"                       delays between key down and key up client events: either\n"
-"                       from large screen changes or high latency).\n"
+"                       delays between key down and key up client events:\n"
+"                       either from large screen changes or high latency).\n"
 "                       Default: %s\n"
 "\n"
+"                       You can set the env. var. X11VNC_IDLE_TIMEOUT to the\n"
+"                       number of idle seconds you want (5min = 300secs).\n"
+"\n"
 "                       Note: your VNC viewer side will likely do autorepeating,\n"
 "                       so this is no loss unless someone is simultaneously at\n"
 "                       the real X display.\n"
@@ -3647,12 +3653,25 @@ void print_help(int mode) {
 "                       -sig ignore:INT,TERM,exit:USR1\n"
 "\n"
 "-threads               Whether or not to use the threaded libvncserver\n"
-"-nothreads             algorithm [rfbRunEventLoop] if libpthread is available\n"
-"                       Default: %s.  NOTE:  The -threads mode is now\n"
-"                       disabled due to its unstable behavior.  Not recommended,\n"
-"                       but you can recompile with -DX11VNC_THREADED in\n"
-"                       CPPFLAGS if you need to use it.  You can also set the\n"
-"                       env. variable X11VNC_THREADED=1\n"
+"-nothreads             algorithm [rfbRunEventLoop] if libpthread is available.\n"
+"                       In this mode new threads (one for input and one\n"
+"                       for output) are created to handle each new client.\n"
+"                       Default: %s.\n"
+"\n"
+"                       NOTE:  The -threads mode may be disabled due to its\n"
+"                       unstable behavior.  If it is disabled, a warning is\n"
+"                       printed out.  Stability has been improved in version\n"
+"                       0.9.8 and so the feature has been re-enabled.\n"
+"\n"
+"                       Multiple clients in threaded mode should be stable\n"
+"                       for the ZRLE encoding on all platforms.  The Tight and\n"
+"                       Zlib encodings are currently only stable on Linux for\n"
+"                       multiple clients.  Compile with -DTLS=__thread if your\n"
+"                       OS and compiler and linker support it.\n"
+"\n"
+"                       Multiple clients in threaded mode could yield better\n"
+"                       performance for 'class-room' broadcasting usage.\n"
+"                       See also the -reflect option.\n"
 "\n"
 "-fs f                  If the fraction of changed tiles in a poll is greater\n"
 "                       than f, the whole screen is updated.  Default: %.2f\n"