Workaround for inane X_ShmAttach incompatibility in Xorg, -solid support in xfce, showrfbauth option.

1 files changed, 18 insertions, 12 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index d16f98a..fadcf32 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -781,6 +781,9 @@ void print_help(int mode) {
 "                       and last line be \"__BEGIN_VIEWONLY__\" to have 2\n"
 "                       full-access passwords)\n"
 "\n"
+"-showrfbauth filename  Print to the screen the obscured VNC password kept in\n"
+"                       the rfbauth file \"filename\" and then exit.\n"
+"\n"
 "-unixpw [list]         Use Unix username and password authentication.  x11vnc\n"
 "                       will use the su(1) program to verify the user's\n"
 "                       password.  [list] is an optional comma separated list\n"
@@ -2576,15 +2579,18 @@ void print_help(int mode) {
 "                       e.g. \"darkblue\" or numerical \"#RRGGBB\").\n"
 "\n"
 "                       Currently this option only works on GNOME, KDE, CDE,\n"
-"                       and classic X (i.e. with the background image on the\n"
-"                       root window).  The \"gconftool-2\" and \"dcop\" external\n"
-"                       commands are run for GNOME and KDE respectively.\n"
-"                       Other desktops won't work, e.g. Xfce (send us the\n"
-"                       corresponding commands if you find them).  If x11vnc is\n"
-"                       running as root (inetd(8) or gdm(1)), the -users option\n"
-"                       may be needed for GNOME and KDE.  If x11vnc guesses\n"
-"                       your desktop incorrectly, you can force it by prefixing\n"
-"                       color with \"gnome:\", \"kde:\", \"cde:\" or \"root:\".\n"
+"                       XFCE, and classic X (i.e. with the background image\n"
+"                       on the root window).  The \"gconftool-2\", \"dcop\"\n"
+"                       and \"xfconf-query\" external commands are run for\n"
+"                       GNOME, KDE, and XFCE respectively.  This also works\n"
+"                       on native MacOSX.  (There is no color selection for\n"
+"                       MacOSX or XFCE.)  Other desktops won't work, (send\n"
+"                       us the corresponding commands if you find them).\n"
+"                       If x11vnc is running as root (inetd(8) or gdm(1)),\n"
+"                       the -users option may be needed for GNOME, KDE, XFCE.\n"
+"                       If x11vnc guesses your desktop incorrectly, you can\n"
+"                       force it by prefixing color with \"gnome:\", \"kde:\",\n"
+"                       \"cde:\", \"xfce:\", or \"root:\".\n"
 "\n"
 "                       This mode works in a limited way on the Mac OS X Console\n"
 "                       with one color ('kelp') using the screensaver writing\n"
@@ -5094,9 +5100,9 @@ void print_help(int mode) {
 "                       macnomenu nomacmenu macuskbd nomacuskbd noremote\n"
 "\n"
 "                       aro=  noop display vncdisplay autoport loop loopbg\n"
-"                       desktopname guess_desktop http_url auth xauth\n"
-"                       users rootshift clipshift scale_str scaled_x\n"
-"                       scaled_y scale_numer scale_denom scale_fac_x\n"
+"                       desktopname guess_desktop guess_dbus http_url\n"
+"                       auth xauth users rootshift clipshift scale_str\n"
+"                       scaled_x scaled_y scale_numer scale_denom scale_fac_x\n"
 "                       scale_fac_y scaling_blend scaling_nomult4 scaling_pad\n"
 "                       scaling_interpolate inetd privremote unsafe safer\n"
 "                       nocmds passwdfile unixpw unixpw_nis unixpw_list ssl\n"