Changeset main,63

Timestamp:

11/17/2007 12:40:30 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071117004030-ov0o4jfbzl3b9vup

Message:

Allow for other callback-functions on ACTIVATE.

Location:

main

Files:

• form.lisp (modified) (2 diffs)
• widget/generic.lisp (modified) (1 diff)
• widget/label.lisp (modified) (1 diff)
• widget/numberbox.lisp (modified) (1 diff)
• widget/textbox.lisp (modified) (2 diffs)

main/form.lisp

@@ -226 +226 @@
 
 
-(defmethod activate ((form form) &optional (callback 'nothing))
+(defmethod activate ((form form) &key (key-callback 'nothing) &allow-other-keys)
   (with-slots (peers) form
     (flet ((callback (key)
              (if (member key '(#\Return #\Newline #\Tab :key-btab))
                  key
-                 (funcall callback key))))
+                 (funcall key-callback key))))
       (let ((focus 0)
             (n (length peers)))
@@ -237 +237 @@
            (ensure-widget-visible form focus)
            (refresh form)
-           (let ((key (activate (aref peers focus) #'callback)))
+           (let ((key (activate (aref peers focus) :key-callback #'callback)))
              (case key
                ((#\Return #\Newline #\Tab)

main/widget/generic.lisp

@@ -43 +43 @@
 (defgeneric draw (widget))
 
-(defgeneric activate (widget &optional callback))
+(defgeneric activate (widget &key key-callback &allow-other-keys))

main/widget/label.lisp

@@ -29 +29 @@
 (defmethod destroy ((label label)))
 
-(defmethod activate ((label label) &optional callback)
-  (declare (ignore callback))
-  #\Tab)
+(defmethod activate ((label label) &key &allow-other-keys)
+   #\Tab)

main/widget/numberbox.lisp

@@ -43 +43 @@
 
 
-(defmethod activate :around ((numberbox numberbox)
-                             &optional (callback 'nothing))
+(defmethod activate ((numberbox numberbox) &key (key-callback 'nothing)
+                     &allow-other-keys)
   (with-slots (data) numberbox
     (with-slots (edit) data
       (setf edit t)
       (setf (insertion-point numberbox) :end)
-      (let ((r (call-next-method numberbox callback)))
+      (let ((r (call-next-method numberbox key-callback)))
         (setf edit nil)
         (setf (insertion-point numberbox) 0)

main/widget/textbox.lisp

@@ -89 +89 @@
 
 
-(defmethod activate ((textbox textbox) &optional (callback 'nothing))
+(defmethod activate ((textbox textbox) &key (key-callback 'nothing)
+                     &allow-other-keys)
   (with-slots (data window active) textbox
     (setf active t)
@@ -119 +120 @@
                    (if (or (keywordp key)
                            (member key '(#\Return #\Newline #\Tab #\Esc)))
-                       (let ((r (funcall callback key)))
+                       (let ((r (funcall key-callback key)))
                          (when r
                            (setf (insertion-point textbox) 0)