x11vnc: -8to24 now works on default depth 8 displays.

1 files changed, 19 insertions, 12 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index cbd8870..a482de5 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -98,6 +98,7 @@ void print_help(int mode) {
 "\n"
 "-flashcmap             In 8bpp indexed color, let the installed colormap flash\n"
 "                       as the pointer moves from window to window (slow).\n"
+"                       Also try the -8to24 option to avoid flash altogether.\n"
 "-shiftcmap n           Rare problem, but some 8bpp displays use less than 256\n"
 "                       colorcells (e.g. 16-color grayscale, perhaps the other\n"
 "                       bits are used for double buffering) *and* also need to\n"
@@ -150,8 +151,10 @@ void print_help(int mode) {
 "-8to24                 If -overlay is not supported on your OS, and you have a\n"
 "                       legacy 8bpp app that you want to view on a multi-depth\n"
 "                       display with default depth 24 (and is 32 bpp), try\n"
-"                       this option.  This option may not work on all X servers\n"
-"                       and hardware (tested on XFree86/Xorg mga driver).\n"
+"                       this option.  It will also work for a default depth 8\n"
+"                       display with depth 24 overlay windows.  This option\n"
+"                       may not work on all X servers and hardware (tested on\n"
+"                       XFree86/Xorg mga driver).\n"
 "\n"
 "                       It enables a hack where x11vnc monitors windows within 3\n"
 "                       levels from the root window.  If it finds any that are\n"
@@ -159,14 +162,22 @@ void print_help(int mode) {
 "                       these regions where it extracts the 8bpp index color\n"
 "                       value from bits 25-32 and maps them on to TrueColor\n"
 "                       values and inserts them into bits 1-24 (i.e. overwrites\n"
-"                       bits 1-24).  This method appears to work, but may still\n"
-"                       have bugs and note that it does hog resources.  If there\n"
+"                       bits 1-24).\n"
+"\n"
+"                       For default depth 8 displays, everything is tranformed\n"
+"                       to 32bpp (and is potentially a improvement over\n"
+"                       -flashcmap).  Also for default depth 8 displays, setting\n"
+"                       the env. var. HIGHBITS_8TO24 may give a speedup for\n"
+"                       transforming 8bpp pixel data.\n"
+"\n"
+"                       These schemes appear to work, but may still have\n"
+"                       bugs and note that they do hog resources.  If there\n"
 "                       are multiple 8bpp windows using different colormaps,\n"
 "                       one may have to iconify all but one for the colors to\n"
 "                       be correct.\n"
 "\n"
-"                       There may also be painting errors for clipping\n"
-"                       and switching between windows of depths 8 and 24.\n"
+"                       There may also be painting errors for clipping and\n"
+"                       switching between windows of depths 8 and 24.\n"
 "                       Heuristics are applied to try to minimize the painting\n"
 "                       errors.  One can also press 3 Alt_L's in a row to\n"
 "                       refresh the screen if the error does not repair itself.\n"
@@ -183,12 +194,8 @@ void print_help(int mode) {
 "                       a scheme were XGetImage() is used to retrieve the 8bpp\n"
 "                       data instead of assuming that data is in bits 25-32.\n"
 "                       This mode is significantly slower than the above mode.\n"
-"\n"
-"                       Note that -8to24 does not work on displays with 8bpp\n"
-"                       default visual with depth 24 applications.  The Xserver\n"
-"                       -cc option can be used to switch the default depth\n"
-"                       on multidepth setups.  It may be possible to handle\n"
-"                       this case.\n"
+"                       For the default depth 8 case, XGetImage() is always\n"
+"                       used to access depth 24 pixel data.\n"
 "\n"
 "-scale fraction        Scale the framebuffer by factor \"fraction\".  Values\n"
 "                       less than 1 shrink the fb, larger ones expand it.  Note:\n"