Re: Re: Only for germans ;)
fuchur <[email protected]>
| Newsgroups | gmane.comp.window-managers.sawfish |
|---|---|
| Organization | W.W |
| Message-ID | <[email protected]> |
Hi, On Mon, 7 Oct 2013 01:03:53 +0200 wrote fuchur <[email protected]>: >Hi, > >On Sun, 06 Oct 2013 20:30:23 +0200 >wrote Christopher Roy Bratusek <[email protected]>: > >>Sorry für die Verspätung - nach fast vier Wochen >>erfolgreichen Wiederstandes gegen alle von der Bagage >>(liebevoll gemeint) und den Arbeitskollegen verbreiteten >>Bakterien hat es mich jetzt doch erwischt - der Verbrauch >>an Taschentücher ist exponential gestiegen. >> >>Wie auch immer - ich werde einen Blick über die >>Übersetzung und die neuen Zeichenketten werfen und >>mich wieder melden. >> >>Gruß >>Chris > >Warte noch mit der Übersetzung, ich überarbeite die noch. >Ist das letzte auf meiner todo Liste ... > >Gute Besserung. > > Bin nun fertig. Habe alle vorherigen Patches hier noch mal zusammen gepackt: docs.patch themes.patch Changes: Update StyleTab/theme.jl text strings Rename tab-add-to-group to tab-window-add-to-tabgroup and tabgroup-add-to-group to tab-tabgroup-add-to-tabgroup in tabs/tab.jl and wm/keymaps.jl. You must update your keybindings for title and tabbar. Add/improve text/doc strings in tabs/tab.jl and tabs/tabgroup.jl Add defcustom marked-cursor-shape to commands/move-resize.jl Use custom cursor if window marked to add as tab. Improve text/doc strings in prg/compton.jl Add missing text/doc strings in sawfish. de.po.patch Update german translation Es ist alles übersetzt bis auf: DistanceFrom value for trayer. in trayer.jl. Keine Ahnung was das ist. In StyleTab wird: Also show in transients. nicht übersetze obwohl er in de.po übersetzt wurde. Und auch die READMEs in den Themen sind nicht übersetzt. Und packe hier auch noch eine komplette de.po bei. -- Regards, Fuchur GPG Fingerprint: CA3B 8204 5B3E 6D48 6D53 C116 E5BC 70D5 B8D7 B2B0
de.po
(text/x-gettext-translation, 212.3 KB) - not displayed
de.po.patch
(text/x-patch, 321.8 KB) - not displayed
docs.patch
(text/x-patch, 25.3 KB)
diff -urNad sawfish.orig/lisp/sawfish/wm/commands/groups.jl sawfish/lisp/sawfish/wm/commands/groups.jl
--- sawfish.orig/lisp/sawfish/wm/commands/groups.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/commands/groups.jl 2013-10-09 17:50:29.000000000 +0200
@@ -66,13 +66,17 @@
(fun w)))
(define (iconify-group w)
+ "Minimize the window and all windows from the same group."
(call-with-iconify-mode 'group iconify-window w))
(define (uniconify-group w)
+ "Restore the window and all windows from the same group from its minimized state."
(call-with-iconify-mode 'group uniconify-window w))
(define (iconify-transient-group w)
+ "Minimize the transient window and all transient windows from the same group."
(call-with-iconify-mode 'transients iconify-window w))
(define (uniconify-transient-group w)
+ "Restore the transient window and all transient windows from the same group from its minimized state."
(call-with-iconify-mode 'transients uniconify-window w))
(define-command 'iconify-group
@@ -87,13 +91,18 @@
;; sticky
(define (make-group-sticky w)
+ "Make the window and all windows from the same group appears in all workspaces and viewports."
(map-window-group make-window-sticky w))
(define (make-group-unsticky w)
+ "Make the window and all windows from the same group appears only in the
+current workspaces or viewports."
(map-window-group make-window-unsticky w))
-
+
(defun toggle-group-sticky (w)
+ "Toggle the `stickiness' from the window and all windows from the same group,
+i.e. make it appear in all workspaces and viewports."
(if (window-get w 'sticky)
- (make-group-unsticky w)
+ (make-group-unsticky w)
(make-group-sticky w)))
;;###autoload
@@ -112,15 +121,18 @@
send-group-dest-space (eq x (input-focus))))) w))
(define (send-group-to-current-workspace w)
+ "Send the window and all windows from the same group to the current workspace."
(send-group-to-workspace w current-workspace))
(define (send-group-to-next-workspace send-group-window count)
+ "Send the window and all windows from the same group to the next workspace."
(ws-call-with-workspace (lambda (space)
(send-group-to-workspace send-group-window space)
(select-workspace space))
count workspace-send-boundary-mode))
(define (send-group-to-previous-workspace w count)
+ "Send the window and all windows from the same group to the previous workspace."
(send-group-to-next-workspace w (- count)))
;;###autoload
@@ -134,6 +146,8 @@
;; viewports
(define (move-group-to-current-viewport w)
+ "Move the window and all windows from the same group
+to the current viewport."
(map-window-group move-window-to-current-viewport w))
(define (move-group-viewport w col row)
@@ -141,10 +155,25 @@
(move-window-viewport x col row)) w)
(move-viewport-to-window w))
- (define (move-group-left w) (move-group-viewport w -1 0))
- (define (move-group-right w) (move-group-viewport w 1 0))
- (define (move-group-up w) (move-group-viewport w 0 -1))
- (define (move-group-down w) (move-group-viewport w 0 1))
+ (define (move-group-left w)
+ "Move the window and all windows from the same group
+to the viewport on the left, and switch to that viewport."
+ (move-group-viewport w -1 0))
+
+ (define (move-group-right w)
+ "Move the window and all windows from the same group
+to the viewport on the right, and switch to that viewport."
+ (move-group-viewport w 1 0))
+
+ (define (move-group-up w)
+ "Move the window and all windows from the same group
+to the viewport above, and switch to that viewport."
+ (move-group-viewport w 0 -1))
+
+ (define (move-group-down w)
+ "Move the window and all windows from the same group
+to the viewport below, and switch to that viewport."
+ (move-group-viewport w 0 1))
;;###autoload
(define-command 'move-group-to-current-viewport
@@ -162,11 +191,29 @@
;; stacking
- (define (raise-group w) (raise-windows w (windows-in-group w t)))
- (define (lower-group w) (lower-windows w (windows-in-group w t)))
- (define (raise-lower-group w) (raise-lower-windows w (windows-in-group w t)))
- (define (raise-group-depth w) (map-window-group raise-window-depth w))
- (define (lower-group-depth w) (map-window-group lower-window-depth w))
+ (define (raise-group w)
+ "Raise the window and all windows from the same group to its highest
+allowed position in the stacking order."
+ (raise-windows w (windows-in-group w t)))
+
+ (define (lower-group w)
+ "Lower the window and all windows from the same group to its lowest
+allowed position in the stacking order."
+ (lower-windows w (windows-in-group w t)))
+
+ (define (raise-lower-group w)
+ "If the window is at its highest possible position, then lower the window and all
+windows from the same group to its lowest possible position. Otherwise raise the window
+and all windows from the group as far as allowed."
+ (raise-lower-windows w (windows-in-group w t)))
+
+ (define (raise-group-depth w)
+ "Put the window and all windows from the same group in the stacking level above its current level."
+ (map-window-group raise-window-depth w))
+
+ (define (lower-group-depth w)
+ "Put the window and all windows from the same group in the stacking level beneath its current level."
+ (map-window-group lower-window-depth w))
;;###autoload
(define-command 'raise-group raise-group
diff -urNad sawfish.orig/lisp/sawfish/wm/commands/help.jl sawfish/lisp/sawfish/wm/commands/help.jl
--- sawfish.orig/lisp/sawfish/wm/commands/help.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/commands/help.jl 2013-10-09 17:50:29.000000000 +0200
@@ -40,16 +40,24 @@
;; Commands
- (define (show-faq) (help-display-info-function "sawfish" "FAQ"))
+ (define (show-faq)
+ "Display the sawfish FAQ."
+ (help-display-info-function "sawfish" "FAQ"))
- (define (show-news) (help-display-info-function "sawfish" "News"))
+ (define (show-news)
+ "Display sawfish news."
+ (help-display-info-function "sawfish" "News"))
(define (show-programmer-manual)
+ "Open the programmer manual."
(help-display-info-function "sawfish" "Top"))
- (define (show-homepage) (browser "http://sawfish.wikia.com/"))
+ (define (show-homepage)
+ "Open the webside http://sawfish.wikia.com."
+ (browser "http://sawfish.wikia.com/"))
(define (show-about)
+ "Open about sawfish."
(system "sawfish-about >/dev/null 2>&1 </dev/null &"))
;;###autoload
diff -urNad sawfish.orig/lisp/sawfish/wm/commands/move-resize.jl sawfish/lisp/sawfish/wm/commands/move-resize.jl
--- sawfish.orig/lisp/sawfish/wm/commands/move-resize.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/commands/move-resize.jl 2013-10-09 17:50:29.000000000 +0200
@@ -91,6 +91,16 @@
:tooltip "When moving a window, this option lets you align one of \
its edges with an edge of another window.")
+ (defcustom marked-cursor-shape 'clock
+ "Cursor shape if a window is marked to added as tab."
+ :type (choice arrow box_spiral center_ptr circle cross cross_reverse
+ crosshair diamond_cross dotbox clock double_arrow draped_box
+ fleur hand1 hand2 iron_cross left_ptr ll_angle mouse
+ pencil pirate plus question_arrow right_ptr sb_left_arrow
+ sb_right_arrow sb_down_arrow sb_up_arrow spider star
+ target tcross watch xterm X_cursor)
+ :group move)
+
(defvar move-snap-mode 'resistance
"How to snap together window edges, one of `magnetism', `resistance', or
`attraction'.")
@@ -537,10 +547,12 @@
(resize-window-with-hints* win new-wid new-hgt)))
(define (double-window-size w)
+ "Resize the window to the double size."
(unless (window-get w 'fixed-size)
(resize-by-factor w 2)))
(define (halve-window-size w)
+ "Resize the window to the halve size."
(unless (window-get w 'fixed-size)
(resize-by-factor w 0.5)))
@@ -587,6 +599,7 @@
;; Move Window To Center
(define (move-window-center w)
+ "Move the window to the center from the current screen."
(move-window-to w
(quotient (- (screen-width)
(car (window-frame-dimensions w))) 2)
@@ -595,8 +608,8 @@
;; resize-prompt
(define (resize-window-prompt)
- (require 'sawfish.wm.util.prompt)
"Resize window. Prompted to enter new size."
+ (require 'sawfish.wm.util.prompt)
(let* ((win (current-event-window))
(w-name (window-name win))
(old-w (car (window-dimensions win)))
diff -urNad sawfish.orig/lisp/sawfish/wm/commands/poweroff.jl sawfish/lisp/sawfish/wm/commands/poweroff.jl
--- sawfish.orig/lisp/sawfish/wm/commands/poweroff.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/commands/poweroff.jl 2013-10-09 17:50:29.000000000 +0200
@@ -67,6 +67,8 @@
:group (misc apps))
(define (poweroff action)
+ "Run one of the following system programs:
+halt, reboot, suspend, hibernate, logout or lockdown."
(case action
((reboot)
(call-hook 'before-exit-hook)
diff -urNad sawfish.orig/lisp/sawfish/wm/commands/raise-commands.jl sawfish/lisp/sawfish/wm/commands/raise-commands.jl
--- sawfish.orig/lisp/sawfish/wm/commands/raise-commands.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/commands/raise-commands.jl 2013-10-09 17:50:29.000000000 +0200
@@ -59,6 +59,8 @@
(replay-pointer w))
(define (or-pass-through-click w)
+ "Raise the window if it is not on top, or if the window is on top, then replay
+any pointer events that invoked the command."
(if (and (windowp w) (not (window-on-top-p w)))
(raise-window* w)
(replay-pointer w)))
diff -urNad sawfish.orig/lisp/sawfish/wm/custom.jl sawfish/lisp/sawfish/wm/custom.jl
--- sawfish.orig/lisp/sawfish/wm/custom.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/custom.jl 2013-10-09 17:50:29.000000000 +0200
@@ -215,7 +215,7 @@
(require 'sawfish.wm.customize)
(customize group))
#:doc (format nil
- "Invoke configurator to customize group \"%s\"."
+ "Invoke configurator to customize group %s."
group
)))))
diff -urNad sawfish.orig/lisp/sawfish/wm/keymaps.jl sawfish/lisp/sawfish/wm/keymaps.jl
--- sawfish.orig/lisp/sawfish/wm/keymaps.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/keymaps.jl 2013-10-09 17:50:29.000000000 +0200
@@ -121,8 +121,8 @@
"Button3-Move" 'move-window-interactively
"Button3-Click" 'tab-release-window
"Button2-Move" 'resize-window-interactively
- "Button2-Off" 'tab-add-to-group
- "C-Button2-Off" 'tabgroup-add-to-group
+ "Button2-Off" 'tab-window-add-to-tabgroup
+ "C-Button2-Off" 'tab-tabgroup-add-to-tabgroup
"Button1-Off2" 'toggle-window-shaded
"Button1-Move" 'move-window-interactively)
"Keymap of window title bar. Mouse-bindings only."
@@ -132,8 +132,8 @@
(defcustom tabbar-keymap (bind-keys (make-keymap)
"Button3-Move" 'move-window-interactively
"Button3-Click" 'tab-release-window
- "Button2-Off" 'tab-add-to-group
- "C-Button2-Off" 'tabgroup-add-to-group
+ "Button2-Off" 'tab-window-add-to-tabgroup
+ "C-Button2-Off" 'tab-tabgroup-add-to-tabgroup
"Button1-Off2" 'toggle-window-shaded
"Button1-Move" 'move-window-interactively)
"Keymap of window tabbar. Mouse-bindings only."
diff -urNad sawfish.orig/lisp/sawfish/wm/prg/compton.jl sawfish/lisp/sawfish/wm/prg/compton.jl
--- sawfish.orig/lisp/sawfish/wm/prg/compton.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/prg/compton.jl 2013-10-09 17:50:29.000000000 +0200
@@ -90,55 +90,55 @@
:type boolean
:after-set (lambda () (switch-opacity)))
- (defcustom shadows-crop-maximized nil "Crop shadows by maximized Windows (xinerama support):"
+ (defcustom shadows-crop-maximized nil "Crop shadows by maximized Windows (xinerama support)."
:depends opacity-enable
:group (appearance window-effects)
:type boolean
:after-set (lambda () (switch-opacity)))
- (defcustom top-offset -15 "The top offset for shadows. (Default -15)"
+ (defcustom top-offset -15 "The top offset for shadows (Default -15)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (25 20 15 10 5 0 -05 -10 -15 -20 -25 -30 -35 -40 -45 -50)
:after-set (lambda () (switch-opacity)))
- (defcustom left-offset -15 "The left offset for shadows. (Default -15)"
+ (defcustom left-offset -15 "The left offset for shadows (Default -15)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (25 20 15 10 5 0 -05 -10 -15 -20 -25 -30 -35 -40 -45 -50)
:after-set (lambda () (switch-opacity)))
- (defcustom translucency 80 "The translucency for shadows. (Default 80)"
+ (defcustom translucency 80 "The translucency for shadows (Default 80)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (10 20 30 40 50 60 70 80 90 100)
:after-set (lambda () (switch-opacity)))
- (defcustom blur-radius 12 "The blur radius for shadows. (Default 12)"
+ (defcustom blur-radius 12 "The blur radius for shadows (Default 12)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24)
:after-set (lambda () (switch-opacity)))
- (defcustom shadow-red 0 "Red color value of shadow. (Default 0)"
+ (defcustom shadow-red 0 "Red color value of shadow (Default 0)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (0 1 2 3 4 5 6 7 8 9 10)
:after-set (lambda () (switch-opacity)))
- (defcustom shadow-green 0 "Green color value of shadow. (Default 0)"
+ (defcustom shadow-green 0 "Green color value of shadow (Default 0)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (0 1 2 3 4 5 6 7 8 9 10)
:after-set (lambda () (switch-opacity)))
- (defcustom shadow-blue 0 "Blue color value of shadow. (Default 0)"
+ (defcustom shadow-blue 0 "Blue color value of shadow (Default 0)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
@@ -157,21 +157,21 @@
:type boolean
:after-set (lambda () (switch-opacity)))
- (defcustom fade-in 28 "Opacity change between steps while fading in. (Default 28)"
+ (defcustom fade-in 28 "Opacity change between steps while fading in (Default 28)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (1 7 14 21 28 35 42 49 56)
:after-set (lambda () (switch-opacity)))
- (defcustom fade-out 28 "Opacity change between steps while fading out. (Default 28)"
+ (defcustom fade-out 28 "Opacity change between steps while fading out (Default 28)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (1 7 14 21 28 35 42 49 56)
:after-set (lambda () (switch-opacity)))
- (defcustom fade-time 10 "The time between steps in a fade in milliseconds. (Default 10)"
+ (defcustom fade-time 10 "The time between steps in a fade in milliseconds (Default 10)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
@@ -184,60 +184,60 @@
:type boolean
:after-set (lambda () (switch-opacity)))
- (defcustom menu-opacity 10 "The opacity for menus. (Default 10)"
+ (defcustom menu-opacity 10 "The opacity for menus (Default 10)."
:depends opacity-enable
:group (appearance window-effects)
:type symbol
:options (5 6 7 8 9 10)
:after-set (lambda () (switch-opacity)))
- (defcustom opacity-by-move 75 "Opacity by move. (Default 75)"
+ (defcustom opacity-by-move 75 "Opacity by move (Default 75)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 75 1))
- (defcustom opacity-by-resize 75 "Opacity by resize. (Default 75)"
+ (defcustom opacity-by-resize 75 "Opacity by resize (Default 75)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 75 1))
- (defcustom opacity-normal-i 90 "Opacity normal windows inactive. (Default 90)"
+ (defcustom opacity-normal-i 90 "Opacity normal windows inactive (Default 90)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 90 1)
:after-set (lambda () (update-opacity 'normal)))
- (defcustom opacity-dialog-i 85 "Opacity dialog windows inactive. (Default 85)"
+ (defcustom opacity-dialog-i 85 "Opacity dialog windows inactive (Default 85)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 85 1)
:after-set (lambda () (update-opacity 'dialog)))
- (defcustom opacity-tabbed-i 95 "Opacity tabbed windows inactive. (Default 95)"
+ (defcustom opacity-tabbed-i 95 "Opacity tabbed windows inactive (Default 95)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 95 1)
:after-set (lambda () (update-opacity 'tabbed)))
- (defcustom opacity-desktop-i 75 "Opacity desktop windows inactive. (Default 75)"
+ (defcustom opacity-desktop-i 75 "Opacity desktop windows inactive (Default 75)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 75 1)
:after-set (lambda () (update-opacity 'desktop)))
- (defcustom opacity-dock-a 100 "Opacity dock windows active. (Default 100)"
+ (defcustom opacity-dock-a 100 "Opacity dock windows active (Default 100)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 50 100 100 1)
:after-set (lambda () (update-opacity 'dock)))
- (defcustom opacity-dock-i 80 "Opacity dock windows inactive. (Default 80)"
+ (defcustom opacity-dock-i 80 "Opacity dock windows inactive (Default 80)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 80 1)
:after-set (lambda () (update-opacity 'dock)))
- (defcustom opacity-notify-i 85 "Opacity notify. (Default 85)"
+ (defcustom opacity-notify-i 85 "Opacity notify (Default 85)."
:depends opacity-enable
:group (appearance window-effects)
:type (number 0 100 85 1)
diff -urNad sawfish.orig/lisp/sawfish/wm/state/iconify.jl sawfish/lisp/sawfish/wm/state/iconify.jl
--- sawfish.orig/lisp/sawfish/wm/state/iconify.jl 2013-10-09 17:52:06.000000000 +0200
+++ sawfish/lisp/sawfish/wm/state/iconify.jl 2013-10-09 17:50:29.000000000 +0200
@@ -232,6 +232,7 @@
(emit-sticky-hook w)))
(define (make-window-unsticky w)
+ "Make the window only appear on the current workspaces or viewports."
(when (window-sticky-p w)
(make-window-unsticky/workspace w #:no-hooks t)
(make-window-unsticky/viewport w #:no-hooks t)
diff -urNad sawfish.orig/lisp/sawfish/wm/tabs/tab.jl sawfish/lisp/sawfish/wm/tabs/tab.jl
--- sawfish.orig/lisp/sawfish/wm/tabs/tab.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/tabs/tab.jl 2013-10-09 17:50:29.000000000 +0200
@@ -68,7 +68,7 @@
(tab-pos group tabnum win)))
(define (tab-pos group tabnum win)
- "find the left and right pixel offsets of a tab"
+ "Find the left and right pixel offsets of a tab"
(let* ((dim-x (car (window-dimensions win)))
(dim-y (cdr (window-dimensions win)))
(margin-l
@@ -174,7 +174,7 @@
(call-window-hook 'window-state-change-hook w (list '(marked))))
;; This function is for interactive use. Use tab-group-window for lisp.
- (define (tab-add-to-group win)
+ (define (tab-window-add-to-tabgroup win)
"Add a window to a tabgroup. Apply this command on a window, then
on another. The first window will be added to the tabgroup containig
the second."
@@ -189,13 +189,13 @@
(window-put win 'marked nil)
(setq marked-window nil))
(window-put win 'marked t)
- (default-cursor (get-cursor 'clock))
+ (default-cursor (get-cursor marked-cursor-shape))
(setq marked-window (cons win)))
(emit-marked-hook win)))
- (define-command 'tab-add-to-group tab-add-to-group #:spec "%W")
+ (define-command 'tab-window-add-to-tabgroup tab-window-add-to-tabgroup #:spec "%W")
- (define (tabgroup-add-to-group win)
+ (define (tab-tabgroup-add-to-tabgroup win)
"Add a tabgroup to a tabgroup. Apply this command on a window
from the tabgroup, then on another. The tabgroup will be added to
the tabgroup containig the second."
@@ -203,16 +203,17 @@
(if marked-window
(progn
(setq marked-window (tab-group-window-index (car marked-window)))
- (tab-add-to-group win))
- (default-cursor (get-cursor 'clock))
+ (tab-window-add-to-tabgroup win))
+ (default-cursor (get-cursor marked-cursor-shape))
(setq marked-window (tab-group-window-index win))
(mapcar (lambda (w)
(window-put w 'marked t)
(emit-marked-hook w)) marked-window))))
- (define-command 'tabgroup-add-to-group tabgroup-add-to-group #:spec "%W")
+ (define-command 'tab-tabgroup-add-to-tabgroup tab-tabgroup-add-to-tabgroup #:spec "%W")
(define (check-win)
+ "Check if a window that was marked as tab is destroy"
(if (car marked-window)
(let ((m-list marked-window))
(setq marked-window nil)
diff -urNad sawfish.orig/lisp/sawfish/wm/tabs/tabgroup.jl sawfish/lisp/sawfish/wm/tabs/tabgroup.jl
--- sawfish.orig/lisp/sawfish/wm/tabs/tabgroup.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/lisp/sawfish/wm/tabs/tabgroup.jl 2013-10-09 17:50:29.000000000 +0200
@@ -73,11 +73,14 @@
(window-get w 'tabbed))
(define (frame-style-tabs-support-p w)
+ "Returns t if the framestyle from W supports tabs.
+Also need the currect settings in the theme.jl from the theme."
(setq tab-theme-name nil)
(call-window-hook 'window-state-change-hook w (list '(tab-theme-name)))
(eq (window-get w 'current-frame-style) tab-theme-name))
(define (net-wm-window-type-normal-p w)
+ "Returns t if _NET_WM_WINDOW_TYPE by W is true or W has window-property 'force-tab"
(or (window-get w 'force-tab)
(if (get-x-property w '_NET_WM_WINDOW_TYPE)
(equal (aref (nth 2 (get-x-property w '_NET_WM_WINDOW_TYPE)) 0) '_NET_WM_WINDOW_TYPE_NORMAL))))
@@ -106,7 +109,7 @@
group))
(define (tab-find-window win)
- "Return the group containing win."
+ "Return the group containing WIN."
(let loop ((gr tab-groups))
(cond
((null gr)
@@ -118,7 +121,7 @@
(loop (cdr gr))))))
(define (tab-window-group-index win)
- "Return the index of the group containing win."
+ "Return the index of the group containing WIN."
(let loop ((index 0))
(cond
((eq index (length tab-groups))
@@ -130,7 +133,7 @@
(loop (+ index 1))))))
(define (tab-group-window-index win)
- "Return the windows of the group containing win."
+ "Return the windows of the group containing WIN."
(let* ((index (tab-window-group-index win))
(wins (tab-group-window-list (nth index tab-groups))))
wins))
@@ -288,6 +291,7 @@
;; don't add a window as tab, if it already
;; exists on another workspace or window type
;; is not a "normal" window (e.g. dock panel ...)
+ ;; and framestyle supported tabs
(when (and (not (cdr (window-get win 'workspaces)))
(net-wm-window-type-normal-p w)
(net-wm-window-type-normal-p win)
@@ -417,7 +421,7 @@
(before-move-resize win)))
(define (before-move-resize win)
- "Releas win from the tabgroup and iconify the rest from the group."
+ "Releas WIN from the tabgroup and iconify the rest from the group."
(let* ((default-window-animator 'none)
(index (tab-window-group-index win))
(wins (tab-group-window-index win))
@@ -434,7 +438,7 @@
(setq tab-refresh-lock t))
(define (after-move-resize win)
- "Add all tabs to the tabgroup from win. (Releas and iconify by before-move-resize)"
+ "Add all tabs to the tabgroup from WIN. (Releas and iconify by before-move-resize)"
(setq tab-refresh-lock nil)
(let* ((default-window-animator 'none)
(wins all-wins)
@@ -467,7 +471,7 @@
(setq last-unmap-id (window-id win)))
(define (in-tab-group win)
- "Add a new window as tab if have one (the first created if more as one)
+ "Add a new window WIN as tab if have one (the first created if more as one)
of the windows the same 'tab-group property"
(when (window-get win 'tab-group)
(setq in-tab-group-name (append in-tab-group-name (cons (cons (window-id win) (window-get win 'tab-group)))))
@@ -483,7 +487,7 @@
(in-tab-group win)))))
(define (remove-from-tab-group win)
- "Remove window from in-tab-group-name alist if it have a 'tab-group property"
+ "Remove WIN from in-tab-group-name alist if it have a 'tab-group property"
(when (window-get win 'tab-group)
(setq in-tab-group-name (remove (assoc last-unmap-id in-tab-group-name) in-tab-group-name))))
themes.patch
(text/x-patch, 15.3 KB)
diff -urNad sawfish.orig/themes/StyleTab/theme.jl sawfish/themes/StyleTab/theme.jl
--- sawfish.orig/themes/StyleTab/theme.jl 2013-10-09 17:52:05.000000000 +0200
+++ sawfish/themes/StyleTab/theme.jl 2013-10-09 17:50:29.000000000 +0200
@@ -60,19 +60,19 @@
:options (Default Reduce Glass WixDa Smoothly Brown Darkblue Blue Pink Green)
:after-set (lambda () (color-changed)))
-(defcustom styletab-c:tabbar-marked t "Customize tabbar color if window marked to add as tab."
+(defcustom styletab-c:tabbar-marked t "Colorize tab/titelbar if it is to be added as a tab."
:group (appearance StyleTab:group)
:type boolean
:after-set (lambda () (botton-color-changed recolor-tab)))
(defcustom styletab-c:tabbar-marked-color (get-color "#DF0000")
- "Color of tabbar if window marked to add as tab."
+ "Color of tab/titelbar when it was marked."
:group (appearance StyleTab:group)
:type color
:depends styletab-c:tabbar-marked
:after-set (lambda () (botton-color-changed recolor-tab)))
-(defcustom styletab-c:hightlight-tabbar nil "Also hightlighted tabbars."
+(defcustom styletab-c:hightlight-tabbar nil "Also hightlighted tab/titelbar."
:group (appearance StyleTab:group)
:type boolean
:after-set (lambda () (botton-color-changed recolor-tab)))
@@ -118,156 +118,156 @@
:after-set (lambda () (bright-changed)))
(defcustom styletab-c:hightlight-close nil
- "Hightlighted close button."
+ "Colorize the close button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-close-button)))
-(defcustom styletab-c:hightlight-close-all nil "Always use."
+(defcustom styletab-c:hightlight-close-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-close
:after-set (lambda () (botton-color-changed recolor-close-button)))
(defcustom styletab-c:hightlight-maximize nil
- "Hightlighted maximize button."
+ "Colorize the maximize button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-maximize-button)))
-(defcustom styletab-c:hightlight-maximize-all nil "Always use."
+(defcustom styletab-c:hightlight-maximize-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-maximize
:after-set (lambda () (botton-color-changed recolor-maximize-button)))
(defcustom styletab-c:hightlight-iconify nil
- "Hightlighted minimize button."
+ "Colorize the minimize button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-iconify-button)))
-(defcustom styletab-c:hightlight-iconify-all nil "Always use."
+(defcustom styletab-c:hightlight-iconify-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-iconify
:after-set (lambda () (botton-color-changed recolor-iconify-button)))
(defcustom styletab-c:hightlight-shade nil
- "Hightlighted shade button."
+ "Colorize the shade button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-shade-button)))
-(defcustom styletab-c:hightlight-shade-all nil "Always use."
+(defcustom styletab-c:hightlight-shade-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-shade
:after-set (lambda () (botton-color-changed recolor-shade-button)))
(defcustom styletab-c:hightlight-sticky nil
- "Hightlighted sticky button."
+ "Colorize the sticky button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-sticky-button)))
-(defcustom styletab-c:hightlight-sticky-all nil "Always use."
+(defcustom styletab-c:hightlight-sticky-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-sticky
:after-set (lambda () (botton-color-changed recolor-sticky-button)))
(defcustom styletab-c:hightlight-menu nil
- "Hightlighted menu button."
+ "Colorize the menu button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-menu-button)))
-(defcustom styletab-c:hightlight-menu-all nil "Always use."
+(defcustom styletab-c:hightlight-menu-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-menu
:after-set (lambda () (botton-color-changed recolor-menu-button)))
(defcustom styletab-c:hightlight-frame-type nil
- "Hightlighted frame type button."
+ "Colorize the frame type button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-frame-type-button)))
-(defcustom styletab-c:hightlight-frame-type-all nil "Always use."
+(defcustom styletab-c:hightlight-frame-type-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-frame-type
:after-set (lambda () (botton-color-changed recolor-frame-type-button)))
(defcustom styletab-c:hightlight-lock nil
- "Hightlighted lock button."
+ "Colorize the lock button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-lock-button)))
-(defcustom styletab-c:hightlight-lock-all nil "Always use."
+(defcustom styletab-c:hightlight-lock-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-lock
:after-set (lambda () (botton-color-changed recolor-lock-button)))
(defcustom styletab-c:hightlight-move-resize nil
- "Hightlighted move/resize button."
+ "Colorize the move/resize button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-move-resize-button)))
-(defcustom styletab-c:hightlight-move-resize-all nil "Always use."
+(defcustom styletab-c:hightlight-move-resize-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-move-resize
:after-set (lambda () (botton-color-changed recolor-move-resize-button)))
(defcustom styletab-c:hightlight-raise-lower nil
- "Hightlighted raise/lower button."
+ "Colorize the raise/lower button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-raise-lower-button)))
-(defcustom styletab-c:hightlight-raise-lower-all nil "Always use."
+(defcustom styletab-c:hightlight-raise-lower-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-raise-lower
:after-set (lambda () (botton-color-changed recolor-raise-lower-button)))
(defcustom styletab-c:hightlight-next nil
- "Hightlighted next workspace button."
+ "Colorize the next workspace button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-next-button)))
-(defcustom styletab-c:hightlight-next-all nil "Always use."
+(defcustom styletab-c:hightlight-next-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-next
:after-set (lambda () (botton-color-changed recolor-next-button)))
(defcustom styletab-c:hightlight-prev nil
- "Hightlighted previous workspace button."
+ "Colorize the previous workspace button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-prev-button)))
-(defcustom styletab-c:hightlight-prev-all nil "Always use."
+(defcustom styletab-c:hightlight-prev-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-prev
:after-set (lambda () (botton-color-changed recolor-prev-button)))
(defcustom styletab-c:hightlight-rename nil
- "Hightlighted rename button."
+ "Colorize the rename button."
:group (appearance StyleTab:group)
:type (optional color)
:after-set (lambda () (botton-color-changed recolor-rename-button)))
-(defcustom styletab-c:hightlight-rename-all nil "Always use."
+(defcustom styletab-c:hightlight-rename-all nil "Always colorize."
:group (appearance StyleTab:group)
:type boolean
:depends styletab-c:hightlight-rename
@@ -283,7 +283,7 @@
;; crashes.
(list 'h-and '(choice \(none\) close menu maximize minimize shade sticky space send-to-prev
send-to-next lock raise-lower move-resize rename frame-type)
- '(boolean "Also show in transients"))))))
+ '(boolean "Also show in transients."))))))
(eval
(macroexpand
`(defcustom ,(car arg) ;; name
@@ -297,35 +297,35 @@
'( ;; list to pass to mapc
(styletab-c:top-left-buttons
'((menu t) (sticky nil) (shade nil))
- "Top Titlebar Left Buttons (from left to right) \\top"
+ "Top Titlebar Left Buttons (from left to right). \\top"
StyleTab:top-buttons-group)
(styletab-c:top-right-buttons
'((close t) (maximize t) (minimize nil))
- "Top Titlebar Right Buttons (from right to left) \\top"
+ "Top Titlebar Right Buttons (from right to left). \\top"
StyleTab:top-buttons-group)
(styletab-c:bottom-left-buttons
'((menu t) (sticky nil) (shade nil))
- "Bottom Titlebar Left Buttons (from left to right) \\top"
+ "Bottom Titlebar Left Buttons (from left to right). \\top"
StyleTab:bottom-buttons-group)
(styletab-c:bottom-right-buttons
'((close t) (maximize t) (minimize nil))
- "Bottom Titlebar Right Buttons (from right to left) \\top"
+ "Bottom Titlebar Right Buttons (from right to left). \\top"
StyleTab:bottom-buttons-group)
(styletab-c:left-top-buttons
'((close t) (maximize t) (minimize nil))
- "Left Titlebar Top Buttons (from top to bottom) \\top"
+ "Left Titlebar Top Buttons (from top to bottom). \\top"
StyleTab:left-buttons-group)
(styletab-c:left-bottom-buttons
'((menu t) (sticky nil) (shade nil))
- "Left Titlebar Bottom Buttons (from bottom to top) \\top"
+ "Left Titlebar Bottom Buttons (from bottom to top). \\top"
StyleTab:left-buttons-group)
(styletab-c:right-top-buttons
'((close t) (maximize t) (minimize nil))
- "Right Titlebar Top Buttons (from top to bottom) \\top"
+ "Right Titlebar Top Buttons (from top to bottom). \\top"
StyleTab:right-buttons-group)
(styletab-c:right-bottom-buttons
'((menu t) (sticky nil) (shade nil))
- "Right Titlebar Bottom Buttons (from bottom to top) \\top"
+ "Right Titlebar Bottom Buttons (from bottom to top). \\top"
StyleTab:right-buttons-group)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -522,8 +522,8 @@
(resize-window-to w dim-x dim-y)
(tab-refresh-group w 'move))))
-(define (tabbartotop)
- "Move tab-bar to top."
+(define (tab/titelbartotop)
+ "Move tab/titelbar to top, with resize (StyleTab Option)."
(let ((w (current-event-window)))
(if (not (window-get w 'title-position))
(window-put w 'title-position styletab-c:titlebar-place))
@@ -533,8 +533,8 @@
(if (eq (window-get w 'title-position) 'bottom)
(rotate-tab 'horiz 'opposite))))
-(define (tabbartobottom)
- "Move tab-bar to bottom."
+(define (tab/titelbartobottom)
+ "Move tab/titelbar to bottom, with resize (StyleTab Option)."
(let ((w (current-event-window)))
(if (not (window-get w 'title-position))
(window-put w 'title-position styletab-c:titlebar-place))
@@ -544,8 +544,8 @@
(if (eq (window-get w 'title-position) 'top)
(rotate-tab 'horiz 'opposite))))
-(define (tabbartoleft)
- "Move tab-bar to left."
+(define (tab/titelbartoleft)
+ "Move tab/titelbar to left, with resize (StyleTab Option)."
(let ((w (current-event-window)))
(if (not (window-get w 'title-position))
(window-put w 'title-position styletab-c:titlebar-place))
@@ -555,8 +555,8 @@
(if (eq (window-get w 'title-position) 'right)
(rotate-tab 'vert 'opposite))))
-(define (tabbartoright)
- "Move tab-bar to right."
+(define (tab/titelbartoright)
+ "Move tab/titelbar to right, with resize (StyleTab Option)."
(let ((w (current-event-window)))
(if (not (window-get w 'title-position))
(window-put w 'title-position styletab-c:titlebar-place))
@@ -566,8 +566,8 @@
(if (eq (window-get w 'title-position) 'left)
(rotate-tab 'vert 'opposite))))
-(define (tabbartoggle)
- "Move tab-bar to the opposite side. (Swap top & bottom, or left & right)"
+(define (tab/titelbartoggle)
+ "Move tab/titelbar to the opposite side, with resize (StyleTab Option)."
(let ((w (current-event-window)))
(if (not (window-get w 'title-position))
(window-put w 'title-position styletab-c:titlebar-place))
@@ -576,23 +576,23 @@
(rotate-tab 'horiz 'opposite)
(rotate-tab 'vert 'opposite))))
-(define-command-gaol 'tabbar-toggle tabbartoggle)
-(define-command-gaol 'tabbar-to-top tabbartotop)
-(define-command-gaol 'tabbar-to-bottom tabbartobottom)
-(define-command-gaol 'tabbar-to-left tabbartoleft)
-(define-command-gaol 'tabbar-to-right tabbartoright)
+(define-command-gaol 'tab/titelbar-toggle tab/titelbartoggle)
+(define-command-gaol 'tab/titelbar-to-top tab/titelbartotop)
+(define-command-gaol 'tab/titelbar-to-bottom tab/titelbartobottom)
+(define-command-gaol 'tab/titelbar-to-left tab/titelbartoleft)
+(define-command-gaol 'tab/titelbar-to-right tab/titelbartoright)
(def-frame-class tabbar-horizontal-left-edge ()
(bind-keys tabbar-horizontal-left-edge-keymap
- "Button1-Off" 'tabbar-to-left
- "Button2-Off" 'tabbar-toggle
- "Button3-Off" 'tabbar-to-right))
+ "Button1-Off" 'tab/titelbar-to-left
+ "Button2-Off" 'tab/titelbar-toggle
+ "Button3-Off" 'tab/titelbar-to-right))
(def-frame-class tabbar-vertical-top-edge ()
(bind-keys tabbar-vertical-top-edge-keymap
- "Button1-Off" 'tabbar-to-top
- "Button2-Off" 'tabbar-toggle
- "Button3-Off" 'tabbar-to-bottom))
+ "Button1-Off" 'tab/titelbar-to-top
+ "Button2-Off" 'tab/titelbar-toggle
+ "Button3-Off" 'tab/titelbar-to-bottom))
(define (f-type dest)
(let ((w (current-event-window))
@@ -707,15 +707,15 @@
(tab-refresh-group w 'move))))
(define (set-frame-default-and-default/transient)
- "Set frametype to `default' and toggle transient-ness with resize."
+ "Set frametype to `default' and toggle transient-ness, with resize (StyleTab Option)."
(f-type 'def-tra))
(define (set-frame-unframed-and-unframed/shaped-transient)
- "Set frametype to 'unframed' and toggle transient-ness with resize"
+ "Set frametype to 'unframed' and toggle transient-ness, with resize (StyleTab Option)."
(f-type 'unf-def))
(define (set-frame-shaped-and-shaped/shaped-transient)
- "Set frametype to shaped and toggle transient-ness with resize"
+ "Set frametype to shaped and toggle transient-ness, with resize (StyleTab Option)."
(f-type 'sha-tra))
(define-command-gaol 'set-frame-default-and-default/transient-toggle set-frame-default-and-default/transient)
signature.asc
(application/pgp-signature, 198 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iEYEARECAAYFAlJViyMACgkQ5bxw1bjXsrCP+wCfcbxk1geDsdIHUX/G8uMi+1Mb 5G0An0VsSxlCBiC389dIb5/BblUVUCjx =K6AF -----END PGP SIGNATURE-----