Changeset main,89

Timestamp:

08/08/2008 08:25:09 PM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20080808202509-1i22vbtxoghmjld1

Message:

Minor fixes

Location:

main

Files:

• cdk.lisp (modified) (1 diff)
• form.lisp (modified) (1 diff)
• lisp.sh (modified) (1 diff)
• simple-table.lisp (modified) (2 diffs)

main/cdk.lisp

@@ -21 +21 @@
 (defconstant +ok+ 0)
 
-(defcvar ("cdk_exit_early" +cdk-exit-early+) :int :read-only t)
-(defcvar ("cdk_exit_escape" +cdk-exit-escape+) :int :read-only t)
-(defcvar ("cdk_exit_normal" +cdk-exit-normal+) :int :read-only t)
-(defcvar ("cdk_exit_never" +cdk-exit-never+) :int :read-only t)
+(defcvar (("cdk_exit_early" +cdk-exit-early+) :read-only t) :int)
+(defcvar (("cdk_exit_escape" +cdk-exit-escape+) :read-only t) :int)
+(defcvar (("cdk_exit_normal" +cdk-exit-normal+) :read-only t) :int)
+(defcvar (("cdk_exit_never" +cdk-exit-never+) :read-only t) :int)
 
 ;;; Screen-wide, initialization, and finalization routines.

main/form.lisp

@@ -287 +287 @@
              (refresh form)
              (let ((key (activate (f-peer) :key-callback #'callback)))
-               (case key
-                 ((#\Return #\Newline #\Tab :key-down)
-                  (incf focus)
-                  (boundf focus 0 (1- n)))
-                 ((:key-btab :key-up)
-                  (decf focus)
-                  (boundf focus 0 (1- n)))
+               (cond
+                 ((and (member key '(#\Return #\Newline #\Tab :key-down))
+                       (< focus (1- n)))
+                  (incf focus))
+                 ((and (member key '(:key-btab :key-up))
+                       (> focus 0))
+                  (decf focus))
                  (t
                   (return-from activate key))))))))))

main/lisp.sh

@@ -1 +1 @@
 #!/bin/sh
 
-sbcl --load /usr/share/emacs/site-lisp/slime/swank-loader.lisp --eval "(setf swank:*communication-style* :fd-handler)" --eval "(swank:create-server)" --eval "(declaim (optimize debug safety (compilation-speed 1) (speed 0) (space 0)))"
+sbcl --load /usr/share/emacs/site-lisp/slime/swank-loader.lisp --eval "(setf swank:*communication-style* :fd-handler)" --eval "(swank:create-server)" --eval "(declaim (optimize debug safety (compilation-speed 1) (speed 0) (space 0)))" --eval "(declaim (sb-ext:muffle-conditions sb-ext:compiler-note))"

main/simple-table.lisp

@@ -62 +62 @@
                      (select-callback 'nothing) (scroll-callback 'nothing))
   (with-slots (window data model grid) tbl
+    (cdk::c-keypad (window-pointer window) t)
     (flet ((notify ()
              (funcall select-callback)
@@ -70 +71 @@
       (loop
          (draw tbl)
+         (refresh window)
          (let ((key (read-key window)))
            (case key