Changeset main,5 for main

Timestamp:

09/27/2007 10:46:25 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20070927224625-s9k87snjmjfo33lv

Message:

Added a few more things to the curses/forms wrapper.
Added very light CDK wrapper and adjusted Makefile.

Location:

main

Files:

• cdk.lisp (added)
• cdk_wrapper.c (added)
• Makefile (modified) (2 diffs)
• curses.lisp (modified) (5 diffs)
• form2.c (modified) (4 diffs)
• tui.asd (modified) (1 diff)

main/Makefile

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

main/curses.lisp

@@ -14 +14 @@
 
 (defcfun initscr window*)
+(defcfun clear :int)
 (defcfun endwin :int)
 (defcfun refresh :int)
@@ -22 +23 @@
 (defcfun start-color :int)
 
-(defcvar stdscr :pointer :read-only t)
+(defcfun mvwaddstr :int (win :pointer) (y :int) (x :int) (str :string))
+
+(defcvar *stdscr* :pointer :read-only t)
 
 
@@ -58 +61 @@
 (defcdef req-left-char)
 (defcdef req-right-char)
+(defcdef o-active)
+(defcdef o-autoskip)
 
 (defcfun form2-create :int)
 (defcfun form2-add-field :int (form :int) (row :int) (col :int) (width :int)
-         (height :int) (data-height :int))
+         (height :int) (data-height :int) (opts-mask :int))
 (defcfun form2-destroy :int (form :int))
 (defcfun form2-post :int (form :int))
@@ -68 +73 @@
 (defcfun form2-field-len :int (form :int) (i :int))
 (defcfun form2-copy-field :int (form :int) (i :int) (buff :pointer) (len :int))
+(defcfun form2-set-field :int (form :int) (i :int) (buff :string))
 
 (defun form2-get-value (form i)
@@ -81 +87 @@
   (initscr)
   (start-color)
-  (keypad stdscr 1)
+  (keypad *stdscr* 1)
   (cbreak)
-  (noecho))
+  (noecho)
+  (clear))
 
 (defmacro ncase (keyform &rest clauses)

main/form2.c

@@ -26 +26 @@
 DC(req_left_char, REQ_LEFT_CHAR);
 DC(req_right_char, REQ_RIGHT_CHAR);
+DC(o_active, O_ACTIVE);
+DC(o_autoskip, O_AUTOSKIP);
 
 
@@ -93 +95 @@
 
 int form2_add_field(form2_h form, int row, int col, int width, int height,
-                int data_height)
+                int data_height, int opts_mask)
 {
         struct form2_t *f = _check(form);
@@ -107 +109 @@
         f->fields[*i] = new_field(height, width, row, col, data_height, 0);
         set_field_back(f->fields[*i], A_UNDERLINE | COLOR_PAIR(1));
-        field_opts_off(f->fields[*i], O_AUTOSKIP);
+        field_opts_off(f->fields[*i], opts_mask);
 
         ++(*i);
@@ -193 +195 @@
         return 1;
 }
+
+int form2_set_field(form2_h form, int i, const char *str)
+{
+        struct form2_t *f = _check(form);
+
+        if(!f) return 0;
+        if(!f->form_struct) return 0;
+
+        set_field_buffer(f->fields[i], 0, str);
+
+        return 1;
+}

main/tui.asd

@@ -3 +3 @@
 (asdf:defsystem #:tui
   :depends-on (#:cffi)
-  :components ((:file "curses")))
+  :components (#|(:file "curses")|#
+               (:file "cdk")))