x11vnc: small changes for 0.9 release.

5 files changed, 90 insertions, 283 deletions

diff --git a/x11vnc/README b/x11vnc/README
index 97a6664..92f7bff 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -1,5 +1,5 @@
 
-x11vnc README file                         Date: Fri Apr  6 23:19:54 EDT 2007
+x11vnc README file                         Date: Wed Apr 18 18:46:50 EDT 2007
 
 The following information is taken from these URLs:
 
@@ -403,7 +403,7 @@ vncviewer -via $host localhost:0      # must be TightVNC vncviewer.
 
    The x11vnc package is the subset of the libvncserver package needed to
    build the x11vnc program. Also, you can get a copy of my latest,
-   bleeding edge [72]x11vnc-0.8.5.tar.gz tarball to build the most up to
+   bleeding edge [72]x11vnc-0.9.tar.gz tarball to build the most up to
    date one.
 
    Precompiled Binaries/Packages:  See the [73]FAQ below for information
@@ -553,17 +553,17 @@ ZLIB=/path/to/zlib      # set to maybe "/usr/local", "/usr/sfw", or "/opt/sfw"
 # is different change the locations in the two lines below.
 #
 CPPFLAGS="-I $JPEG/include -I $ZLIB/include"
-LDFLAGS="-L $JPEG/lib -R $JPEG/lib -L $ZLIB/lib -R $ZLIB/lib"
+LDFLAGS="-L$JPEG/lib -R $JPEG/lib -L$ZLIB/lib -R $ZLIB/lib"
 
 # These two lines may not be needed on more recent Solaris releases:
 #
 CPPFLAGS="$CPPFLAGS -I /usr/openwin/include"
-LDFLAGS="$LDFLAGS -L /usr/openwin/lib -R /usr/openwin/lib"
+LDFLAGS="$LDFLAGS -L/usr/openwin/lib -R /usr/openwin/lib"
 
 # These are for libXrandr.so on Solaris 10:
 #
 CPPFLAGS="$CPPFLAGS -I /usr/X11/include"
-LDFLAGS="$LDFLAGS -L /usr/X11/lib -R /usr/X11/lib"
+LDFLAGS="$LDFLAGS -L/usr/X11/lib -R /usr/X11/lib"
 
 # Everything needs to built with _REENTRANT for thread safe errno:
 #
@@ -660,11 +660,10 @@ make
    Thanks to those who suggested features and helped beta test x11vnc
    0.8.4 released in Feb 2007!
 
-   Please help test and debug the 0.8.5 version for release sometime in
+   Please help test and debug the 0.9 version for release sometime in
    Spring 2007.
 
-   The version 0.8.5 beta tarball is kept here:
-   [91]x11vnc-0.8.5.tar.gz
+   The version 0.9 beta tarball is kept here:    [91]x11vnc-0.9.tar.gz
 
    There are also some Linux, Solaris, Mac OS X, and other OS test
    binaries [92]here. Please kick the tires and report bugs, performance
@@ -679,7 +678,7 @@ make
    [97]Enhanced TightVNC Viewer (SSVNC) page.
 
 
-   Here are some features that will appear in the 0.8.5 release:
+   Here are some features that will appear in the 0.9 release:
      * [98]Viewer-side pixmap caching. This one will benefit from much
        testing. A large area of pixels (at least 2-3 times as big as the
        framebuffer itself; the bigger the better... default is 12X) is
@@ -4887,7 +4886,7 @@ EndSection
    that pixel data is needed again it does not have to be retransmitted
    over the network.
 
-   As of Dec/2006 in the [631]0.8.5 development tarball there is an
+   As of Dec/2006 in the [631]0.9 development tarball there is an
    experimental client-side caching implementation enabled by the
    "[632]-ncache n" option. In fact, during the test period at least it
    is on by default with n set to 12. To disable it use "-noncache".
@@ -6451,7 +6450,7 @@ EndSection
 
    Building:  If you don't have the X11 build and runtime packages
    installed you will need to build it like this:
-   (cd to the x11vnc-0.8.5, etc, source directory)
+   (cd to the x11vnc-0.9, etc, source directory)
    ./configure --without-x
    make
 
@@ -7321,7 +7320,7 @@ References
   69. http://sourceforge.net/projects/libvncserver/
   70. http://sourceforge.net/project/showfiles.php?group_id=32584&package_id=119006&release_id=483129
   71. http://sourceforge.net/project/shownotes.php?release_id=483129&group_id=32584
-  72. http://www.karlrunge.com/x11vnc/x11vnc-0.8.5.tar.gz
+  72. http://www.karlrunge.com/x11vnc/x11vnc-0.9.tar.gz
   73. http://www.karlrunge.com/x11vnc/index.html#faq-binaries
   74. http://www.tightvnc.com/download.html
   75. http://www.realvnc.com/download-free.html
@@ -7340,7 +7339,7 @@ References
   88. http://www.karlrunge.com/x11vnc/index.html#faq-solaris251build
   89. http://www.karlrunge.com/x11vnc/index.html#faq-macosx
   90. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
-  91. http://www.karlrunge.com/x11vnc/x11vnc-0.8.5.tar.gz
+  91. http://www.karlrunge.com/x11vnc/x11vnc-0.9.tar.gz
   92. http://www.karlrunge.com/x11vnc/bins
   93. mailto:xvml-beta@karlrunge.com
   94. http://www.karlrunge.com/x11vnc/index.html#faq-ssl-tunnel-int
@@ -9708,10 +9707,10 @@ Enhanced TightVNC Viewer   (SSVNC: SSL/SSH VNC viewer)
      * Fix for Popup menu positioning for old window managers (-popupfix
        option).
      * Improvements to the Popup menu, all of these can now be changed
-       dynamically via the menu: ViewOnly, CursorShape updates, X11
-       Cursor, Cursor Alphablending, Toggle Tight/ZRLE, Toggle JPEG,
-       Toggle Greyscale, FullColor/16bpp/8bpp (256/64/8 colors) without
-       having to restart the viewer.
+       dynamically via the menu: ViewOnly, Toggle Bell, CursorShape
+       updates, X11 Cursor, Cursor Alphablending, Toggle Tight/ZRLE,
+       Toggle JPEG, FullColor/16bpp/8bpp (256/64/8 colors), Greyscale for
+       low color modes.
      * Support for UltraVNC extensions: Single Window, Disable
        Server-side Input, 1/n Server side scaling, Text Chat (shell
        terminal UI). Both UltraVNC and x11vnc servers support these
@@ -9739,7 +9738,7 @@ Unix and Mac OS X:
 
     Unpack the archive:
 
-        % gzip -dc ssvnc-1.0.14.tar.gz | tar xvf -
+        % gzip -dc ssvnc-1.0.15.tar.gz | tar xvf -
 
     Run the GUI:
 
@@ -9747,7 +9746,7 @@ Unix and Mac OS X:
 
         % ./ssvnc/MacOSX/ssvnc       (for Mac OS X)
 
-    The smaller file "ssvnc_no_windows-1.0.14.tar.gz" could have been
+    The smaller file "ssvnc_no_windows-1.0.15.tar.gz" could have been
     used as well.
 
     On MacOSX there is also a SSVNC.app directory icon you can click on
@@ -9758,7 +9757,7 @@ Windows:
 
     Unzip, using WinZip or a similar utility, the zip file:
 
-        ssvnc-1.0.14.zip
+        ssvnc-1.0.15.zip
 
     Run the GUI, e.g.:
 
@@ -9770,7 +9769,7 @@ Windows:
 
     select Open, and then OK to launch it.
 
-    The smaller file "ssvnc_windows_only-1.0.14.zip" could have been used
+    The smaller file "ssvnc_windows_only-1.0.15.zip" could have been used
     as well.
 
     You can make a Windows shortcut to this program if you want to.
@@ -9792,6 +9791,9 @@ C:
 cd \ssvnc\Windows
 ssvnc.exe
 
+   Update: A simple workaround is now in place were it will copy
+   everything to a cache directory ss_vnc/cache in your Windows home
+   directory and run out of there.
      _________________________________________________________________
 
    The bundle unpacks a directory/folder named: ssvnc. It contains these
@@ -9983,23 +9985,23 @@ Enhanced TightVNC viewer (SSVNC) options:
    Downloading: This project can be downloaded here, choose the archive
    file bundle that best suits you (e.g. no source code, windows only,
    unix only, zip, tar etc):
-  [14]ssvnc_windows_only-1.0.14.zip      Windows Binaries Only.  No source incl
+  [14]ssvnc_windows_only-1.0.15.zip      Windows Binaries Only.  No source incl
 uded (~6MB)
-  [15]ssvnc_no_windows-1.0.14.tar.gz     Unix and Mac OS X Only. No Windows bin
+  [15]ssvnc_no_windows-1.0.15.tar.gz     Unix and Mac OS X Only. No Windows bin
 aries.  Source included. (~6MB)
-  [16]ssvnc_unix_only-1.0.14.tar.gz      Unix Binaries Only.     No source incl
+  [16]ssvnc_unix_only-1.0.15.tar.gz      Unix Binaries Only.     No source incl
 uded. (~3.5MB)
-  [17]ssvnc_unix_minimal-1.0.14.tar.gz   Unix Minimal.  You must supply your ow
+  [17]ssvnc_unix_minimal-1.0.15.tar.gz   Unix Minimal.  You must supply your ow
 n vncviewer and stunnel. (~0.1MB)
 
-  [18]ssvnc-1.0.14.tar.gz                All Unix, Mac OS X, and Windows binari
+  [18]ssvnc-1.0.15.tar.gz                All Unix, Mac OS X, and Windows binari
 es and source TGZ. (~11MB)
-  [19]ssvnc-1.0.14.zip                   All Unix, Mac OS X, and Windows binari
+  [19]ssvnc-1.0.15.zip                   All Unix, Mac OS X, and Windows binari
 es and source ZIP. (~11MB)
-  [20]ssvnc_all-1.0.14.zip               All Unix, Mac OS X, and Windows binari
+  [20]ssvnc_all-1.0.15.zip               All Unix, Mac OS X, and Windows binari
 es and source AND full archives in the zip dir. (~15MB)
 
-   You can try for an older one by replacing, e.g. ".14" by ".11", etc.
+   You can try for an older one by replacing, e.g. ".15" by ".11", etc.
 
    Sorry for the inconvenience of lumping all the Unix binaries and
    source together in one archive. To save space you can delete the src
@@ -10175,9 +10177,15 @@ The enhanced TightVNC viewer features are:
           (-popupfix option).
 
         - Improvements to the Popup menu, all of these can now be changed
-          dynamically via the menu: ViewOnly, CursorShape updates, X11
-          Cursor, Cursor Alphablending, Toggle Tight/ZRLE, Toggle JPEG,
-          FullColor/16bpp/8bpp (256/64/8 colors).
+          dynamically via the menu: ViewOnly, Toggle Bell, CursorShape
+          updates, X11 Cursor, Cursor Alphablending, Toggle Tight/ZRLE,
+          Toggle JPEG, FullColor/16bpp/8bpp (256/64/8 colors), Greyscale
+          for low color modes.
+
+        - Support for UltraVNC extensions: Single Window, Disable
+          Server-side Input, 1/n Server side scaling, Text Chat (shell
+          terminal UI). Both UltraVNC and x11vnc servers support these
+          extensions
 
         - Run vncviewer -help for all options.
 
@@ -10206,7 +10214,7 @@ Unix and Mac OS X:
 
     Unpack the archive:
 
-        % gzip -dc ssvnc-1.0.14.tar.gz | tar xvf -
+        % gzip -dc ssvnc-1.0.15.tar.gz | tar xvf -
 
     Run the GUI:
 
@@ -10216,7 +10224,7 @@ Unix and Mac OS X:
 
     On MacOSX you could also click on the SSVNC app in the Finder.
 
-    The smaller file "ssvnc_no_windows-1.0.14.tar.gz"
+    The smaller file "ssvnc_no_windows-1.0.15.tar.gz"
     could have been used as well.
 
     On MacOSX there is also a SSVNC.app directory icon you can click on
@@ -10227,7 +10235,7 @@ Windows:
 
     Unzip, using WinZip or a similar utility, the zip file:
 
-        ssvnc-1.0.14.zip
+        ssvnc-1.0.15.zip
 
     Run the GUI, e.g.:
 
@@ -10239,7 +10247,7 @@ Windows:
 
     select Open, and then OK to launch it.
 
-    The smaller file "ssvnc_windows_only-1.0.14.zip"
+    The smaller file "ssvnc_windows_only-1.0.15.zip"
     could have been used as well.
 
     You can make a Windows shortcut to this program if you want to.
@@ -10484,13 +10492,13 @@ References
   11. http://www.karlrunge.com/x11vnc/index.html#faq-smb-shares
   12. http://www.karlrunge.com/x11vnc/index.html#faq-cups
   13. http://www.karlrunge.com/x11vnc/index.html#faq-sound
-  14. http://www.karlrunge.com/x11vnc/etv/ssvnc_windows_only-1.0.14.zip
-  15. http://www.karlrunge.com/x11vnc/etv/ssvnc_no_windows-1.0.14.tar.gz
-  16. http://www.karlrunge.com/x11vnc/etv/ssvnc_unix_only-1.0.14.tar.gz
-  17. http://www.karlrunge.com/x11vnc/etv/ssvnc_unix_minimal-1.0.14.tar.gz
-  18. http://www.karlrunge.com/x11vnc/etv/ssvnc-1.0.14.tar.gz
-  19. http://www.karlrunge.com/x11vnc/etv/ssvnc-1.0.14.zip
-  20. http://www.karlrunge.com/x11vnc/etv/ssvnc_all-1.0.14.zip
+  14. http://www.karlrunge.com/x11vnc/etv/ssvnc_windows_only-1.0.15.zip
+  15. http://www.karlrunge.com/x11vnc/etv/ssvnc_no_windows-1.0.15.tar.gz
+  16. http://www.karlrunge.com/x11vnc/etv/ssvnc_unix_only-1.0.15.tar.gz
+  17. http://www.karlrunge.com/x11vnc/etv/ssvnc_unix_minimal-1.0.15.tar.gz
+  18. http://www.karlrunge.com/x11vnc/etv/ssvnc-1.0.15.tar.gz
+  19. http://www.karlrunge.com/x11vnc/etv/ssvnc-1.0.15.zip
+  20. http://www.karlrunge.com/x11vnc/etv/ssvnc_all-1.0.15.zip
   21. http://www.karlrunge.com/x11vnc/etv/ssvnc
   22. http://www.stunnel.org/
   23. http://stunnel.mirt.net/
@@ -10511,7 +10519,7 @@ x11vnc: a VNC server for real X displays
    Here are all of x11vnc command line options:
 % x11vnc -opts      (see below for -help long descriptions)
 
-x11vnc: allow VNC connections to real X11 displays. 0.8.5 lastmod: 2007-04-06
+x11vnc: allow VNC connections to real X11 displays. 0.9 lastmod: 2007-04-18
 
 x11vnc options:
   -display disp            -auth file               -N                     
@@ -10560,38 +10568,35 @@ x11vnc options:
   -alphacut n              -alphafrac fraction      -alpharemove           
   -noalphablend            -nocursorshape           -cursorpos             
   -nocursorpos             -xwarppointer            -noxwarppointer        
-  -buttonmap string        -nodragging              -ncache n              
-  -ncache_cr               -ncache_no_moveraise     -ncache_no_dtchange    
-  -ncache_no_rootpixmap    -ncache_keep_anims       -ncache_old_wm         
-  -ncache_pad n            -wireframe [str]         -nowireframe           
-  -nowireframelocal        -wirecopyrect mode       -nowirecopyrect        
-  -debug_wireframe         -scrollcopyrect mode     -noscrollcopyrect      
-  -scr_area n              -scr_skip list           -scr_inc list          
-  -scr_keys list           -scr_term list           -scr_keyrepeat lo-hi   
-  -scr_parms string        -fixscreen string        -debug_scroll          
-  -noxrecord               -grab_buster             -nograb_buster         
-  -debug_grabs             -debug_sel               -pointer_mode n        
-  -input_skip n            -allinput                -speeds rd,bw,lat      
-  -wmdt string             -debug_pointer           -debug_keyboard        
-  -defer time              -wait time               -wait_ui factor        
-  -nowait_bog              -slow_fb time            -readtimeout n         
-  -nap                     -nonap                   -sb time               
-  -nofbpm                  -fbpm                    -nodpms                
-  -dpms                    -forcedpms               -clientdpms            
-  -noserverdpms            -noultraext              -noxdamage             
-  -xd_area A               -xd_mem f                -sigpipe string        
-  -threads                 -nothreads               -fs f                  
-  -gaps n                  -grow n                  -fuzz n                
-  -debug_tiles             -snapfb                  -rawfb string          
-  -freqtab file            -pipeinput cmd           -macnodim              
-  -macnosleep              -macnosaver              -macnowait             
-  -macwheel n              -macnoswap               -macnoresize           
-  -maciconanim n           -macmenu                 -gui [gui-opts]        
-  -remote command          -query variable          -QD variable           
-  -sync                    -noremote                -yesremote             
-  -unsafe                  -safer                   -privremote            
-  -nocmds                  -allowedcmds list        -deny_all              
-
+  -buttonmap string        -nodragging              -wireframe [str]       
+  -nowireframe             -nowireframelocal        -wirecopyrect mode     
+  -nowirecopyrect          -debug_wireframe         -scrollcopyrect mode   
+  -noscrollcopyrect        -scr_area n              -scr_skip list         
+  -scr_inc list            -scr_keys list           -scr_term list         
+  -scr_keyrepeat lo-hi     -scr_parms string        -fixscreen string      
+  -debug_scroll            -noxrecord               -grab_buster           
+  -nograb_buster           -debug_grabs             -debug_sel             
+  -pointer_mode n          -input_skip n            -allinput              
+  -speeds rd,bw,lat        -wmdt string             -debug_pointer         
+  -debug_keyboard          -defer time              -wait time             
+  -wait_ui factor          -nowait_bog              -slow_fb time          
+  -readtimeout n           -nap                     -nonap                 
+  -sb time                 -nofbpm                  -fbpm                  
+  -nodpms                  -dpms                    -forcedpms             
+  -clientdpms              -noserverdpms            -noultraext            
+  -noxdamage               -xd_area A               -xd_mem f              
+  -sigpipe string          -threads                 -nothreads             
+  -fs f                    -gaps n                  -grow n                
+  -fuzz n                  -debug_tiles             -snapfb                
+  -rawfb string            -freqtab file            -pipeinput cmd         
+  -macnodim                -macnosleep              -macnosaver            
+  -macnowait               -macwheel n              -macnoswap             
+  -macnoresize             -maciconanim n           -macmenu               
+  -gui [gui-opts]          -remote command          -query variable        
+  -QD variable             -sync                    -noremote              
+  -yesremote               -unsafe                  -safer                 
+  -privremote              -nocmds                  -allowedcmds list      
+  -deny_all              
 
 libvncserver options:
 -rfbport port          TCP port for RFB protocol
@@ -10625,7 +10630,7 @@ libvncserver-tight-extension options:
 
 % x11vnc -help
 
-x11vnc: allow VNC connections to real X11 displays. 0.8.5 lastmod: 2007-04-06
+x11vnc: allow VNC connections to real X11 displays. 0.9 lastmod: 2007-04-18
 
 (type "x11vnc -opts" to just list the options.)
 
@@ -12749,99 +12754,6 @@ Options:
                        text selection, and some menu traversals.  It overrides
                        any -pointer_mode setting.
 
--ncache n              Client-side caching scheme.  Framebuffer memory "n"
-                       (an integer) times that of the full display is allocated
-                       below the actual framebuffer to cache screen contents
-                       for rapid retrieval.  So a W x H frambuffer is expanded
-                       to a W x (n+1)*H one.  Use 0 to disable.  Default: XXX.
-
-                       For this and the other -ncache* options below you can
-                       abbreviate "-ncache" with "-nc".  Also, "-nonc"
-                       is the same as "-ncache 0"
-
-                       This is an experimental option, currently implemented
-                       in an awkward way in that in the VNC Viewer you can
-                       see the cache contents if you scroll down, etc.  So you
-                       will have to set things up so you can't see that region.
-                       If this method is successful, the changes required for
-                       clients to do this less awkwardly will be investigated.
-
-                       Note that this mode consumes a huge amount of memory,
-                       both on the x11vnc server side and on the VNC Viewer
-                       side.  If n=2 then the amount of RAM used is roughly
-                       tripled for both x11vnc and the VNC Viewer.  As a rule
-                       of thumb, note that 1280x1024 at depth 24 is about 5MB
-                       of pixel data.
-
-                       For reasonable response when cycling through 4 to 6
-                       large (e.g. web browser) windows a value n of 6 to 12
-                       is recommended. (that's right: ~10X more memory...)
-
-                       Because of the way window backingstore and saveunders
-                       are implemented, n must be even.  It will be incremented
-                       by 1 if it is not.
-
-                       This mode also works for native MacOS X, but may not
-                       be as effective as the X version.  This is due to a
-                       number of things, one is the drop-shadow compositing
-                       that leaves extra areas that need to be repaired (see
-                       -ncache_pad).  Another is the window iconification
-                       animations need to be avoided (see -macicontime).
-                       It appears the that the 'Scale' animation mode gives
-                       better results than the 'Genie' one.  Also, window event
-                       detection not as accurate as the X version.
-
--ncache_cr             In -ncache mode, try to do copyrect opaque window
-                       moves/drags instead of wireframes (this can induce
-                       painting errors).  The wireframe will still be used when
-                       moving a window whose save-unders has not yet been set
-                       or has been invalidated.
-
-                       Some VNC Viewers provide better response than others
-                       with this option.  On Unix, realvnc viewer gives
-                       smoother drags than tightvnc viewer.  Response may also
-                       be choppy if the server side machine is too slow.
-
-                       Sometimes on very slow modem connections, this actually
-                       gives an improvement because no pixel data at all
-                       (not even the box animation) is sent during the drag.
-
--ncache_no_moveraise   In -ncache mode, do not assume that moving a window
-                       will cause the window manager to raise it to the top
-                       of the stack.  The default is to assume it does, and
-                       so at the beginning of any wireframe, etc, window moves
-                       the window will be pushed to top in the VNC viewer.
-
--ncache_no_dtchange    In -ncache mode, do not try to guess when the desktop
-                       (viewport) changes to another one (i.e. another
-                       workarea).  The default is to try to guess and when
-                       detected try to make the transistion more smoothly.
-
--ncache_no_rootpixmap  In -ncache mode, do not try to snapshot the desktop
-                       background to use in guessing or reconstructing window
-                       save-unders.
-
--ncache_keep_anims     In -ncache mode, do not try to disable window
-                       manager animations and other effects (that usually
-                       degrade ncache performance or cause painting errors).
-                       The default is to try to disable them on KDE (but not
-                       GNOME) when VNC clients are connected.
-
-                       For other window managers or desktops that provide
-                       animations, effects, compositing, translucency,
-                       etc. that interfere with the -ncache method you will
-                       have to disable them manually.
-
--ncache_old_wm         In -ncache mode, enable some heuristics for old style
-                       window managers such as fvwm and twm.
-
--ncache_pad n          In -ncache mode, pad each window with n pixels for the
-                       caching rectangles.  This can be used to try to improve
-                       the situation with dropshadows or other compositing
-                       (e.g. MacOS X window manager), although it could make
-                       things worse.  The default is 0 on Unix and 24 on
-                       MacOS X.
-
 -wireframe [str]       Try to detect window moves or resizes when a mouse
 -nowireframe           button is held down and show a wireframe instead of
                        the full opaque window.  This is based completely on
diff --git a/x11vnc/userinput.c b/x11vnc/userinput.c
index 5fd37ae..dab29b1 100644
--- a/x11vnc/userinput.c
+++ b/x11vnc/userinput.c
@@ -9841,7 +9841,9 @@ fprintf(stderr, "----%02d: MapNotify        0x%lx  %3d\n", ik, win, idx);
 				}
 
 #if 0
-//				if (cache_list[idx].map_state == IsUnmapped || desktop_change || macosx_console)
+/*
+				if (cache_list[idx].map_state == IsUnmapped || desktop_change || macosx_console)
+ */
 #endif
 				if (1) {
 					X_UNLOCK;
@@ -9941,7 +9943,9 @@ fprintf(stderr, "----%02d: UnmapNotify      0x%lx  %3d\n", ik, win, idx);
 				}
 
 #if 0
+/*
 //				if (cache_list[idx].map_state == IsViewable || desktop_change || macosx_console)
+ */
 #endif
 				if (1) {
 					X_UNLOCK;
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index 831b040..0b17389 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -2,7 +2,7 @@
 .TH X11VNC "1" "April 2007" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8.5, lastmod: 2007-04-06
+         version: 0.9, lastmod: 2007-04-18
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -2544,115 +2544,6 @@ slow setups, but you lose all visual feedback for drags,
 text selection, and some menu traversals.  It overrides
 any \fB-pointer_mode\fR setting.
 .PP
-\fB-ncache\fR \fIn\fR
-.IP
-Client-side caching scheme.  Framebuffer memory \fIn\fR
-(an integer) times that of the full display is allocated
-below the actual framebuffer to cache screen contents
-for rapid retrieval.  So a W x H frambuffer is expanded
-to a W x (n+1)*H one.  Use 0 to disable.  Default: XXX.
-.IP
-For this and the other \fB-ncache*\fR options below you can
-abbreviate "\fB-ncache\fR" with "\fB-nc\fR".  Also, "\fB-nonc\fR"
-is the same as "\fB-ncache\fR \fI0\fR"
-.IP
-This is an experimental option, currently implemented
-in an awkward way in that in the VNC Viewer you can
-see the cache contents if you scroll down, etc.  So you
-will have to set things up so you can't see that region.
-If this method is successful, the changes required for
-clients to do this less awkwardly will be investigated.
-.IP
-Note that this mode consumes a huge amount of memory,
-both on the x11vnc server side and on the VNC Viewer
-side.  If n=2 then the amount of RAM used is roughly
-tripled for both x11vnc and the VNC Viewer.  As a rule
-of thumb, note that 1280x1024 at depth 24 is about 5MB
-of pixel data.
-.IP
-For reasonable response when cycling through 4 to 6
-large (e.g. web browser) windows a value n of 6 to 12
-is recommended. (that's right: ~10X more memory...)
-.IP
-Because of the way window backingstore and saveunders
-are implemented, n must be even.  It will be incremented
-by 1 if it is not.
-.IP
-This mode also works for native MacOS X, but may not
-be as effective as the X version.  This is due to a
-number of things, one is the drop-shadow compositing
-that leaves extra areas that need to be repaired (see
-\fB-ncache_pad).\fR  Another is the window iconification
-animations need to be avoided (see \fB-macicontime).\fR
-It appears the that the 'Scale' animation mode gives
-better results than the 'Genie' one.  Also, window event
-detection not as accurate as the X version.
-.PP
-\fB-ncache_cr\fR
-.IP
-In \fB-ncache\fR mode, try to do copyrect opaque window
-moves/drags instead of wireframes (this can induce
-painting errors).  The wireframe will still be used when
-moving a window whose save-unders has not yet been set
-or has been invalidated.
-.IP
-Some VNC Viewers provide better response than others
-with this option.  On Unix, realvnc viewer gives
-smoother drags than tightvnc viewer.  Response may also
-be choppy if the server side machine is too slow.
-.IP
-Sometimes on very slow modem connections, this actually
-gives an improvement because no pixel data at all
-(not even the box animation) is sent during the drag.
-.PP
-\fB-ncache_no_moveraise\fR
-.IP
-In \fB-ncache\fR mode, do not assume that moving a window
-will cause the window manager to raise it to the top
-of the stack.  The default is to assume it does, and
-so at the beginning of any wireframe, etc, window moves
-the window will be pushed to top in the VNC viewer.
-.PP
-\fB-ncache_no_dtchange\fR
-.IP
-In \fB-ncache\fR mode, do not try to guess when the desktop
-(viewport) changes to another one (i.e. another
-workarea).  The default is to try to guess and when
-detected try to make the transistion more smoothly.
-.PP
-\fB-ncache_no_rootpixmap\fR
-.IP
-In \fB-ncache\fR mode, do not try to snapshot the desktop
-background to use in guessing or reconstructing window
-save-unders.
-.PP
-\fB-ncache_keep_anims\fR
-.IP
-In \fB-ncache\fR mode, do not try to disable window
-manager animations and other effects (that usually
-degrade ncache performance or cause painting errors).
-The default is to try to disable them on KDE (but not
-GNOME) when VNC clients are connected.
-.IP
-For other window managers or desktops that provide
-animations, effects, compositing, translucency,
-etc. that interfere with the \fB-ncache\fR method you will
-have to disable them manually.
-.PP
-\fB-ncache_old_wm\fR
-.IP
-In \fB-ncache\fR mode, enable some heuristics for old style
-window managers such as fvwm and twm.
-.PP
-\fB-ncache_pad\fR \fIn\fR
-.IP
-In \fB-ncache\fR mode, pad each window with n pixels for the
-caching rectangles.  This can be used to try to improve
-the situation with dropshadows or other compositing
-(e.g. MacOS X window manager), although it could make
-things worse.  The default is 0 on Unix and 24 on
-MacOS X.
-.PP
 \fB-wireframe\fR \fI[str],\fR \fB-nowireframe\fR
 .IP
 Try to detect window moves or resizes when a mouse
diff --git a/x11vnc/x11vnc.h b/x11vnc/x11vnc.h
index 8689a96..8fbe05e 100644
--- a/x11vnc/x11vnc.h
+++ b/x11vnc/x11vnc.h
@@ -136,7 +136,7 @@
 
 /* these are for delaying features: */
 #define xxNO_SSL_OR_UNIXPW
-#define xxNO_NCACHE
+#define NO_NCACHE
 
 /*
  * Beginning of support for small binary footprint build for embedded
diff --git a/x11vnc/x11vnc_defs.c b/x11vnc/x11vnc_defs.c
index 28266f9..98a2719 100644
--- a/x11vnc/x11vnc_defs.c
+++ b/x11vnc/x11vnc_defs.c
@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.8.5 lastmod: 2007-04-06";
+char lastmod[] = "0.9 lastmod: 2007-04-18";
 
 /* X display info */