Index: main/curses.lisp
===================================================================
--- main/curses.lisp	(revision main,1)
+++ main/curses.lisp	(revision main,2)
@@ -22,33 +22,17 @@
 
 
-(define-foreign-library menu
-  (t (:default "libmenu")))
+(define-foreign-library menu2
+  (t "/home/dsowen/lisp/tui/menu2.so"))
 
-(use-foreign-library menu)
+(use-foreign-library menu2)
 
-(defctype item* :pointer)
-(defctype menu* :pointer)
-
-(defcfun new-item item* (name :string) (description :string))
-(defcfun free-item :int (item item*))
-(defcfun new-menu menu* (items :pointer))
-(defcfun post-menu :int (menu menu*))
-(defcfun menu-driver :int (menu menu*) (c :int))
+(defcfun menu2-create :int)
+(defcfun menu2-add-item :int (menu :int) (name :string) (description :string))
+(defcfun menu2-destroy :int (menu :int))
+(defcfun menu2-post :int (menu :int))
+(defcfun menu2-drive :int (menu :int) (c :int))
+(defcfun menu2-unpost :int (menu :int))
 
 
-
-(defun make-menu (items)
-  (let* ((items-vector
-          (map 'vector
-               (lambda (item)
-                 (etypecase item
-                   (string (new-item (foreign-string-alloc item) (foreign-string-alloc item)))
-                   (cons (new-item (foreign-string-alloc (car item)) (foreign-string-alloc (cdr item))))))
-               items))
-         (foreign-items (foreign-alloc 'item*
-                                       :count (length items-vector)
-                                       :initial-contents items-vector
-                                       :null-terminated-p t)))
-    (new-menu foreign-items)))
 
 (defun init-screen ()