[sawfish: 4/4] Merge in viewport changes to fix the viewport scrambling bug.

[Jeremy Hankins <jjhankins src gnome org>]

commit f4aa76f8af16281f1b175155996b0ee9ffdacbf5
Merge: 7911210... 52f6a8f...
Author: Jeremy Hankins <nowan nowan org>
Date:   Tue Nov 10 06:59:20 2009 -0600

    Merge in viewport changes to fix the viewport scrambling bug.
    
    Conflicts:
    	ChangeLog
    	man/news.texi

 ChangeLog                               |   25 ++++
 lisp/sawfish/wm/ext/infinite-desktop.jl |   22 ++--
 lisp/sawfish/wm/ext/match-window.jl     |    5 +-
 lisp/sawfish/wm/state/maximize.jl       |  121 ++++++++++--------
 lisp/sawfish/wm/util/compat.jl          |    3 +-
 lisp/sawfish/wm/util/edges.jl           |   53 +++++----
 lisp/sawfish/wm/util/rects.jl           |   10 +-
 lisp/sawfish/wm/util/workarea.jl        |   24 ++--
 lisp/sawfish/wm/viewport.jl             |  158 +++++++++++++++++++++--
 man/news.texi                           |   19 ++-
 man/sawfish.texi                        |  212 ++++++++++++++++++++++++++++++-
 11 files changed, 535 insertions(+), 117 deletions(-)
---
diff --cc ChangeLog
index ec53b64,ee6e2e1..ddcffaa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,125 -1,28 +1,150 @@@
 +2009-11-03  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/state/maximize.jl: removed maximize-reframe maximize-unframe
 +
 +2009-11-03  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/commands.jl
 +	* man/news.texi
 +	* man/sawfish.texi: `this-command' is set to nil when command execution is over.
 +
 +	* scripts/sawfish-client.jl: sawfish-client says "Bye." on normal exit.
 +
 +	* lisp/sawfish/wm/state/maximize.jl
 +	* man/news.texi
 +	* man/sawfish.texi :Bugfix. Commands 'maximize-window-fullscreen' and 'maximize-window-fullxinerama' work. Related doc error is corrected, too.
 +
 +	* lisp/sawfish/wm/extras.jl
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/user.jl: Moved contents of wm/extras.jl to wm/frames.jl, and deleted extras.jl.
 +
 +2009-10-28  Christopher Bratusek <zanghar freenet de>
 +	* scripts/sawfish-client.jl: merged branch `quit' from Ti-Mo (improved ,quit action)
 +
 +2009-10-27  Christopher Bratusek <zanghar freenet de>
 +	* debian/*: added debian packaging scripts based on the official ones
 +
 +2009-10-26  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/defaults.jl: added reboot/shutdown menu entries for non GNOME/KDE users
 +
 +	* README.IMPORTANT: provide instructions for how to let normal users use `shutdown'
 +
 +2009-10-24  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/ext/apps-menu.jl: added a missing bracket
 +
 +	* scripts/Makefile.in
 +	* scripts/sawfish-about.jl.in: switched from custom about-dialog to GtkAboutDialog
 +
 +2009-10-24  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/user.jl
 +	* man/news.texi: minor news & comment fix.
 +
 +2009-10-22  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* man/sawfish.texi
 +	* lisp/sawfish/wm/viewport.jl: Docstring improvement for 'scroll-viewport-steps'
 +
 +	* OPTIONS
 +	* lisp/sawfish/wm/ext/apps-menu.jl
 +	* man/sawfish.texi: Doc improvements on applications menu.
 +
+ 2009-10-21  Jeremy Hankins <nowan nowan org>
+ 	* lisp/sawfish/wm/state/maximize.jl
+ 	* lisp/sawfish/wm/util/compat.jl
+ 	* lisp/sawfish/wm/util/rects.jl
+ 	* lisp/sawfish/wm/util/workarea.jl
+ 	* lisp/sawfish/wm/viewport.jl
+ 	* man/news.texi: Fix bugs introduced by the recent changes to allow maximization outside of the current viewport:
+ 	                 - viewport-window now gives the viewport where most of the window is located.
+ 	                 - A few new functions for working with rectangles.
+ 
+ 	* lisp/sawfish/wm/ext/infinite-desktop.jl: infinite-desktop now checks viewport-honor-workspace-edges
+ 	                                           (in sawfish.wm.viewport) before allowing movement past workspace boundaries.
+ 
+ 	* man/sawfish.texi: Adjustments to viewport docs; new docs for sawfish.wm.util.rects.
+ 
 +2009-10-19  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/ext/apps-menu.jl
 +	* man/news.texi
 +	* man/sawfish.texi: Completed doc updates for applications menu.
 +
 +	* lisp/sawfish/wm/commands/grow-pack.jl
 +	* man/sawfish.texi: grow-pack doc upgrade.
 +
 +2009-10-17  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/ext/apps-menu.jl: removed dupped Development Category from Developmentmenu
 +	                                    added Editors Category to Developmentmenu
 +	                                    make use of global `xterm-prgoram' instead of local `my-term-string'
 +
 +	* OPTIONS: updated for Teikas changes
 +
 +	* lisp/sawfish/wm/menus.jl: updated "Reload Appsmenu" entry to call new `update-apps-menu' instead of `update-saw-menu'
 +
 +	* man/sawfish.texi: added docs for several functions and variables:
 +				- grow-window-up
 +				- grow-window-down
 +				- grow-window-left
 +				- grow-window-right
 +				- shrink-window-up
 +				- shrink-window-down
 +				- shrink-window-left
 +				- shrink-window-right
 +				- pack-window-up
 +				- pack-window-down
 +				- pack-window-left
 +				- pack-window-right
 +				- yank-window-up
 +				- yank-window-down
 +				- yank-window-left
 +				- yank-window-right
 +				- grow-is-maximize
 +				- pack-warp-pointer
 +				- grow-pack-bump-obscured
 +				- grow-pack-bump-other-depth
 +				- grow-pack-bump-ignored
 +				- shrink-window-minimum-size
 +				- yank-window-minimum-visible
 +
 +	* NEED_DOC_BEFORE_1_6_0: added (general reminder about missing docs)
 +
 +2009-10-16  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/user.jl
 +	* lisp/sawfish/wm/ext/apps-menu.jl: User can prepend their own apps-menu to the auto generated one. Cleanups, mostly in variables.
 +
 +	* README.IMPORTANT
 +	* man/news.texi: News rewritement.
 +
 +2009-10-15  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/defaults.jl
 +	* lisp/sawfish/wm/user.jl
 +	* man/faq.texi
 +	* man/news.texi: News and doc that sawfish.wm.defaults is always read, regardless of .sawfishrc existence.
 +
 +	* lisp/sawfish/wm/windows.jl: Bugfix; deleted a wrong quote.
 +
 +2009-10-15  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/commands/grow-pack.jl: make Grow Pack Shrink Yank subgroup of Move Resize
 +
 +2009-10-13  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/tabs/tab.jl
 +	* lisp/sawfish/wm/ext/edge-flip.jl
 +	* lisp/sawfish/wm/workspace.jl: export setter functions
 +					- raise-tabs-on-hover-setter
 +					- edge-flip-enable
 +					- display-ws-name-setter
 +
 +	* OPTIONS: updated
 +
+ 2009-10-11  Jeremy Hankins <nowan nowan org>
+ 	* lisp/sawfish/wm/ext/match-window.jl
+ 	* lisp/sawfish/wm/state/maximize.jl
+ 	* lisp/sawfish/wm/util/edges.jl
+ 	* lisp/sawfish/wm/viewport.jl: Fix bugs that shift windows between viewports on restart:
+ 	                               - maximize-window and maximize-window-fullscreen now work for windows outside of the current viewport
+ 	                               - the position window matcher now preserves the current viewport
+ 
+ 	* lisp/sawfish/wm/ext/infinite-desktop.jl: infinite-desktop.stop-at-workspace-borders is now true iff viewport-boundary-mode is not dynamic.
+ 
  2009-10-09  Christopher Bratusek <zanghar freenet de>
  	* lisp/sawfish/wm/menus.jl: added "Reload Appsmenu" entry
  
diff --cc man/news.texi
index 6157256,dab6bcc..cd7580d
--- a/man/news.texi
+++ b/man/news.texi
@@@ -29,20 -29,21 +29,31 @@@ they occurred between. For more detaile
  @item User visible changes:
  @itemize @minus
  
 - item In @code{infinite-desktop} there is no longer any option to
 -prevent the viewport from going beyond the edge of the workspace.
 -Instead it is prevented if and only if @code{viewport-boundary-mode} is
 -not set to @code{'dynamic}.  This means that the default behavior is now
 -to stop at workspace boundaries; to acheive the previous behavior set
 - code{viewport-boundary-mode} to @code{'dynamic}.
 + item User config file changes
 +
 +In Sawfish < 1.6, @code{sawfish.wm.defaults} is loaded by default,
 +only if the @file{~/.sawfishrc} lacks. Now, it is always read, so you
 +don't have to @code{require} it. It sets up GNOME and KDE support if
 +they run, and does @code{(require 'sawfish.wm.ext.error-handler)}.
 +
- Since v1.5.0 @code{~/.sawmillrc} is no longer a valid resoucefile, from this version on,
- Sawfish will rename @code{~/.sawmillrc} to @code{~/.sawfishrc}, if the former does exist on
- your system, but the latter doesn't.
++Since v1.5.0 @code{~/.sawmillrc} is no longer a valid resoucefile, from
++this version on, Sawfish will rename @code{~/.sawmillrc} to
++ code{~/.sawfishrc}, if the former does exist on your system, but the
++latter doesn't.
 +
 + item Configurator's binary, @code{sawfish-ui}, is renamed to @code{sawfish-config} [Christopher Bratusek]
  
- Its window class is changed to @code{sawfish-configurator} / @code{Sawfish-Configurator}, too.
 - item Sawfish now got an implementation of the FDO (freedesktop.org) application menu, it is
 -beeing generated, if there's no customized apps-menu
++Its window class is changed to @code{sawfish-configurator} /
++ code{Sawfish-Configurator}, too.
+ 
 - item Since v1.5.0 @code{~/.sawmillrc} is no longer a valid resoucefile, from this version on,
 -Sawfish will rename @code{~/.sawmillrc} to @code{~/.sawfishrc}, if the former does exist on
 -your system, but the later doesn't
++ item Infinite Desktop and Dynamic Viewports
+ 
 - item @code{sawfish-ui} has been renamed to @code{sawfish-config}
++In @code{infinite-desktop} there is no longer any option to prevent the
++viewport from going beyond the edge of the workspace.  Instead it is
++prevented if and only if @code{viewport-boundary-mode} is not set to
++ code{'dynamic}.  This means that the default behavior is now to stop at
++workspace boundaries; to acheive the previous behavior set
++ code{viewport-boundary-mode} to @code{'dynamic}.
  
  @item In SawfishConfig the "Matched Windows" group has been renamed to "Windows Rules"
  @end itemize