Index: main/display-string.lisp
===================================================================
--- main/display-string.lisp	(revision main,25)
+++ main/display-string.lisp	(revision main,28)
@@ -1,7 +1,7 @@
-(defpackage #:display-string
-  (:use #:cl #:cdk #:cl-ppcre #:dso-lex)
+(defpackage #:tui-display-string
+  (:use #:cl #:cl-ppcre #:dso-lex #:tui-cursor #:tui-output #:tui-window)
   (:export #:enquote #:dequote #:render))
 
-(in-package #:display-string)
+(in-package #:tui-display-string)
 
 
@@ -77,15 +77,15 @@
                   (attr (getf +attributes+ (char-downcase image))))
               (if on
-                  (cdk::c-wattron window attr)
-                  (cdk::c-wattroff window attr))))))))
+                  (cdk::c-wattron (window-pointer window) attr)
+                  (cdk::c-wattroff (window-pointer window) attr))))))))
 
 (defun test ()
   (let ((m "`UNow `B`Ris `bthe`r ``time.'`u"))
     (with-screen (s)
-      (cdk::c-erase-window s)
-      (cdk::c-refresh-window s)
-      (with-der-window (w s 3 10 5 5)
-        (wmove w 0 0)
+      (erase s)
+      (refresh s)
+      (with-subwindow (w s 3 10 5 5)
+        (setf (cursor-position w) '(0 0))
         (add-string w (make-sequence 'string 15 :initial-element #\.))
         (render m w 1 -2)
-        (input:%wget-wch w)))))
+        (tui-input:read-key w)))))