[sawfish: 4/10] Merge branch 'master' into teika
- From: Christopher Bratusek <chrisb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [sawfish: 4/10] Merge branch 'master' into teika
- Date: Tue, 6 Oct 2009 15:58:32 +0000 (UTC)
commit b75ca5f3be48f22cda9d61069f7dc5a22af97d46
Merge: aec347b... bb424cd...
Author: Teika kazura <teika lavabit com>
Date: Thu Oct 1 15:54:07 2009 +0900
Merge branch 'master' into teika
Conflicts:
lisp/sawfish/wm/ext/match-window.jl
lisp/sawfish/wm/windows.jl
ChangeLog | 150 +
lisp/sawfish/cfg/apply.jl | 67 +-
lisp/sawfish/cfg/config.jl | 41 +-
lisp/sawfish/cfg/group.jl | 49 +-
lisp/sawfish/cfg/i18n.jl | 41 +-
lisp/sawfish/cfg/layout.jl | 47 +-
lisp/sawfish/cfg/layouts/keymaps.jl | 95 +-
lisp/sawfish/cfg/shell.jl | 46 +-
lisp/sawfish/cfg/slot.jl | 85 +-
lisp/sawfish/cfg/widgets/command.jl | 87 +-
lisp/sawfish/cfg/widgets/event.jl | 59 +-
lisp/sawfish/cfg/widgets/frame-style.jl | 61 +-
lisp/sawfish/cfg/widgets/gtk/icon.jl | 47 +-
lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl | 47 +-
lisp/sawfish/cfg/widgets/icon.jl | 47 +-
lisp/sawfish/cfg/widgets/keymap.jl | 55 +-
lisp/sawfish/cfg/widgets/match-window.jl | 122 +-
lisp/sawfish/cfg/widgets/modifier-list.jl | 61 +-
lisp/sawfish/cfg/widgets/workspace-geometry.jl | 47 +-
lisp/sawfish/cfg/wm.jl | 41 +-
lisp/sawfish/gtk/stock.jl | 53 +-
lisp/sawfish/gtk/widget-dialog.jl | 41 +-
lisp/sawfish/gtk/widget-test.jl | 53 +-
lisp/sawfish/gtk/widget.jl | 80 +-
lisp/sawfish/gtk/widgets/alist.jl | 53 +-
lisp/sawfish/gtk/widgets/color.jl | 71 +-
lisp/sawfish/gtk/widgets/file.jl | 49 +-
lisp/sawfish/gtk/widgets/list.jl | 140 +-
lisp/sawfish/gtk/widgets/pair.jl | 51 +-
lisp/sawfish/gtk/widgets/program.jl | 49 +-
lisp/sawfish/gtk/widgets/scheme-boolean.jl | 53 +-
lisp/sawfish/wm.jl | 45 +-
lisp/sawfish/wm/animation/outline.jl | 1 -
lisp/sawfish/wm/autoload.jl | 1 -
lisp/sawfish/wm/commands.jl | 109 +-
lisp/sawfish/wm/commands/cycle.jl | 1 -
lisp/sawfish/wm/commands/describe.jl | 7 +-
lisp/sawfish/wm/commands/groups.jl | 33 +-
lisp/sawfish/wm/commands/grow-pack.jl | 7 +-
lisp/sawfish/wm/commands/help.jl | 3 +-
lisp/sawfish/wm/commands/move-cursor.jl | 5 +-
lisp/sawfish/wm/commands/move-resize.jl | 90 +-
lisp/sawfish/wm/commands/raise-commands.jl | 21 +-
lisp/sawfish/wm/commands/shrink-yank.jl | 84 +-
lisp/sawfish/wm/commands/size-window.jl | 3 +-
lisp/sawfish/wm/commands/slide-window.jl | 3 +-
lisp/sawfish/wm/commands/user.jl | 58 +-
lisp/sawfish/wm/commands/viewport-extras.jl | 27 +-
lisp/sawfish/wm/commands/viewport-linear.jl | 1 -
lisp/sawfish/wm/commands/x-cycle.jl | 231 +-
lisp/sawfish/wm/cursors.jl | 41 +-
lisp/sawfish/wm/custom-defaults.jl | 4 +-
lisp/sawfish/wm/custom.jl | 73 +-
lisp/sawfish/wm/customize.jl | 5 +-
lisp/sawfish/wm/defaults.jl | 5 +-
lisp/sawfish/wm/ext/3d-hack.jl | 10 +-
lisp/sawfish/wm/ext/audio-events.jl | 5 +-
lisp/sawfish/wm/ext/auto-raise.jl | 15 +-
lisp/sawfish/wm/ext/beos-window-menu.jl | 83 +-
lisp/sawfish/wm/ext/edge-flip.jl | 1 -
lisp/sawfish/wm/ext/error-handler.jl | 1 -
lisp/sawfish/wm/ext/fdo-menu.jl | 223 +-
lisp/sawfish/wm/ext/hide-dialogs.jl | 61 +-
lisp/sawfish/wm/ext/infinite-desktop.jl | 217 +-
lisp/sawfish/wm/ext/match-window.jl | 310 +-
lisp/sawfish/wm/ext/old-window-menu.jl | 1 -
lisp/sawfish/wm/ext/shade-hover.jl | 20 +-
lisp/sawfish/wm/ext/tooltips.jl | 1 -
lisp/sawfish/wm/ext/window-history.jl | 8 +-
lisp/sawfish/wm/ext/workspace-grid.jl | 57 +-
lisp/sawfish/wm/extras.jl | 39 +-
lisp/sawfish/wm/focus.jl | 31 +-
lisp/sawfish/wm/frames.jl | 71 +-
lisp/sawfish/wm/gaol.jl | 87 +-
lisp/sawfish/wm/integration/gnome.jl | 19 +-
lisp/sawfish/wm/integration/kde.jl | 26 +-
lisp/sawfish/wm/keymaps.jl | 5 +-
lisp/sawfish/wm/menus.jl | 63 +-
lisp/sawfish/wm/misc.jl | 100 +-
lisp/sawfish/wm/placement.jl | 22 +-
lisp/sawfish/wm/placement/off-center.jl | 49 +-
lisp/sawfish/wm/placement/smart.jl | 23 +-
lisp/sawfish/wm/placement/stagger.jl | 18 +-
lisp/sawfish/wm/placement/top-left.jl | 49 +-
lisp/sawfish/wm/server.jl | 1 -
lisp/sawfish/wm/session/init.jl | 24 +-
lisp/sawfish/wm/session/load.jl | 3 +-
lisp/sawfish/wm/session/save.jl | 4 +-
lisp/sawfish/wm/stacking.jl | 202 +-
lisp/sawfish/wm/state/configure.jl | 3 +-
lisp/sawfish/wm/state/iconify.jl | 7 +-
lisp/sawfish/wm/state/ignored.jl | 24 +-
lisp/sawfish/wm/state/maximize.jl | 107 +-
lisp/sawfish/wm/state/mwm.jl | 13 +-
lisp/sawfish/wm/state/open-look.jl | 13 +-
lisp/sawfish/wm/state/shading.jl | 1 -
lisp/sawfish/wm/state/transient.jl | 24 +-
lisp/sawfish/wm/state/wm-spec.jl | 231 +-
lisp/sawfish/wm/swapper.jl | 59 +-
lisp/sawfish/wm/tabs/tab.jl | 124 +-
lisp/sawfish/wm/tabs/tabgroup.jl | 207 +-
lisp/sawfish/wm/theming/make-theme-preview.jl | 1 -
lisp/sawfish/wm/theming/make-theme.jl | 10 +-
lisp/sawfish/wm/user.jl | 55 +-
lisp/sawfish/wm/util/compat.jl | 48 +-
lisp/sawfish/wm/util/decode-events.jl | 23 +-
lisp/sawfish/wm/util/display-window.jl | 41 +-
lisp/sawfish/wm/util/display-wininfo.jl | 61 +-
lisp/sawfish/wm/util/edges.jl | 35 +-
lisp/sawfish/wm/util/font.jl | 127 +-
lisp/sawfish/wm/util/groups.jl | 15 +-
lisp/sawfish/wm/util/gtkrc.jl | 1 -
lisp/sawfish/wm/util/keymap-diff.jl | 107 +-
lisp/sawfish/wm/util/keymap.jl | 9 +-
lisp/sawfish/wm/util/marks.jl | 63 +-
lisp/sawfish/wm/util/nokogiri.jl | 55 +-
lisp/sawfish/wm/util/ping.jl | 63 +-
lisp/sawfish/wm/util/play-audio.jl | 1 -
lisp/sawfish/wm/util/prompt-extras.jl | 3 +-
lisp/sawfish/wm/util/prompt-wm.jl | 1 -
lisp/sawfish/wm/util/prompt.jl | 56 +-
lisp/sawfish/wm/util/recolor-image.jl | 67 +-
lisp/sawfish/wm/util/rects.jl | 33 +-
lisp/sawfish/wm/util/stacking.jl | 66 +-
lisp/sawfish/wm/util/window-order.jl | 11 +-
lisp/sawfish/wm/util/window-outline.jl | 14 +-
lisp/sawfish/wm/util/with-output.jl | 1 -
lisp/sawfish/wm/util/workarea.jl | 73 +-
lisp/sawfish/wm/viewport.jl | 157 +-
lisp/sawfish/wm/window-anim.jl | 1 -
lisp/sawfish/wm/windows.jl | 105 +-
lisp/sawfish/wm/workspace.jl | 39 +-
scripts/sawfish-client.jl | 91 +-
scripts/sawfish-menu.jl | 3 +-
themes/Crux/theme.jl | 82 +-
themes/Elberg-tabbed/theme.jl | 452 +-
themes/absolute-e/theme.jl | 3 +-
themes/brushed-metal/theme.jl | 1 -
themes/get-S-tabbed/theme.jl | 627 ++--
themes/gradient/theme.jl | 1 -
themes/gtk/theme.jl | 1 -
themes/microGUI/theme.jl | 292 +-
themes/mono/theme.jl | 1 -
themes/mxflat/theme.jl | 5258 +++++++++-----------
themes/simple/theme.jl | 39 +-
themes/smaker/theme.jl | 3 +-
146 files changed, 6683 insertions(+), 7021 deletions(-)
---
diff --cc lisp/sawfish/wm/ext/match-window.jl
index 80aa264,917d1a3..71c94ad
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@@ -486,8 -493,20 +491,9 @@@
(window-put w 'keymap (copy-sequence window-keymap)))))
(mapcar
(lambda (pair) ; pair of from and to keys
- (bind-keys keymap (car pair)
- (lambda () (interactive)
- (synthesize-event (lookup-event (cadr pair)) (current-event-window))))) value))))
+ (bind-keys keymap (car pair)
+ (lambda () (interactive)
+ (synthesize-event (lookup-event (cadr pair))
+ (current-event-window))))) value))))
- (define (rename-window-func window new-name)
- (set-x-text-property window 'WM_NAME (vector new-name))
- (set-x-text-property window '_NET_WM_NAME (vector new-name))
- (set-x-text-property window 'WM_ICON_NAME (vector new-name))
- (set-x-text-property window '_NET_WM_ICON_NAME (vector new-name)))
-
- (define (rename-window-interactive w)
- (let ((new-name (prompt-for-string "Enter new window title:"
- (window-name w))))
- (rename-window-func w new-name)))
-
- (define-command 'rename-window rename-window-interactive #:spec "%W"))
+)
diff --cc lisp/sawfish/wm/windows.jl
index 8889482,4aa3480..bf5cef1
--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@@ -508,28 -508,13 +510,27 @@@ STATES has been changed. STATES may als
'window-state-change-hook
(lambda (w states)
(mapc (lambda (cell)
- (let
- ((relevant (filter (lambda (state)
- (memq state (car cell))) states)))
+ (let ((relevant (filter (lambda (state)
+ (memq state (car cell))) states)))
(when relevant
((cdr cell) w relevant))))
- state-changes)))
+ state-changes)))
- ;;; gaollable functions
+ (define (rename-window-func window new-name)
+ "Renames the WINDOW to NEW-NAME."
+ (set-x-text-property window 'WM_NAME (vector new-name))
+ (set-x-text-property window '_NET_WM_NAME (vector new-name))
+ (set-x-text-property window 'WM_ICON_NAME (vector new-name))
+ (set-x-text-property window '_NET_WM_ICON_NAME (vector new-name)))
+
+ (define (rename-window-interactive w)
+ (require 'sawfish.wm.util.prompt)
+ (let ((new-name (prompt-for-string "Enter new window title:"
+ (window-name w))))
+ (rename-window-func w new-name)))
+
+ (define-command 'rename-window rename-window-interactive #:spec "%W")
- ;; gaollable functions
++ ;;; gaollable functions
(gaol-add window-really-wants-input-p window-class window-avoided-p
call-after-property-changed call-after-state-changed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
