Changeset main,59 for main

Timestamp:

11/16/2007 09:23:26 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071116212326-d3d4i97aai8ut91n

Message:

Fixed clipping.

File:

• main/output.lisp (modified) (1 diff)

main/output.lisp

@@ -60 +60 @@
 (defun add-clipped-string (window y x s)
   ;; TODO: double check for ob1 in OVER.
-  (multiple-value-bind (maxy maxx) (size window)
-    (unless (<= 0 y maxy) (return-from add-clipped-string))
+  (multiple-value-bind (height width) (size window)
+    (unless (and (<= 0 y (1- height))
+                 (<= x (1- width)))
+      (return-from add-clipped-string))
     (when (< x 0)
+      (when (>= (- x) (length s))
+        (return-from add-clipped-string))
       (setf s (subseq s (- x))
             x 0))
-    (let ((over (- (+ x (length s)) maxx)))
+    (let ((over (- (+ x (length s)) width)))
       (when (> over 0)
         (setf s (subseq s 0 (- (length s) over)))))