提交: a1e3c68dda0a3c69f25644adde8d6f5a7272f16a - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修订版: a1e3c68dda0a3c69f25644adde8d6f5a7272f16a (tree)
• 时间: 2013-04-16 10:12:21
• 作者: Jose Antonio Ortega Ruiz <jao@gnu....>
• Commiter: Jose Antonio Ortega Ruiz

Log Message

Fix for never-tile window matcher

更改概述

• modified: lisp/sawfish/wm/tile/tiler.jl

差异

--- a/lisp/sawfish/wm/tile/tiler.jl
+++ b/lisp/sawfish/wm/tile/tiler.jl
@@ -6,8 +6,7 @@
             tileable-windows
             next-tiling
             setting
-            set-setting
-	    tileable-window-p)
+            set-setting)
 
     (open rep
           rep.system
@@ -48,7 +47,7 @@
 
   (define (register-workspace-tiler ws tiler args auto #!optional name picker)
     (let ((curr (assoc ws %tilers))
-          (new (list tiler args auto name (or picker (lambda (w) #t)))))
+          (new (list tiler args auto name picker)))
       (if (null curr)
           (setq %tilers (cons (list ws new null-tiler) %tilers))
         (setcdr curr (cons new (cdr curr))))))
@@ -79,12 +78,18 @@
 
   (define (tiling-name ti) (nth 3 ti))
 
-  (define (tiling-master-picker ti) (nth 4 ti))
+  (define (tiling-master-picker ti)
+    (or (nth 4 ti) (lambda (w) #t)))
+
+  (define (tileable-window-p w)
+    (and (tiling-auto-p (tiling (window-workspace w)) w)
+         (not (window-never-tile-p w))
+	 (not (window-ignored-p w))
+	 (not (dock-window-p w))
+         (eq (window-type w) 'default)))
 
   (define (tileable-windows #!optional ignore)
-    (let ((ws (tileable-workspace-windows ignore))
-          (tp (nth 2 (tiling))))
-      (if (functionp tp) (filter tp ws) ws)))
+    (filter tileable-window-p (tileable-workspace-windows ignore)))
 
   (define (current-tiler-name) (tiling-name (tiling)))
 
@@ -92,7 +97,9 @@
     (let ((test (tiling-master-picker ti)))
       (or (and master (not (eq master ignore)) (test master) master)
           (let ((wl (tileable-workspace-windows ignore)))
-            (or (car (filter test wl)) master (car wl))))))
+            (or (car (filter test wl))
+                (and (tileable-window-p master) master)
+                (car wl))))))
 
   (define (tile-workspace #!optional new-window destroyed-window)
     (interactive)
@@ -105,13 +112,6 @@
     (interactive "%f")
     (when (restore-window w) (tile-workspace nil w)))
 
-  (define (tileable-window-p w)
-    (and (tiling-auto-p (tiling (window-workspace w)) w)
-         (not (window-never-tile-p w))
-	 (not (window-ignored-p w))
-	 (not (dock-window-p w))
-         (eq (window-type w) 'default)))
-
   (define (add-autotile w)
     (save-size w)
     (when (tileable-window-p w)