[sawfish: 2/2] Merge branch 'frame-fix'

[Christopher Bratusek <chrisb src gnome org>]

commit f4692c66cc4749cab0d8e585b70f9ca754fb30c3
Merge: 28b8878... dab077a...
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Wed Oct 7 13:14:50 2009 +0200

    Merge branch 'frame-fix'
    
    Conflicts:
    	lisp/sawfish/wm/frames.jl

 ChangeLog                 |    3 +++
 lisp/sawfish/wm/frames.jl |   22 +++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --cc ChangeLog
index 567adf2,10136ab..d42b547
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,204 -1,3 +1,207 @@@
 +2009-10-07  Christopher Bratusek <zanghar freenet de>
++	* src/events.c
 +	* lisp/sawfish/wm/focus.jl
 +	* lisp/sawfish/wm/transient.jl: merged timo/kde-menu-focus branch
 +
++	* lisp/sawfish/wm/frames.jl: merged timo/frame-fix branch
++
 +2009-10-05  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/defaults.jl
 +	* man/news.texi: removed try-require
 +
 +2009-10-03  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/cfg/main.jl.in
 +	* lisp/sawfish/gtk/widgets/font.jl.in
 +	* scripts/sawfish-about.jl.in: Whitespace cleanup in files that were missed before.
 +
 +2009-10-03  Teika kazura <teika lavabit com>
 +	* man/faq.texi: update on how to read info
 +
 +2009-10-01  Christopher Bratusek <zanghar freenet de>
 +	* configure.in
 +	* OPTIONS
 +	* src/play-sample.c
 +	* src/Makefile.in
 +	* Makedefs.in
 +	* sawfish.ebuild.in
 +	* lisp/sawfish/wm/util/play-audio.jl: removed built-in audio support, using /usr/bin/paplay by default
 +
 +	* man/sawfish.texi
 +	* KEYBINDINGS
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/keymaps.jl: added new buttons (frame-classes) (+ keymaps and docs):
 +                                      - sticky button
 +				      - lock button
 +				      - rename button
 +				      - move/resize button
 +				      - raise/lower button
 +
 +	* lisp/sawfish/wm/menus.jl: string change in customize-menu
 +
 +	* man/news.texi: updated
 +
 +	* OPTIONS: updated
 +
 +2009-10-01  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/windows.jl
 +	* man/sawfish.texi: Doc on window types.
 +
 +2009-09-30  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/windows.jl: Docstring of 'dont-avoid-ignored' is corrected.
 +
 +2009-09-29  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/cfg/apply.jl
 +	* lisp/sawfish/cfg/config.jl
 +	* lisp/sawfish/cfg/group.jl
 +	* lisp/sawfish/cfg/i18n.jl
 +	* lisp/sawfish/cfg/layout.jl
 +	* lisp/sawfish/cfg/layouts/keymaps.jl
 +	* lisp/sawfish/cfg/shell.jl
 +	* lisp/sawfish/cfg/slot.jl
 +	* lisp/sawfish/cfg/widgets/command.jl
 +	* lisp/sawfish/cfg/widgets/event.jl
 +	* lisp/sawfish/cfg/widgets/frame-style.jl
 +	* lisp/sawfish/cfg/widgets/gtk/icon.jl
 +	* lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
 +	* lisp/sawfish/cfg/widgets/icon.jl
 +	* lisp/sawfish/cfg/widgets/keymap.jl
 +	* lisp/sawfish/cfg/widgets/match-window.jl
 +	* lisp/sawfish/cfg/widgets/modifier-list.jl
 +	* lisp/sawfish/cfg/widgets/workspace-geometry.jl
 +	* lisp/sawfish/cfg/wm.jl
 +	* lisp/sawfish/gtk/stock.jl
 +	* lisp/sawfish/gtk/widget-dialog.jl
 +	* lisp/sawfish/gtk/widget-test.jl
 +	* lisp/sawfish/gtk/widget.jl
 +	* lisp/sawfish/gtk/widgets/alist.jl
 +	* lisp/sawfish/gtk/widgets/color.jl
 +	* lisp/sawfish/gtk/widgets/file.jl
 +	* lisp/sawfish/gtk/widgets/list.jl
 +	* lisp/sawfish/gtk/widgets/pair.jl
 +	* lisp/sawfish/gtk/widgets/program.jl
 +	* lisp/sawfish/gtk/widgets/scheme-boolean.jl
 +	* lisp/sawfish/wm.jl
 +	* lisp/sawfish/wm/animation/outline.jl
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/commands.jl
 +	* lisp/sawfish/wm/commands/cycle.jl
 +	* lisp/sawfish/wm/commands/describe.jl
 +	* lisp/sawfish/wm/commands/groups.jl
 +	* lisp/sawfish/wm/commands/grow-pack.jl
 +	* lisp/sawfish/wm/commands/help.jl
 +	* lisp/sawfish/wm/commands/move-cursor.jl
 +	* lisp/sawfish/wm/commands/move-resize.jl
 +	* lisp/sawfish/wm/commands/raise-commands.jl
 +	* lisp/sawfish/wm/commands/shrink-yank.jl
 +	* lisp/sawfish/wm/commands/size-window.jl
 +	* lisp/sawfish/wm/commands/slide-window.jl
 +	* lisp/sawfish/wm/commands/user.jl
 +	* lisp/sawfish/wm/commands/viewport-extras.jl
 +	* lisp/sawfish/wm/commands/viewport-linear.jl
 +	* lisp/sawfish/wm/commands/x-cycle.jl
 +	* lisp/sawfish/wm/cursors.jl
 +	* lisp/sawfish/wm/custom-defaults.jl
 +	* lisp/sawfish/wm/custom.jl
 +	* lisp/sawfish/wm/customize.jl
 +	* lisp/sawfish/wm/defaults.jl
 +	* lisp/sawfish/wm/ext/3d-hack.jl
 +	* lisp/sawfish/wm/ext/audio-events.jl
 +	* lisp/sawfish/wm/ext/auto-raise.jl
 +	* lisp/sawfish/wm/ext/beos-window-menu.jl
 +	* lisp/sawfish/wm/ext/edge-flip.jl
 +	* lisp/sawfish/wm/ext/error-handler.jl
 +	* lisp/sawfish/wm/ext/fdo-menu.jl
 +	* lisp/sawfish/wm/ext/hide-dialogs.jl
 +	* lisp/sawfish/wm/ext/infinite-desktop.jl
 +	* lisp/sawfish/wm/ext/match-window.jl
 +	* lisp/sawfish/wm/ext/old-window-menu.jl
 +	* lisp/sawfish/wm/ext/shade-hover.jl
 +	* lisp/sawfish/wm/ext/tooltips.jl
 +	* lisp/sawfish/wm/ext/window-history.jl
 +	* lisp/sawfish/wm/ext/workspace-grid.jl
 +	* lisp/sawfish/wm/extras.jl
 +	* lisp/sawfish/wm/focus.jl
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/gaol.jl
 +	* lisp/sawfish/wm/integration/gnome.jl
 +	* lisp/sawfish/wm/integration/kde.jl
 +	* lisp/sawfish/wm/keymaps.jl
 +	* lisp/sawfish/wm/menus.jl
 +	* lisp/sawfish/wm/misc.jl
 +	* lisp/sawfish/wm/placement.jl
 +	* lisp/sawfish/wm/placement/off-center.jl
 +	* lisp/sawfish/wm/placement/smart.jl
 +	* lisp/sawfish/wm/placement/stagger.jl
 +	* lisp/sawfish/wm/placement/top-left.jl
 +	* lisp/sawfish/wm/server.jl
 +	* lisp/sawfish/wm/session/init.jl
 +	* lisp/sawfish/wm/session/load.jl
 +	* lisp/sawfish/wm/session/save.jl
 +	* lisp/sawfish/wm/stacking.jl
 +	* lisp/sawfish/wm/state/configure.jl
 +	* lisp/sawfish/wm/state/iconify.jl
 +	* lisp/sawfish/wm/state/ignored.jl
 +	* lisp/sawfish/wm/state/maximize.jl
 +	* lisp/sawfish/wm/state/mwm.jl
 +	* lisp/sawfish/wm/state/open-look.jl
 +	* lisp/sawfish/wm/state/shading.jl
 +	* lisp/sawfish/wm/state/transient.jl
 +	* lisp/sawfish/wm/state/wm-spec.jl
 +	* lisp/sawfish/wm/swapper.jl
 +	* lisp/sawfish/wm/tabs/tab.jl
 +	* lisp/sawfish/wm/tabs/tabgroup.jl
 +	* lisp/sawfish/wm/theming/make-theme-preview.jl
 +	* lisp/sawfish/wm/theming/make-theme.jl
 +	* lisp/sawfish/wm/user.jl
 +	* lisp/sawfish/wm/util/compat.jl
 +	* lisp/sawfish/wm/util/decode-events.jl
 +	* lisp/sawfish/wm/util/display-window.jl
 +	* lisp/sawfish/wm/util/display-wininfo.jl
 +	* lisp/sawfish/wm/util/edges.jl
 +	* lisp/sawfish/wm/util/font.jl
 +	* lisp/sawfish/wm/util/groups.jl
 +	* lisp/sawfish/wm/util/gtkrc.jl
 +	* lisp/sawfish/wm/util/keymap-diff.jl
 +	* lisp/sawfish/wm/util/keymap.jl
 +	* lisp/sawfish/wm/util/marks.jl
 +	* lisp/sawfish/wm/util/nokogiri.jl
 +	* lisp/sawfish/wm/util/ping.jl
 +	* lisp/sawfish/wm/util/play-audio.jl
 +	* lisp/sawfish/wm/util/prompt-extras.jl
 +	* lisp/sawfish/wm/util/prompt-wm.jl
 +	* lisp/sawfish/wm/util/prompt.jl
 +	* lisp/sawfish/wm/util/recolor-image.jl
 +	* lisp/sawfish/wm/util/rects.jl
 +	* lisp/sawfish/wm/util/stacking.jl
 +	* lisp/sawfish/wm/util/window-order.jl
 +	* lisp/sawfish/wm/util/window-outline.jl
 +	* lisp/sawfish/wm/util/with-output.jl
 +	* lisp/sawfish/wm/util/workarea.jl
 +	* lisp/sawfish/wm/viewport.jl
 +	* lisp/sawfish/wm/window-anim.jl
 +	* lisp/sawfish/wm/windows.jl
 +	* lisp/sawfish/wm/workspace.jl
 +	* scripts/sawfish-client.jl
 +	* scripts/sawfish-menu.jl
 +	* themes/Crux/theme.jl
 +	* themes/Elberg-tabbed/theme.jl
 +	* themes/absolute-e/theme.jl
 +	* themes/brushed-metal/theme.jl
 +	* themes/get-S-tabbed/theme.jl
 +	* themes/gradient/theme.jl
 +	* themes/gtk/theme.jl
 +	* themes/microGUI/theme.jl
 +	* themes/mono/theme.jl
 +	* themes/mxflat/theme.jl
 +	* themes/simple/theme.jl
 +	* themes/smaker/theme.jl: General whitespace cleanup.  Indentation
 +	                          is standardized and lines (with a few
 +		                  exceptions -- mostly long strings) are
 +			          capped at 80 chars.
 +
  2009-09-26  Christopher Bratusek <zanghar freenet de>
  	* lisp/Makefile.in
  	* lisp/sawfish/cfg/Makefile.in