Commit: 47c4d4a98fc1599636a83ffc5c3926a08b9a73d5 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: 47c4d4a98fc1599636a83ffc5c3926a08b9a73d5 (tree)
• Time: 2012-04-06 04:50:05
• Author: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

Merge branch 'edge-actions-1.9' into local-master

Conflicts:
ChangeLog

Change Summary

• modified: ChangeLog
• modified: lisp/sawfish/wm/edge/misc.jl
• modified: lisp/sawfish/wm/ext/expose.jl

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
[phone]  Christopher Roy Bratusek <[e-mail]>
+	* lisp/sawfish/wm/ext/expose.jl
+	* lisp/sawfish/wm/edge/misc.jl: fixup expose action
+
 2012-03-26  Christopher Roy Bratusek <[e-mail]>
 	* lisp/sawfish/wm/ext/match-window.jl
 	* lisp/sawfish/wm/ext/window-history.jl

--- a/lisp/sawfish/wm/edge/misc.jl
+++ b/lisp/sawfish/wm/edge/misc.jl
@@ -21,12 +21,12 @@
 (define-structure sawfish.wm.edge.misc
 
     (export maximize-action
-			expose-action)
+   	    expose-action)
 
     (open rep
-	  rep
 	  rep.system
 	  sawfish.wm.windows
+	  sawfish.wm.commands
 	  sawfish.wm.events
 	  sawfish.wm.state.maximize
 	  sawfish.wm.ext.expose)

--- a/lisp/sawfish/wm/ext/expose.jl
+++ b/lisp/sawfish/wm/ext/expose.jl
@@ -10,8 +10,9 @@
 (define-structure sawfish.wm.ext.expose
 
     (export expose-windows
-			expose-windows-action
-			window-never-expose-p)
+            expose-windows-vertically
+            expose-windows-horizontally
+  	    window-never-expose-p)
 
     (open rep
 	  rep.data
@@ -41,7 +42,7 @@ an extra column should be used.")
   (defvar bottom-panel-height 0
     "This var will be considered when using tile commands offered by hqw-util")
 
-  (define-command 'expose-windows-vertically
+  (define (expose-windows-vertically)
     (lambda ()
       (let (
             (wins (workspace-windows current-workspace)))
@@ -49,7 +50,7 @@ an extra column should be used.")
                     #:top-left-corner `(0 . ,top-panel-height)
                     #:height-for-tile (- (screen-height) (+ top-panel-height bottom-panel-height))))))
 
-  (define-command 'expose-windows-horizontally
+  (define (expose-windows-horizontally)
     (lambda ()
       (let (
             (wins (workspace-windows current-workspace)))
@@ -72,9 +73,9 @@ an extra column should be used.")
                                (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))) 
+         (border-width (- (car (window-frame-dimensions (car windows)))
                           (car (window-dimensions (car windows)))))
-         (border-height (- (cdr (window-frame-dimensions (car windows))) 
+         (border-height (- (cdr (window-frame-dimensions (car windows)))
                            (cdr (window-dimensions (car windows)))))
          (width-step (ceiling (/  width-for-tile
                                   len)))
@@ -98,4 +99,4 @@ an extra column should be used.")
             ((null wins) )
          (move-resize-window-to w x y win-width win-height))))
 
-  (define-command 'expose-windows expose-windows)) 
+  (define-command 'expose-windows expose-windows))