Changeset main,53 for main

Timestamp:

11/15/2007 09:11:06 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071115211106-ix3zpfhce07h8wg8

Message:

Updated grid.

Location:

main/grid

Files:

• display.lisp (modified) (8 diffs)
• package.lisp (modified) (1 diff)
• test.lisp (modified) (5 diffs)

main/grid/display.lisp

@@ -16 +16 @@
   (make-instance 'grid
                  :data data
-                 :column-widths column-widths
+                 :column-widths (coerce column-widths 'vector)
                  :header-rows header-rows
                  :header-columns header-columns
@@ -62 +62 @@
     (let ((text (item grid row column))
           (x (column-offset grid column)))
-      (cdk::move-and-add-string main-window row x text))))
+      (move-and-add-string main-window row x text))))
 
 (defun draw-header-top-item (grid row column)
@@ -68 +68 @@
     (let ((text (item grid row column))
           (x (column-offset grid column)))
-      (cdk::move-and-add-string main-window row x text))))
+      (move-and-add-string main-window row x text))))
 
 (defun draw-item (grid row column)
@@ -76 +76 @@
           (y (+ row y-scroll)))
       (let ((x (+ column-offset x-scroll)))
-        (cdk::move-and-add-string window y x text)))))
+        (move-and-add-string window y x text)))))
 
 ;;;; ------------------------------------------------- ;;;;
@@ -91 +91 @@
     (dotimes (i header-rows)
       (draw-cell grid i column i x))
-    (dotimes (i (- (cdk::getmaxy window) header-rows))
+    (dotimes (i (- (size window) header-rows))
       (let* ((y (+ i header-rows))
              (row (+ y row-scroll)))
@@ -100 +100 @@
 (defun draw (grid)
   (with-slots (data column-widths header-columns window column-scroll) grid
-    (cdk::c-erase-window window)
+    (erase window)
     (let ((x 0))
       (dotimes (i header-columns)
@@ -107 +107 @@
       (do ((i (+ header-columns column-scroll) (incf i)))
           ((or (>= i (columns data))
-               (> x (cdk::getmaxx window))))
+               (> x (nth-value 1 (size window)))))
         (draw-column grid i x)
         (incf x (svref column-widths i))))))
@@ -115 +115 @@
 (defmethod max-row-scroll ((grid grid))
   (with-slots (data header-rows window) grid
-    (max 0 (- (rows data) (cdk::getmaxy window)))))
+    (max 0 (- (rows data) (size window)))))
 
 (defmethod (setf row-scroll) :around (i (grid grid))

main/grid/package.lisp

@@ -1 +1 @@
 (defpackage #:grid
-  (:use #:cl #:dso-util #:tui-display-string)
+  (:use #:cl #:dso-util #:tui-display-string #:tui-output #:tui-window)
   (:export #:rows #:columns #:item #:uses-display-strings #:row-scroll
            #:column-scroll #:make-grid #:draw))

main/grid/test.lisp

@@ -1 +1 @@
 (defpackage #:grid-test
-  (:use #:cl #:cdk #:grid #:input)
+  (:use #:cl #:cdk #:grid #:tui-input #:tui-output #:tui-window)
   (:export))
 
@@ -30 +30 @@
 
 (defun clear (screen)
-  (cdk::c-erase-window screen)
-  (cdk::c-refresh-window screen))
+  (erase screen)
+  (refresh screen))
 
 (defun test-draw ()
@@ -38 +38 @@
     (with-screen (screen)
       (clear screen)
-      (with-der-window (window screen 5 16 0 0)
+      (with-subwindow (window screen 5 16 0 0)
         (let ((grid (make-grid window data widths :header-columns 1 :header-rows 1)))
           (flet ((try (i)
                    (setf (row-scroll grid) i)
                    (draw grid)
-                   (input:%wget-wch window)))
+                   (read-key window)))
             (try 0)
             (try 2)
@@ -51 +51 @@
                    (setf (column-scroll grid) i)
                    (draw grid)
-                   (input:%wget-wch window)))
+                   (read-key window)))
             (try 3)
             (try 99))))
@@ -57 +57 @@
       (let ((grid (make-grid screen data widths :header-columns 1 :header-rows 1)))
         (draw grid)
-        (input:%wget-wch screen)))))
+        (read-key screen)))))