提交: e23fced1ad164e1d42b17f3246dcffa43b68faab - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修订版: e23fced1ad164e1d42b17f3246dcffa43b68faab (tree)
• 时间: 2012-03-26 23:59:40
• 作者: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

tab-group feature

更改概述

• modified: lisp/sawfish/wm/ext/match-window.jl
• modified: lisp/sawfish/wm/ext/window-history.jl
• modified: lisp/sawfish/wm/tabs/tabgroup.jl

差异

--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -109,6 +109,7 @@
             (ignored boolean)
             (group ,(lambda ()
                       `(symbol ,@(delete-if-not symbolp (window-group-ids)))))
+            (tab-group string)
             (ungrouped boolean)
             (cycle-skip boolean)
             (window-list-skip boolean)
@@ -274,7 +275,7 @@
       (remove-window-matcher-core (list (cons rules (car props)))
 				  (cdr props)))
     )
-  
+
   (define (remove-window-matcher-core rules props)
     (let
 	((remove-from (lambda (slot)
@@ -515,6 +516,11 @@
             (set-screen-viewport col row)
             (set-window-viewport w col row))))))
 
+  (define-match-window-setter 'tab-group
+    (lambda (w prop value)
+      (declare (unused prop))
+      (when value
+        (window-put w 'tab-group (intern value)))))
 
   (define-match-window-setter 'window-name
     (lambda (w prop value)
@@ -535,7 +541,7 @@
 	    ((eq value 'fullscreen)
 	     (window-put w 'queued-fullscreen-maximize t))
 	    ((eq value 'full-xinerama)
-	     (window-put w 'queued-fullxinerama-maximize))
+	     (window-put w 'queued-fullxinerama-maximize t))
 	    )))
 
   (define-match-window-setter 'keymap-trans

--- a/lisp/sawfish/wm/ext/window-history.jl
+++ b/lisp/sawfish/wm/ext/window-history.jl
@@ -73,7 +73,7 @@
 
   ;; list of states in window-state-change-hook that should be tracked
   (defvar window-history-states '(sticky ignored never-focus type maximized
-                                         frame-style cycle-skip
+                                         frame-style cycle-skip tab-group
                                          window-list-skip title-position))
 
   ;; property matched on

--- a/lisp/sawfish/wm/tabs/tabgroup.jl
+++ b/lisp/sawfish/wm/tabs/tabgroup.jl
@@ -55,6 +55,9 @@
   (define oldgroup nil)
   (define tab-groups nil)
   (define tab-refresh-lock t)
+  (define release-window nil)
+  (define last-unmap-id nil)
+  (define in-tab-group-name nil)
 
   (define (window-tabbed-p w)
     (window-get w 'tabbed))
@@ -132,6 +135,8 @@
 
   (define (tab-delete-window-from-tab-groups w)
     "Find window's group and remove it."
+    (if (not release-window)
+        (remove-from-tab-group w))
     (when (window-tabbed-p w)
       (tab-delete-window-from-group w (tab-window-group-index w))
       (window-put w 'fixed-position nil)
@@ -268,7 +273,9 @@ sticky, unsticky, fixed-position."
         (when (not (eq index index2))
           ;; tabgroup to tabgroup
           (when (window-tabbed-p w)
-            (tab-delete-window-from-tab-groups w))
+            (setq release-window t)
+            (tab-delete-window-from-tab-groups w)
+            (setq release-window nil))
           (setq tab-refresh-lock nil)
           (if (window-get w 'shaded) (unshade-window w))
           (if (window-get win 'shaded) (unshade-window win))
@@ -303,7 +310,9 @@ sticky, unsticky, fixed-position."
   
   (define (tab-release-window w)
     "Release the window from its group."
+    (setq release-window t)
     (tab-delete-window-from-tab-groups w)
+    (setq release-window nil)
     (tab-make-new-group w))
   
   (define-command 'tab-release-window tab-release-window #:spec "%f")
@@ -402,7 +411,27 @@ sticky, unsticky, fixed-position."
         (tab-refresh-group win 'move)
         (tab-refresh-group win 'frame))))
 
+  (define (unmap-id win)
+    (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) 
+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)))))
+      (let ((open-win-tabgroup (get-window-by-id (car (rassoc (window-get win 'tab-group) in-tab-group-name)))))
+        (if (and open-win-tabgroup
+                 (not (eq win open-win-tabgroup)))
+            (tab-group-window win open-win-tabgroup)))))
+
+  (define (remove-from-tab-group win)
+    "Remove window 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))))
+
   (unless batch-mode
+    (add-hook 'after-add-window-hook in-tab-group)
+    (add-hook 'unmap-notify-hook unmap-id)
     (add-hook 'window-state-change-hook
               (lambda (win args)
                 (when (window-tabbed-p win)