提交: f9c3845778c2ff6fbd849957c0e824a8ec97d644 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修订版: f9c3845778c2ff6fbd849957c0e824a8ec97d644 (tree)
• 时间: 2013-03-31 03:46:31
• 作者: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

remove sawfish.wm.ext.expose, add never-tile window matcher in favour of never-expose

更改概述

• delete: lisp/sawfish/wm/ext/expose.jl
• modified: lisp/sawfish/wm/ext/match-window.jl
• modified: lisp/sawfish/wm/tile/utils.jl

差异

--- a/lisp/sawfish/wm/ext/expose.jl
+++ /dev/null
@@ -1,102 +0,0 @@
-;; expose.jl --- Tile Sawfish windows in an intelligent (hah!) fashion
-;;
-;; Description: Handles tiling of all windows on the current workspace.
-;; Windows are automatically sized and arranged to make best use of the
-;; workspace without overlapping.
-;;
-;; Author: Mark Triggs <[e-mail]>
-;; Maintainer: Christopher Roy Bratusek <[e-mail]>
-
-(define-structure sawfish.wm.ext.expose
-
-    (export expose-windows
-            expose-windows-vertically
-            expose-windows-horizontally
-  	    window-never-expose-p)
-
-    (open rep
-	  rep.data
-	  rep.system
-	  sawfish.wm.commands
-	  sawfish.wm.misc
-	  sawfish.wm.windows
-	  sawfish.wm.workspace
-	  sawfish.wm.viewport
-	  sawfish.wm.state.iconify
-	  sawfish.wm.state.maximize
-	  sawfish.wm.state.ignored
-	  sawfish.wm.commands.move-resize)
-
-  (define-structure-alias expose sawfish.wm.ext.expose)
-
-  (defvar min-height (/ (screen-height) 4)
-    "For windows at least, wideness is preferable to tallness. So, the minimum
-height specifies how short you are willing to tolerate your windows before
-an extra column should be used.")
-
-  (define (window-never-expose-p w) (window-get w 'never-expose))
-
-  (defvar top-panel-height 0
-   "This var will be considered when using tile commands offered by hqw-util")
-
-  (defvar bottom-panel-height 0
-    "This var will be considered when using tile commands offered by hqw-util")
-
-  (define (expose-windows-vertically)
-    (lambda ()
-      (let (
-            (wins (workspace-windows current-workspace)))
-         (expose-windows wins t
-                    #:top-left-corner `(0 . ,top-panel-height)
-                    #:height-for-tile (- (screen-height) (+ top-panel-height bottom-panel-height))))))
-
-  (define (expose-windows-horizontally)
-    (lambda ()
-      (let (
-            (wins (workspace-windows current-workspace)))
-         (expose-windows wins nil
-                    #:top-left-corner `(0 . ,top-panel-height)
-                    #:height-for-tile (- (screen-height)
-                                         (+ top-panel-height bottom-panel-height))))))
-
-  (define (expose-windows wins #!optional
-                      vertically
-                      #!key
-                      (width-for-tile (screen-width))
-                      (height-for-tile (screen-height))
-                      (top-left-corner '(0 . 0)))
-   "To tile windows."
-   (let* (
-         (windows (remove-if (or window-iconified-p
-                                 window-never-expose-p
-                                 window-ignored-p)
-                               (or (filter-windows window-on-current-workspace-viewport-p)
-                                   (filter-windows window-on-current-head-viewport-p))))
-         (len (length windows))
-         (border-width (- (car (window-frame-dimensions (car windows)))
-                          (car (window-dimensions (car windows)))))
-         (border-height (- (cdr (window-frame-dimensions (car windows)))
-                           (cdr (window-dimensions (car windows)))))
-         (width-step (ceiling (/  width-for-tile
-                                  len)))
-         (height-step (ceiling (/ height-for-tile
-                                  len))))
-      (do (
-           (w (car windows) (progn (setq windows (cdr windows)) (car windows)))
-           (x (car top-left-corner) (if vertically
-                                          x
-                                       (setq x (+ x width-step))))
-           (y (cdr top-left-corner) (if vertically
-                                          (setq y (+ y height-step))
-                                       y))
-           (win-width (if vertically
-                            (- width-for-tile border-width)
-                         (- width-step border-width)))
-           (win-height (if vertically
-                             (- height-step border-height)
-                           (- height-for-tile border-height)))
-           )
-            ((null wins) )
-         (move-resize-window-to w x y win-width win-height))))
-
-  (define-command 'expose-windows expose-windows))

--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -121,7 +121,7 @@
             (ignore-stacking-requests boolean)
 	    (auto-gravity boolean)
 	    (never-delete boolean)
-	    (never-expose boolean)
+	    (never-tile boolean)
 	    )))
 
   ;; alist of (PROPERTY . FEATURE) mapping properties to the lisp

--- a/lisp/sawfish/wm/tile/utils.jl
+++ b/lisp/sawfish/wm/tile/utils.jl
@@ -18,7 +18,8 @@
             align-workspace-windows
             notify
             take
-            group-by)
+            group-by
+	    window-never-tile-p)
     (open rep
           rep.io.timers
           sawfish.wm.stacking
@@ -34,13 +35,15 @@
 
   (define (window-workspace w) (car (window-get w 'workspaces)))
 
+  (define (window-never-tile-p w) (window-get w 'never-tile))
+
   (define (tileable-workspace-windows #!optional ignore)
     (remove-if (lambda (w)
 		 (or (equal w ignore)
 		     (dock-window-p w)
 		     (window-iconified-p w)
 		     ;; window-matcher
-		     (window-never-expose-p w)
+		     (window-never-tile-p w)
 		     ;; for pager and stuff
 		     (not (window-visible-p w))
 		     ;; no dialogs