Index: main/grid/test.lisp
===================================================================
--- main/grid/test.lisp	(revision main,26)
+++ main/grid/test.lisp	(revision main,53)
@@ -1,4 +1,4 @@
 (defpackage #:grid-test
-  (:use #:cl #:cdk #:grid #:input)
+  (:use #:cl #:cdk #:grid #:tui-input #:tui-output #:tui-window)
   (:export))
 
@@ -30,6 +30,6 @@
 
 (defun clear (screen)
-  (cdk::c-erase-window screen)
-  (cdk::c-refresh-window screen))
+  (erase screen)
+  (refresh screen))
 
 (defun test-draw ()
@@ -38,10 +38,10 @@
     (with-screen (screen)
       (clear screen)
-      (with-der-window (window screen 5 16 0 0)
+      (with-subwindow (window screen 5 16 0 0)
         (let ((grid (make-grid window data widths :header-columns 1 :header-rows 1)))
           (flet ((try (i)
                    (setf (row-scroll grid) i)
                    (draw grid)
-                   (input:%wget-wch window)))
+                   (read-key window)))
             (try 0)
             (try 2)
@@ -51,5 +51,5 @@
                    (setf (column-scroll grid) i)
                    (draw grid)
-                   (input:%wget-wch window)))
+                   (read-key window)))
             (try 3)
             (try 99))))
@@ -57,3 +57,3 @@
       (let ((grid (make-grid screen data widths :header-columns 1 :header-rows 1)))
         (draw grid)
-        (input:%wget-wch screen)))))
+        (read-key screen)))))