Changeset main,44 for main

Timestamp:

11/08/2007 11:26:33 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui-new

revision id:

dsowen@fugue88.ws-20071108232633-o1pxoj710jjn381p

Message:

Forms may now be activated; they cycle through textboxes and auto-scroll.

Location:

main

Files:

• form-test.lisp (modified) (1 diff)
• form.lisp (modified) (5 diffs)
• tui.asd (modified) (1 diff)
• widget/textbox.lisp (modified) (1 diff)

main/form-test.lisp

@@ -47 +47 @@
              (progn
                (setf (scroll form) 4)
-               (tui-input:read-key w))
+               (activate form (lambda (key)
+                                (member key '(#\Esc #\Tab #\Return :key-f12)))))
           (destroy-form form))))))

main/form.lisp

@@ -3 +3 @@
 (defpackage #:tui-form
   (:use #:cl #:dso-util #:tui-input #:tui-widget #:tui-window)
-  (:export #:form-value #:defform #:create-form #:destroy-form #:scroll))
+  (:export #:form-value #:defform #:create-form #:destroy-form #:scroll
+           #:activate))
 
 (in-package #:tui-form)
@@ -87 +88 @@
 (defmethod (setf text) (text (r reflector))
   (with-slots (data name) r
-    (setf (form-value data name) r)))
+    (setf (form-value data name) text)))
 
 
@@ -119 +120 @@
 
 (defun widget-visible-p (form widget)
-  (with-slots (widgets window scroll) form
-    (when (integerp widget)
-      (setf widget (aref widgets widget)))
+  (with-slots (window scroll) form
     (with-slots (row) widget
       (<= 0 (- row scroll) (1- (size window))))))
@@ -139 +138 @@
             (setf (aref peers i) (create-peer widget-def form)))))
       r)))
+
+(defun ensure-widget-visible (form i)
+  (with-slots (widget-defs window scroll) form
+    (let ((widget (aref widget-defs i)))
+      (with-slots (row) widget
+        (let* ((line (- row scroll))
+               (diff (- line (bound line 0 (1- (size window))))))
+          (incf (scroll form) diff))))))
 
 
@@ -169 +176 @@
         (destroy (aref peers i))
         (setf (aref peers i) nil)))))
+
+
+
+(defmethod activate ((form form) &optional (callback 'nothing))
+  (with-slots (peers) form
+    (flet ((callback (key)
+             (if (member key '(#\Return #\Newline #\Tab :key-btab))
+                 key
+                 (funcall callback key))))
+      (let ((focus 0)
+            (n (length peers)))
+        (loop
+           (ensure-widget-visible form focus)
+           (let ((key (activate (aref peers focus) #'callback)))
+             (case key
+               ((#\Return #\Newline #\Tab)
+                (setf focus (mod (1+ focus) n)))
+               (:key-btab
+                (setf focus (mod (1- focus) n)))
+               (t
+                (return-from activate key)))))))))

main/tui.asd

@@ -16 +16 @@
                (:file "display-string"
                       ;; "input" only for testing
-                      :depends-on ("cdk" "input"))
+                      :depends-on ("cdk" "cursor" "input" "output" "window"))
                (:module "widget"
                         :depends-on ("cursor"

main/widget/textbox.lisp

@@ -102 +102 @@
                 (setf (insertion-point textbox) (insertion-point textbox)))))
            (t
-            (if (or (keywordp key) (member key '(#\Return #\Tab #\Esc)))
+            (if (or (keywordp key)
+                    (member key '(#\Return #\Newline #\Tab #\Esc)))
                 (let ((r (funcall callback key)))
                   (when r