Commit: 99de52ea6dcdbf9a8cf4d444ac66525b7d2a4cee - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: 99de52ea6dcdbf9a8cf4d444ac66525b7d2a4cee (tree)
• Time: 2012-06-10 17:55:05
• Author: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

added missing hunk for new-window-as-tab feature

Change Summary

• modified: lisp/sawfish/wm/tabs/tabgroup.jl

Incremental Difference

--- a/lisp/sawfish/wm/tabs/tabgroup.jl
+++ b/lisp/sawfish/wm/tabs/tabgroup.jl
@@ -48,9 +48,9 @@
           sawfish.wm.util.groups
           sawfish.wm.commands.groups
           sawfish.wm.workspace)
-  
+
   (define-structure-alias tabgroup sawfish.wm.tabs.tabgroup)
-  
+
   (define current-win nil)
   (define all-wins nil)
   (define oldgroup nil)
@@ -123,7 +123,7 @@
     (if (eq elem (car list))
         0
       (+ 1 (tab-rank elem (cdr list)))))
-  
+
   (define (tab-delete-window-from-group win index)
     "Remove WIN from the group at given index."
     (let* ((old (nth index tab-groups))
@@ -243,7 +243,7 @@ sticky, unsticky, fixed-position."
                         (make-window-unsticky w)) unfocus))
              ((eq prop 'shade)
               (mapcar (lambda (w)
-                        (shade-window w)) unfocus)) 
+                        (shade-window w)) unfocus))
              ((eq prop 'unshade)
               (mapcar (lambda (w)
                         (unshade-window w)) unfocus))))
@@ -253,7 +253,7 @@ sticky, unsticky, fixed-position."
   (define (tab-group-window w win)
     "Add window W to tabgroup containing WIN."
     ;; don't add a window as tab, if it already
-    ;; exists on another workspace or window type 
+    ;; exists on another workspace or window type
     ;; is not a "normal" window (e.g. dock panel ...)
     (when (and (not (cdr (window-get win 'workspaces)))
                (equal (aref (nth 2 (get-x-property w '_NET_WM_WINDOW_TYPE)) 0) '_NET_WM_WINDOW_TYPE_NORMAL)
@@ -322,22 +322,22 @@ sticky, unsticky, fixed-position."
               (set-input-focus w)
               (if (not (window-tabbed-p win)) (window-put win 'tabbed t))
               (window-put w 'tabbed t)))))))
-  
+
   (define (tab-release-window w)
     "Release the window from its group."
     (setq release-window nil)
     (tab-delete-window-from-tab-groups w)
     (tab-make-new-group w))
-  
+
   (define-command 'tab-release-window tab-release-window #:spec "%f")
-  
+
   (define (tab-group-offset win n)
     "Return the window at position (pos+n) in window's group."
     (let* ((gr (tab-group-window-list (tab-find-window win)))
            (size (length gr))
            (r (tab-rank win gr)))
       (nth (modulo (+ r n) size) gr)))
-  
+
   (define (tab-same-group-p w1 w2)
     "Predicate : true <=> w1 and w2 are grouped together."
     (member w1 (tab-group-window-list (tab-find-window w2))))
@@ -421,7 +421,7 @@ sticky, unsticky, fixed-position."
         (setq all-wins nil)
         (setq current-win nil))
       (setq tab-refresh-lock t)
-      (when (window-tabbed-p win) 
+      (when (window-tabbed-p win)
         (tab-refresh-group win 'move)
         (tab-refresh-group win 'frame))))
 
@@ -429,14 +429,20 @@ sticky, unsticky, fixed-position."
     (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 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)))))
+     (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)))))
+        ;; unmap-notify-hook gets not always a window-id for all
+        ;; windows e.g. gimp (it will close more as one window and
+        ;; also not all call the unmap-notify-hook and/or we get the window-id).
+        ;; This next "if" will clean the list and remove the "ghosts".
+        (if (not (eq open-win-tabgroup nil))
+            (if (not (eq win open-win-tabgroup))
+                (tab-group-window win open-win-tabgroup))
+          (setq in-tab-group-name (remove (rassoc (window-get win 'tab-group) in-tab-group-name) in-tab-group-name))
+          (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"
@@ -466,7 +472,7 @@ of the windows the same 'tab-group property"
                         ((eq 'stacking args)
                          (tab-refresh-group win 'depth)
                          (tab-refresh-group win 'frame))))))
-    
+
     (add-hook 'focus-in-hook (lambda (win) (tab-group-raise win)))
     (when (eq move-outline-mode 'opaque)
       (add-hook 'before-move-hook (lambda (win) (if (window-tabbed-p win) (before-move-resize win)))))