Changeset main,7

Timestamp:

10/18/2007 12:00:50 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071018000050-30ib4wcvwq99r2hz

Message:

Brought in more ncurses routines.
Support wide characters.
Begin flat-menus.

Location:

main

Files:

• flat-menu.lisp (added)
• Makefile (modified) (1 diff)
• cdk.lisp (modified) (3 diffs)
• tui.asd (modified) (1 diff)

main/Makefile

@@ -5 +5 @@
 form2.so: LIBS := -lform
 
-cdk_wrapper.so: LIBS := -lcdk
+cdk_wrapper.so: LIBS := -lcdkw
 
 %.so: %.c
         rm -f $@
-        gcc -shared -fPIC -o $@ $< $(LIBS) -Wall -pedantic
+        gcc -shared -fPIC -Wall -pedantic -o $@ $< $(LIBS)
 
 clean:

main/cdk.lisp

@@ -50 +50 @@
   (x :int))
 
+(defcfun ("subwin" c-sub-window) :pointer
+  (orig :pointer)
+  (lines :int)
+  (columns :int)
+  (y :int)
+  (x :int))
+
+(defcfun ("derwin" c-der-window) :pointer
+  (orig :pointer)
+  (lines :int)
+  (columns :int)
+  (y :int)
+  (x :int))
+
 (defcfun ("delwin" c-delete-window) :int
   (window :pointer))
@@ -57 +71 @@
   (vertical-ch chtype)
   (horizontal-ch chtype))
+
+(defcfun ("wborder" c-window-border) :int
+  (window :pointer)
+  (ls chtype)
+  (rs chtype)
+  (ts chtype)
+  (bs chtype)
+  (tl chtype)
+  (tr chtype)
+  (bl chtype)
+  (br chtype))
+
+(defcfun ("wbkgd" c-set-window-background) :int
+  (window :pointer)
+  (ch chtype))
+
+(defcfun ("werase" c-erase-window) :int
+  (window :pointer))
+
+(defcfun ("mvwadd_wch" c-move-and-add-char) :int
+  (window :pointer)
+  (y :int)
+  (x :int)
+  (wch :pointer))
+
+(defcstruct cchar_t
+  (attr chtype)
+  (char :uint32 :count 5))
+
+
+
+(defcvar ("_nc_wacs" nc-wacs) :pointer :read-only t)
+
+(defun wacs-char (ch)
+  (let ((code (char-code (ecase ch
+                           (:ul-corner #\l)
+                           (:ll-corner #\m)
+                           (:ur-corner #\k)
+                           (:lr-corner #\j)
+                           (:r-tee #\u)
+                           (:l-tee #\t)
+                           (:b-tee #\v)
+                           (:t-tee #\w)
+                           (:h-line #\q)
+                           (:v-line #\x)
+                           (:plus #\n)))))
+    (inc-pointer nc-wacs (* (foreign-type-size 'cchar_t) code))))
+
+(defun move-and-add-char (window y x ch)
+  (with-foreign-object (s 'cchar_t)
+    (with-foreign-slots ((attr char) s cchar_t)
+      (setf attr 0)
+      (dotimes (i 5)
+        (setf (mem-aref char :uint32 i) 0))
+      (setf (mem-aref char :uint32) (char-code ch)))
+    (c-move-and-add-char window y x s)))
+
+(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 ("wrefresh" c-refresh-window) :int
+  (window :pointer))
+
+(defun color-pair (n)
+  (* 256 n))
 
 
@@ -149 +229 @@
   (entry :pointer)
   (ch chtype))
+
+
+
+(defcfun ("wattron" c-wattron) :int
+  (window :pointer)
+  (attrs :int))
+
+(defcfun ("wattroff" c-wattroff) :int
+  (window :pointer)
+  (attrs :int))
+
+(defcfun ("wgetch" c-wgetch) :int
+  (window :pointer))
+
+(defcfun ("cbreak" c-cbreak) :int)
+
+(defcfun ("noecho" c-noecho) :int)
+
+(defcfun ("keypad" c-keypad) :int
+  (window :pointer)
+  (bf :boolean))
+
+(defcfun ("nonl" c-nonl) :int)

main/tui.asd

@@ -4 +4 @@
   :depends-on (#:cffi)
   :components (#|(:file "curses")|#
-               (:file "cdk")))
+               (:file "cdk")
+               (:file "flat-menu"))
+  :serial t)