x11vnc: Mac OS X fb fixes and cuttext, -nodpms option, local user wireframing

1 files changed, 80 insertions, 34 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 78aeecf..ce2112c 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -839,7 +839,7 @@ void print_help(int mode) {
 "\n"
 "                       Your VNC viewer will also need to be able to connect\n"
 "                       via SSL.  See the discussion below under -stunnel and\n"
-"                       the FAQ (ssl_vncviewer script) for how this might be\n"
+"                       the FAQ (ss_vncviewer script) for how this might be\n"
 "                       achieved.  E.g. on Unix it is easy to write a shell\n"
 "                       script that starts up stunnel and then vncviewer.\n"
 "                       Also in the x11vnc source a SSL enabled Java VNC Viewer\n"
@@ -985,7 +985,7 @@ void print_help(int mode) {
 "                       be \"imported\" somehow.  Web browsers have \"Manage\n"
 "                       Certificates\" actions as does the Java applet plugin\n"
 "                       Control Panel.  stunnel can also use these files (see\n"
-"                       the ssl_vncviewer example script in the FAQ.)\n"
+"                       the ss_vncviewer example script in the FAQ.)\n"
 "\n"
 "-sslGenCA [dir]        Generate your own Certificate Authority private key,\n"
 "                       certificate, and other files in directory [dir].\n"
@@ -1126,14 +1126,14 @@ void print_help(int mode) {
 "                               x11vnc -sslGenCert server\n"
 "                               x11vnc -ssl SAVE -display :0 ...\n"
 "\n"
-"                       and then on viewer using ssl_vncviewer stunnel wrapper\n"
+"                       and then on viewer using ss_vncviewer stunnel wrapper\n"
 "                       (see the FAQ):\n"
 
-"                               ssl_vncviewer -verify ./cacert.crt hostname:0\n"
+"                               ss_vncviewer -verify ./cacert.crt hostname:0\n"
 "\n"
 "                       (this assumes the cacert.crt cert from -sslGenCA\n"
 "                       was safely copied to the VNC viewer machine where\n"
-"                       ssl_vncviewer is run)\n"
+"                       ss_vncviewer is run)\n"
 "\n"
 "                       Example using a name:\n"
 "\n"
@@ -1151,7 +1151,7 @@ void print_help(int mode) {
 "                       roger), and on the viewer user on somehost could do\n"
 "                       for example:\n"
 "\n"
-"                               ssl_vncviewer -mycert ./roger.pem hostname:0\n"
+"                               ss_vncviewer -mycert ./roger.pem hostname:0\n"
 "\n"
 "                       If you set the env. var REQ_ARGS='...' it will be\n"
 "                       passed to openssl req(1).  A common use would be\n"
@@ -2014,6 +2014,12 @@ void print_help(int mode) {
 "                       link is detected, these values may be automatically\n"
 "                       changed to something better for a slow link.\n"
 "\n"
+"-nowireframelocal      By default, mouse motion and button presses of a\n"
+"                       user sitting at the LOCAL display are monitored for\n"
+"                       wireframing opportunities (so that the changes will be\n"
+"                       sent efficiently to the VNC clients).  Use this option\n"
+"                       to disable this behavior.\n"
+"\n"
 "-wirecopyrect mode     Since the -wireframe mechanism evidently tracks moving\n"
 "-nowirecopyrect        windows accurately, a speedup can be obtained by\n"
 "                       telling the VNC viewers to locally copy the translated\n"
@@ -2432,6 +2438,27 @@ void print_help(int mode) {
 "                       for details.  -nofbpm is basically the same as running\n"
 "                       \"xset fbpm force on\" periodically.  Default: %s\n"
 "\n"
+"-nodpms                If the system supports the DPMS (Display Power Management\n"
+"-dpms                  Signaling) extension, then prevent the monitor from\n"
+"                       going into a reduced power state when VNC clients\n"
+"                       are connected.\n"
+"\n"
+"                       DPMS reduced power monitor states are a good thing\n"
+"                       and you normally want the power down to take place\n"
+"                       (usually x11vnc has no problem exporting the display in\n"
+"                       this state).  You probably only want to use \"-nodpms\"\n"
+"                       to work around problems with Screen Savers kicking\n"
+"                       on in DPMS low power states.  There is known problem\n"
+"                       with kdesktop_lock on KDE where the screen saver keeps\n"
+"                       kicking in every time user input stops for a second\n"
+"                       or two.  Specifying \"-nodpms\" works around it.\n"
+"\n"
+"                       \"-nodpms\" means prevent DPMS low power states whenever\n"
+"                       VNC clients are connected, while \"-dpms\" means to not\n"
+"                       monitor the DPMS state at all.  See the xset(1) manpage\n"
+"                       for details.  -nodpms is basically the same as running\n"
+"                       \"xset dpms force on\" periodically.  Default: %s\n"
+"\n"
 "-noxdamage             Do not use the X DAMAGE extension to detect framebuffer\n"
 "                       changes even if it is available.  Use -xdamage if your\n"
 "                       default is to have it off.\n"
@@ -2547,6 +2574,11 @@ void print_help(int mode) {
 "                       memory object.  If the masks are not provided x11vnc\n"
 "                       guesses them based on the bpp.\n"
 "\n"
+"                       Another optional suffix is the Bytes Per Line which in\n"
+"                       some cases is not WxHxB/4.  Specify it as WxHxB-BPL\n"
+"                       e.g. 800x600x16-2048.  This could be a normal width\n"
+"                       1024 at 16bpp fb, but only width 800 shows up.\n"
+"\n"
 "                       Examples:\n"
 "                           -rawfb shm:210337933@800x600x32:ff/ff00/ff0000\n"
 "                           -rawfb map:/dev/fb0@1024x768x32\n"
@@ -2851,6 +2883,15 @@ void print_help(int mode) {
 "-macnodim              For the native Mac OS X server, disable dimming. \n"
 "-macnosleep            For the native Mac OS X server, disable display sleep.\n"
 "-macnosaver            For the native Mac OS X server, disable screensaver.\n"
+"-macnowait             For the native Mac OS X server, do not wait for the\n"
+"                       user to switch back to his display.\n"
+"-macwheel n            For the native Mac OS X server, set the mouse wheel\n"
+"                       speed to n (default 5).\n"
+"-macnoswap             For the native Mac OS X server, do not swap mouse\n"
+"                       buttons 2 and 3.\n"
+"-macnoresize           For the native Mac OS X server, do not resize or reset\n"
+"                       the framebuffer even if it is detected that the screen\n"
+"                       resolution or depth has changed.\n"
 "\n"
 "-gui [gui-opts]        Start up a simple tcl/tk gui based on the the remote\n"
 "                       control options -remote/-query described below.\n"
@@ -3165,6 +3206,8 @@ void print_help(int mode) {
 "                       nowireframe     disable -wireframe mode. same as \"nowf\"\n"
 "                       wireframe:str   enable  -wireframe mode string.\n"
 "                       wireframe_mode:str enable  -wireframe mode string.\n"
+"                       wireframelocal  enable  wireframelocal. same as \"wfl\"\n"
+"                       nowireframe     disable wireframelocal. same as \"nowfl\"\n"
 "                       wirecopyrect:str set -wirecopyrect string. same as \"wcr:\"\n"
 "                       scrollcopyrect:str set -scrollcopyrect string. same \"scr\"\n"
 "                       noscrollcopyrect disable -scrollcopyrect mode. \"noscr\"\n"
@@ -3202,6 +3245,8 @@ void print_help(int mode) {
 "                       sb:n            set -sb to n s, same as screen_blank:n\n"
 "                       fbpm            disable -nofbpm mode.\n"
 "                       nofbpm          enable  -nofbpm mode.\n"
+"                       dpms            disable -nodpms mode.\n"
+"                       nodpms          enable  -nodpms mode.\n"
 "                       xdamage         enable  xdamage polling hints.\n"
 "                       noxdamage       disable xdamage polling hints.\n"
 "                       xd_area:A       set -xd_area max pixel area to \"A\"\n"
@@ -3297,35 +3342,36 @@ void print_help(int mode) {
 "                       listen lookup nolookup accept afteraccept gone shm\n"
 "                       noshm flipbyteorder noflipbyteorder onetile noonetile\n"
 "                       solid_color solid nosolid blackout xinerama noxinerama\n"
-"                       xtrap noxtrap xrandr noxrandr xrandr_mode rotate\n"
-"                       padgeom quiet q noquiet modtweak nomodtweak xkb noxkb\n"
-"                       capslock nocapslock skip_lockkeys noskip_lockkeys\n"
-"                       skip_keycodes sloppy_keys nosloppy_keys skip_dups\n"
-"                       noskip_dups add_keysyms noadd_keysyms clear_mods\n"
-"                       noclear_mods clear_keys noclear_keys remap repeat\n"
-"                       norepeat fb nofb bell nobell sel nosel primary\n"
-"                       noprimary setprimary nosetprimary clipboard noclipboard\n"
-"                       setclipboard nosetclipboard seldir cursorshape\n"
-"                       nocursorshape cursorpos nocursorpos cursor_drag\n"
-"                       nocursor_drag cursor show_cursor noshow_cursor\n"
-"                       nocursor arrow xfixes noxfixes xdamage noxdamage\n"
-"                       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"
-"                       nowf wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
+"                       xtrap noxtrap xrandr noxrandr xrandr_mode rotate padgeom\n"
+"                       quiet 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 remap repeat norepeat fb nofb\n"
+"                       bell nobell sel nosel primary noprimary setprimary\n"
+"                       nosetprimary clipboard noclipboard setclipboard\n"
+"                       nosetclipboard seldir cursorshape nocursorshape\n"
+"                       cursorpos nocursorpos cursor_drag nocursor_drag cursor\n"
+"                       show_cursor noshow_cursor nocursor arrow xfixes noxfixes\n"
+"                       xdamage noxdamage xd_area xd_mem alphacut alphafrac\n"
+"                       alpharemove noalpharemove alphablend noalphablend\n"
+"                       xwarppointer xwarp noxwarppointer noxwarp buttonmap\n"
+"                       dragging nodragging wireframe_mode wireframe wf\n"
+"                       nowireframe nowf wireframelocal wfl nowireframelocal\n"
+"                       nowfl wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
 "                       scr_skip scr_inc scr_keys scr_term scr_keyrepeat\n"
 "                       scr_parms scrollcopyrect scr noscrollcopyrect noscr\n"
-"                       fixscreen noxrecord xrecord reset_record pointer_mode pm\n"
-"                       input_skip allinput noallinput input grabkbd nograbkbd\n"
-"                       grabptr nograbptr client_input ssltimeout speeds wmdt\n"
-"                       debug_pointer dp nodebug_pointer nodp debug_keyboard\n"
-"                       dk nodebug_keyboard nodk deferupdate defer wait_ui\n"
-"                       wait_bog nowait_bog slow_fb wait readtimeout nap nonap\n"
-"                       sb screen_blank fbpm nofbpm fs gaps grow fuzz snapfb\n"
-"                       nosnapfb rawfb uinput_accel uinput_thresh uinput_reset\n"
-"                       uinput_always progressive rfbport http nohttp httpport\n"
-"                       httpdir enablehttpproxy noenablehttpproxy alwaysshared\n"
+"                       fixscreen noxrecord xrecord reset_record pointer_mode\n"
+"                       pm input_skip allinput noallinput input grabkbd\n"
+"                       nograbkbd grabptr nograbptr client_input ssltimeout\n"
+"                       speeds wmdt debug_pointer dp nodebug_pointer nodp\n"
+"                       debug_keyboard dk nodebug_keyboard nodk deferupdate\n"
+"                       defer wait_ui wait_bog nowait_bog slow_fb wait\n"
+"                       readtimeout nap nonap sb screen_blank fbpm nofbpm\n"
+"                       dpms nodpms fs gaps grow fuzz snapfb nosnapfb rawfb\n"
+"                       uinput_accel uinput_thresh uinput_reset uinput_always\n"
+"                       progressive rfbport http nohttp httpport httpdir\n"
+"                       enablehttpproxy noenablehttpproxy alwaysshared\n"
 "                       noalwaysshared nevershared noalwaysshared dontdisconnect\n"
 "                       nodontdisconnect desktop debug_xevents nodebug_xevents\n"
 "                       debug_xevents debug_xdamage nodebug_xdamage\n"
@@ -3350,7 +3396,6 @@ void print_help(int mode) {
 "                       mouse_x mouse_y bpp depth indexed_color dpy_x dpy_y\n"
 "                       wdpy_x wdpy_y off_x off_y cdpy_x cdpy_y coff_x coff_y\n"
 "                       rfbauth passwd viewpasswd\n"
-"\n"
 "-QD variable           Just like -query variable, but returns the default\n"
 "                       value for that parameter (no running x11vnc server\n"
 "                       is consulted)\n"
@@ -3497,6 +3542,7 @@ void print_help(int mode) {
 		take_naps ? "take naps":"no naps",
 		screen_blank,
 		watch_fbpm ? "-nofbpm":"-fbpm",
+		watch_dpms ? "-nodpms":"-dpms",
 		xdamage_max_area, NSCAN, xdamage_memory,
 		use_threads ? "-threads":"-nothreads",
 		fs_frac,