x11vnc: -8to24 opts, use XGetSubImage. fix -threads deadlocks and -rawfb crash

1 files changed, 51 insertions, 46 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index a482de5..3e1d019 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -148,27 +148,24 @@ void print_help(int mode) {
 "-overlay_nocursor      Sets -overlay, but does not try to draw the exact mouse\n"
 "                       cursor shape using the overlay mechanism.\n"
 "\n"
-"-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.  It will also work for a default depth 8\n"
-"                       display with depth 24 overlay windows.  This option\n"
+"-8to24 [opts]          Try this option if -overlay is not supported on your\n"
+"                       OS, and you have a legacy 8bpp app that you want to\n"
+"                       view on a multi-depth display with default depth 24\n"
+"                       (and is 32 bpp) or have default depth 8 display with\n"
+"                       depth 24 overlay windows for some apps.  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"
-"                       8bpp it will apply a transformation for pixel data in\n"
-"                       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).\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"
+"                       XFree86/Xorg mga driver).  The \"opts\" string is not\n"
+"                       required and is described below.\n"
+"\n"
+"                       This mode enables a hack where x11vnc monitors windows\n"
+"                       within 3 levels from the root window.  If it finds\n"
+"                       any that are 8bpp it will apply a transformation for\n"
+"                       pixel data in these regions where it extracts the 8bpp\n"
+"                       index color value from bits 25-32 and maps them on\n"
+"                       to TrueColor values and inserts them into bits 1-24\n"
+"                       (i.e. overwrites bits 1-24).  Whereas for default\n"
+"                       depth 8 displays, everything is tranformed to 32bpp\n"
+"                       (and is potentially a improvement over -flashcmap).\n"
 "\n"
 "                       These schemes appear to work, but may still have\n"
 "                       bugs and note that they do hog resources.  If there\n"
@@ -185,17 +182,24 @@ void print_help(int mode) {
 "                       to periodically refresh the screen (at the cost of\n"
 "                       bandwidth).\n"
 "\n"
-"                       Debugging for this mode can be enabled by setting the\n"
-"                       environment variable DEBUG_8TO24 to 1, 2, or 3.\n"
+"                       The [opts] string can contain the following settings.\n"
+"                       Multiple settings are separated by commas.\n"
 "\n"
-"                       If there are problems, to enable an even more\n"
-"                       experimental mode, set the environment variable\n"
-"                       XGETIMAGE_8TO24=1 before starting x11vnc.  This enables\n"
-"                       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"
-"                       For the default depth 8 case, XGetImage() is always\n"
-"                       used to access depth 24 pixel data.\n"
+"                       For when there are still color problems, enable an even\n"
+"                       more experimental mode via the option \"getimage\".\n"
+"                       This enables a scheme were XGetImage() is used to\n"
+"                       retrieve the 8bpp data instead of assuming that data\n"
+"                       is in bits 25-32.  This mode is significantly slower\n"
+"                       than the above mode.  For the default depth 8 case,\n"
+"                       XGetImage() is always used to access depth 24 pixel\n"
+"                       data.\n"
+"\n"
+"                       For default depth 8 displays, setting option\n"
+"                       \"highbits\" may give a speedup for transforming 8bpp\n"
+"                       pixel data.\n"
+"\n"
+"                       Debugging for this mode can be enabled by setting \n"
+"                       \"dbg=1\", \"dbg=2\", or \"dbg=3\"\n"
 "\n"
 "-scale fraction        Scale the framebuffer by factor \"fraction\".  Values\n"
 "                       less than 1 shrink the fb, larger ones expand it.  Note:\n"
@@ -1642,6 +1646,7 @@ void print_help(int mode) {
 "                                        nooverlay_cursor.\n"
 "                       8to24           enable  -8to24 mode (if applicable).\n"
 "                       no8to24         disable -8to24 mode.\n"
+"                       8to24_opts:str  set the -8to24 opts to \"str\".\n"
 "                       visual:vis      set -visual to \"vis\"\n"
 "                       scale:frac      set -scale to \"frac\"\n"
 "                       scale_cursor:f  set -scale_cursor to \"f\"\n"
@@ -1902,22 +1907,22 @@ void print_help(int mode) {
 "                       truecolor notruecolor overlay nooverlay overlay_cursor\n"
 "                       overlay_yescursor nooverlay_nocursor nooverlay_cursor\n"
 "                       nooverlay_yescursor overlay_nocursor 8to24 no8to24\n"
-"                       visual scale scale_cursor viewonly noviewonly shared\n"
-"                       noshared forever noforever once timeout filexfer deny\n"
-"                       lock nodeny unlock connect allowonce allow localhost\n"
-"                       nolocalhost listen lookup nolookup accept afteraccept\n"
-"                       gone shm noshm flipbyteorder noflipbyteorder onetile\n"
-"                       noonetile solid_color solid nosolid blackout xinerama\n"
-"                       noxinerama xtrap noxtrap xrandr noxrandr xrandr_mode\n"
-"                       padgeom quiet q noquiet modtweak nomodtweak xkb\n"
-"                       noxkb 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"
-"                       remap repeat norepeat fb nofb bell nobell sel nosel\n"
-"                       primary noprimary seldir cursorshape nocursorshape\n"
-"                       cursorpos nocursorpos cursor show_cursor noshow_cursor\n"
-"                       nocursor arrow xfixes noxfixes xdamage noxdamage\n"
-"                       xd_area xd_mem alphacut alphafrac alpharemove\n"
+"                       8to24_opts visual scale scale_cursor viewonly\n"
+"                       noviewonly shared noshared forever noforever once\n"
+"                       timeout filexfer deny lock nodeny unlock connect\n"
+"                       allowonce allow localhost nolocalhost listen lookup\n"
+"                       nolookup 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 padgeom quiet q noquiet\n"
+"                       modtweak nomodtweak xkb noxkb skip_keycodes sloppy_keys\n"
+"                       nosloppy_keys skip_dups noskip_dups add_keysyms\n"
+"                       noadd_keysyms clear_mods noclear_mods clear_keys\n"
+"                       noclear_keys remap repeat norepeat fb nofb bell\n"
+"                       nobell sel nosel primary noprimary seldir cursorshape\n"
+"                       nocursorshape cursorpos nocursorpos cursor show_cursor\n"
+"                       noshow_cursor nocursor arrow xfixes noxfixes xdamage\n"
+"                       noxdamage xd_area xd_mem alphacut alphafrac alpharemove\n"
 "                       noalpharemove alphablend noalphablend xwarppointer\n"
 "                       xwarp noxwarppointer noxwarp buttonmap dragging\n"
 "                       nodragging wireframe_mode wireframe wf nowireframe\n"