Changeset main,26

Timestamp:

11/03/2007 05:27:59 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071103172759-aacwcew0kzliob1n

Message:

Grid now uses display strings.

Location:

main/grid

Files:

• display.lisp (modified) (1 diff)
• model.lisp (modified) (1 diff)
• package.lisp (modified) (1 diff)
• test.lisp (modified) (2 diffs)

main/grid/display.lisp

@@ -81 +81 @@
 
 (defun draw-cell (grid row column y x)
-  (with-slots (window) grid
-    (cdk::move-and-add-string window y x (item grid row column))))
+  (with-slots (data window) grid
+    (let ((text (item data row column)))
+      (unless (uses-display-strings data row column)
+        (setf text (enquote text)))
+      (render text window y x))))
 
 (defun draw-column (grid column x)

main/grid/model.lisp

@@ -36 +36 @@
 column COLUMN.  ROW and COLUMN refer to data rows and columns, not
 character or text rows and columns.  Rows and columns are zero-based."))
+
+(defgeneric uses-display-strings (grid-data row column)
+  (:documentation
+   "Returns T if the item uses display-strings, or at least has
+already been properly escaped.")
+  (:method (grid-data row column)))

main/grid/package.lisp

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

main/grid/test.lisp

@@ -18 +18 @@
   (cond
     ((= row 0)
-     (string (aref "*ABCDEFGHI" column)))
+     (concatenate 'string "`B`U " (string (aref "*ABCDEFGHI" column)) " `u`b"))
     ((= column 0)
-     (format nil "~A" row))
+     (format nil " `B~A`b " row))
     (t
-     (format nil "~A,~A" row column))))
+     (format nil (if (= row column 2) "`R~A,~A`r" "~A,~A") row column))))
+
+(defmethod uses-display-strings ((gd test) row column)
+  t)
 
 
@@ -35 +38 @@
     (with-screen (screen)
       (clear screen)
-      (with-der-window (window screen 5 17 0 0)
+      (with-der-window (window screen 5 16 0 0)
         (let ((grid (make-grid window data widths :header-columns 1 :header-rows 1)))
           (flet ((try (i)