[sawfish] Renamed 'viewport-offset-pixel' to 'viewport-offset-coord'.



commit 11c9dfddf2da09f11f0dc0bc7f62aa266b38ada6
Author: Teika kazura <teika lavabit com>
Date:   Sun Dec 13 21:17:33 2009 +0900

    Renamed 'viewport-offset-pixel' to 'viewport-offset-coord'.

 lisp/sawfish/wm/ext/match-window.jl |    2 +-
 lisp/sawfish/wm/state/maximize.jl   |    6 +++---
 lisp/sawfish/wm/util/edges.jl       |    2 +-
 lisp/sawfish/wm/viewport.jl         |   12 ++++++------
 man/sawfish.texi                    |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/lisp/sawfish/wm/ext/match-window.jl b/lisp/sawfish/wm/ext/match-window.jl
index 2ae2bb7..ef98352 100644
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -389,7 +389,7 @@
     (lambda (w prop value)
       (declare (unused prop))
       (let* ((size (window-frame-dimensions w))
-             (vp-offset (viewport-offset-pixel (window-viewport w)))
+             (vp-offset (viewport-offset-coord (window-viewport w)))
              (x (if (symbolp value)
                     (cond ((memq value '(east south-east north-east))
                            (- (screen-width) (car size)))
diff --git a/lisp/sawfish/wm/state/maximize.jl b/lisp/sawfish/wm/state/maximize.jl
index 7341347..4c58956 100644
--- a/lisp/sawfish/wm/state/maximize.jl
+++ b/lisp/sawfish/wm/state/maximize.jl
@@ -383,7 +383,7 @@ that dimension.")
   ;; does all unmaximizing except for changing the window properties and
   ;; calling the hooks
   (define (unmaximize-window-1 w #!optional direction before)
-    (let ((vp-offset (viewport-offset-pixel (window-viewport w)))
+    (let ((vp-offset (viewport-offset-coord (window-viewport w)))
           (geom (unmaximized-geometry w))
 	  (coords (window-position w))
 	  (dims (window-dimensions w)))
@@ -519,7 +519,7 @@ unmaximized."
     (cond ((and state (not (window-maximized-fullscreen-p w)))
 	   (when (window-maximizable-p w)
              (let* ((viewport (window-viewport w))
-                    (vp-offset (viewport-offset-pixel viewport))
+                    (vp-offset (viewport-offset-coord viewport))
                     (head (window-head-any-viewport w))
                     (head-offset (head-offset head))
                     (head-dims (head-dimensions head)))
@@ -558,7 +558,7 @@ t")
     (cond ((and state (not (window-maximized-fullscreen-p w)))
 	   (when (window-maximizable-p w)
 	     (let ((screen-dims (screen-dimensions))
-                   (vp-offset (viewport-offset-pixel (window-viewport w))))
+                   (vp-offset (viewport-offset-coord (window-viewport w))))
 	       (save-unmaximized-geometry w)
 	       (window-put w 'unmaximized-type (window-type w))
 	       (push-window-type w 'unframed 'sawfish.wm.state.maximize)
diff --git a/lisp/sawfish/wm/util/edges.jl b/lisp/sawfish/wm/util/edges.jl
index 218fac7..c4525db 100644
--- a/lisp/sawfish/wm/util/edges.jl
+++ b/lisp/sawfish/wm/util/edges.jl
@@ -51,7 +51,7 @@ The returned lists may contain duplicates, and are unsorted."
 
     (let* ((width (screen-width))
            (height (screen-height))
-           (vp-offset (viewport-offset-pixel viewport))
+           (vp-offset (viewport-offset-coord viewport))
            x-edges y-edges)
       (map-windows
        (lambda (w)
diff --git a/lisp/sawfish/wm/viewport.jl b/lisp/sawfish/wm/viewport.jl
index 8e678a5..ac0959f 100644
--- a/lisp/sawfish/wm/viewport.jl
+++ b/lisp/sawfish/wm/viewport.jl
@@ -33,7 +33,7 @@
 	    move-window-viewport
             viewport-at
 	    window-viewport
-            viewport-offset-pixel
+            viewport-offset-coord
             window-relative-position
 	    window-absolute-position
 	    set-number-of-viewports
@@ -427,7 +427,7 @@ even if the viewport currently exists.  If `viewport' is specified
 check only against that viewport."
     (let ((vp (viewport-at (car rect) (nth 1 rect))))
       (when (or (null viewport) (equal vp viewport))
-        (let ((offset (viewport-offset-pixel vp)))
+        (let ((offset (viewport-offset-coord vp)))
           (rect-wholly-within-rect (list (car offset)
                                          (cdr offset)
                                          (+ (car offset) (screen-width))
@@ -442,7 +442,7 @@ check only against that viewport."
     "Return t if `rect' is entirely within some head on some
 viewport. If `head' is provided `rect' must be within that head on
 some viewport."
-    (let* ((offset (viewport-offset-pixel (viewport-at (car rect)
+    (let* ((offset (viewport-offset-coord (viewport-at (car rect)
                                                  (nth 1 rect))))
            (left (- (car rect) (car offset)))
            (top (- (nth 1 rect) (cdr offset)))
@@ -464,12 +464,12 @@ some viewport."
            (dims (window-dimensions w))
            (center (cons (+ (car coords) (quotient (car dims) 2))
                          (+ (cdr coords) (quotient (cdr dims) 2))))
-           (vp-offset (viewport-offset-pixel (viewport-at (car center)
+           (vp-offset (viewport-offset-coord (viewport-at (car center)
                                                     (cdr center)))))
       (find-head (- (car center) (car vp-offset))
                  (- (cdr center) (cdr vp-offset)))))
 
-  (define (viewport-offset-pixel vp)
+  (define (viewport-offset-coord vp)
     "Returns the offset from the current viewport to viewport `VP'
 which is specified as (column . row). The return value is the cons
 cell (x . y). The values are in pixel, and are negative if it lies at
@@ -487,7 +487,7 @@ understood as the current viewport, i.e., (0 . 0) will be returned."
   (define (window-relative-position w)
     "Returns a cons cell with the coordinates of the window relative
 to the viewport it occupies."
-    (let ((offset (viewport-offset-pixel (window-viewport w)))
+    (let ((offset (viewport-offset-coord (window-viewport w)))
           (coords (window-position w)))
       (cons
        (- (car coords) (car offset))
diff --git a/man/sawfish.texi b/man/sawfish.texi
index e7663b4..f84b603 100644
--- a/man/sawfish.texi
+++ b/man/sawfish.texi
@@ -4109,7 +4109,7 @@ The coordinates are specified relative to the current viewport, so
 @code{(viewport-at 0 0)} is equivalent to @code{(screen-viewport)}.
 @end defun
 
- defun viewport-offset-pixel viewport
+ defun viewport-offset-coord viewport
 Returns the offset from the current viewport to @var{viewport} which
 is specified as @code{(@var{column} . @var{row})}. The return value is
 the cons cell @code{(@var{x} . @var{y})}. The values are in pixel, and are



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]