Changeset main,28 for main/input.lisp

Timestamp:

11/04/2007 06:19:33 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui-new

revision id:

dsowen@fugue88.ws-20071104061933-b5oiof728551luy5

Message:

Major overhaul to get rid of CDK stuff, and modularize all the ncurses stuff.
Using CLOS for genericity.

File:

• main/input.lisp (modified) (4 diffs)

main/input.lisp

@@ -2 +2 @@
 ;;;; Lisp will detect typos, &c.
 
-(defpackage #:input
-  (:use #:cl #:cffi)
-  (:export #:%wget-wch))
+(defpackage #:tui-input
+  (:use #:cl #:cffi #:tui-window)
+  (:export #:read-key))
 
-(in-package #:input)
+(in-package #:tui-input)
 
 
@@ -13 +13 @@
 ;;; they should be symbolized in a wrapper.
 
-(defconstant +ok+ 0)
-(defconstant +err+ -1)
 (defconstant +key-code-yes+ #o0400)
 
@@ -140 +138 @@
     (let ((r (wget-wch raw-window ch)))
       (cond
-        ((= r +ok+)
+        ((= r cdk::+ok+)
          (code-char (mem-ref ch 'wchar)))
         ((= r +key-code-yes+)
          (getf +key-table+ (mem-ref ch 'wchar) :key-unknown))
-        ((= r +err+)
+        ((= r cdk::+err+)
          nil)
         (t (error "Should not be here."))))))
+
+(defun read-key (window)
+  (%wget-wch (window-pointer window)))
 
 
 
 (defun test ()
-  (let ((screen (cdk::c-init-curses-screen)))
+  (with-screen (s)
     (cdk::c-cbreak)
     (cdk::c-noecho)
     (cdk::c-nonl)
-    (cdk::c-keypad screen t)
+    (cdk::c-keypad (window-pointer s) t)
     (loop
-       (let ((c (%wget-wch screen)))
+       (let ((c (read-key s)))
          (when (and (characterp c) (char= c #\Esc))
            (return))
@@ -165 +166 @@
                    (keyword "~&~A~%")
                    (t "~&UNKNOWN: ~A~%"))
-                 c))))
-  (cdk::c-end-curses))
+                 c)))))