Changeset main,23

Timestamp:

11/03/2007 02:15:01 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

parents:

Rev	Tree	Chgset
22	@main,22	[main,22]
22.1.1	@main,22.1.1	[main,22.1.1]

revision id:

dsowen@fugue88.ws-20071103021501-wy22vptf8j2zc9je

Message:

Sync to home.

Location:

main

Files:

• display-string.lisp (added)
• cdk.lisp (modified) (4 diffs)
• tui.asd (modified) (1 diff)

main/cdk.lisp

@@ -1 +1 @@
 (defpackage #:cdk
   (:use #:cl #:cffi)
-  (:export #:with-screen #:with-der-window))
+  (:export #:with-screen #:with-der-window #:add-ch #:add-string #:wmove))
 
 (in-package #:cdk)
@@ -127 +127 @@
   (x :int))
 
-(defcfun ("mvwadd_wch" c-move-and-add-char) :int
-  (window :pointer)
-  (y :int)
-  (x :int)
+(defcfun "wadd_wch" :int
+  (window :pointer)
   (wch :pointer))
 
@@ -157 +155 @@
     (inc-pointer nc-wacs (* (foreign-type-size 'cchar_t) code))))
 
-(defun move-and-add-char (window y x ch)
+(defcfun ("wmove" c-wmove) :int
+  (window :pointer)
+  (y :int)
+  (x :int))
+
+(defun add-char (window ch)
   (with-foreign-object (s 'cchar_t)
     (with-foreign-slots ((attr char) s cchar_t)
@@ -164 +167 @@
         (setf (mem-aref char :uint32 i) 0))
       (setf (mem-aref char :uint32) (char-code ch)))
-    (c-move-and-add-char window y x s)))
+    (wadd-wch window s)))
+
+(defun add-string (window s)
+  (dotimes (i (length s))
+    (add-char window (aref s i))))
+
+(defun move-and-add-char (window y x ch)
+  (wmove window y x)
+  (add-char window ch))
 
 (defun move-and-add-string (window y x s)
-  (dotimes (i (length s))
-    (move-and-add-char window y (+ x i) (aref s i))))
-
-(defcfun ("wmove" c-wmove) :int
-  (window :pointer)
-  (y :int)
-  (x :int))
+  (wmove window y x)
+  (add-string window s))
 
 (defcfun ("wrefresh" c-refresh-window) :int

main/tui.asd

@@ -2 +2 @@
 
 (asdf:defsystem #:tui
-  :depends-on (#:cffi #:dso-util)
+  :depends-on (#:cffi #:cl-ppcre #:dso-lex #:dso-util)
   :components (#|(:file "curses")|#
                (:file "cdk")
+               (:file "display-string"
+                      :depends-on ("cdk"))
                (:module "grid"
                         :depends-on ("cdk")