Changeset main,6 for main

Timestamp:

10/06/2007 04:36:54 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071006043654-b0woemey9plbmi1w

Message:

Added more C constants.
Added the chtype for character/attribute combos.
Ability to work with exit codes.

Location:

main

Files:

• cdk.lisp (modified) (3 diffs)
• cdk_wrapper.c (modified) (1 diff)

main/cdk.lisp

@@ -11 +11 @@
 (use-foreign-library cdk)
 
+
+
+;;; Global constants.
+
+(defctype chtype :uint64)
+
+(defcvar ("cdk_exit_early" +cdk-exit-early+) :int :read-only t)
+(defcvar ("cdk_exit_escape" +cdk-exit-escape+) :int :read-only t)
+(defcvar ("cdk_exit_normal" +cdk-exit-normal+) :int :read-only t)
+(defcvar ("cdk_exit_never" +cdk-exit-never+) :int :read-only t)
 
 ;;; Screen-wide, initialization, and finalization routines.
@@ -45 +55 @@
 (defcfun ("box" c-box) :int
   (window :pointer)
-  (vertical-ch :int)
-  (horizontal-ch :int))
+  (vertical-ch chtype)
+  (horizontal-ch chtype))
 
 
 
 ;;; Generic functions.
+
+(defcfun ("bindCDKObject" c-bind-key) :void
+  (object-type :int)
+  (object :pointer)
+  (key chtype)
+  (function :pointer)
+  (user-data :pointer))
+
+(defcfun ("cleanCDKObjectBindings" c-clear-bindings) :void
+  (object-type :int)
+  (object :pointer))
 
 (defcfun ("setCDKObjectBackgroundColor" c-set-background-color) :void
@@ -112 +133 @@
 (defcfun ("setCDKEntryHighlight" c-set-entry-highlight) :void
   (entry :pointer)
-  (highlight :unsigned-long)
+  (highlight :unsigned-int)             ; Still not sure about this.
   (cursor :boolean))
+
+(defcfun ("getCDKEntryExitType" c-entry-exit-type) :int
+  (entry :pointer))
+
+(defcfun ("getCDKEntryValue" c-get-entry-value) :string
+  (entry :pointer))
+
+(defcfun ("setCDKEntryValue" c-set-entry-value) :void
+  (entry :pointer)
+  (new-value :string))
+
+(defcfun ("setCDKEntryExitType" c-set-entry-exit-type) :void
+  (entry :pointer)
+  (ch chtype))

main/cdk_wrapper.c

@@ -3 +3 @@
 
 
+#define DC(name, dconst) const int name = dconst;
+
+DC(cdk_exit_early, vEARLY_EXIT)
+DC(cdk_exit_escape, vESCAPE_HIT)
+DC(cdk_exit_normal, vNORMAL)
+DC(cdk_exit_never, vNEVER_ACTIVATED)
+
+
+
+void freeCDKLabel(CDKLABEL *label)
+{
+        destroyCDKLabel(label);
+}
+
 #define D(type, name) \
         void freeCDK##name(CDK##type *object) \
-        { destroyCDK##name(object); }
+        { destroyCDK##name(object); } \
+        int getCDK##name##ExitType(CDK##type *object) \
+        { return ExitTypeOf(object); } \
+        void setCDK##name##ExitType(CDK##type *object, chtype ch) \
+        { setCdkExitType(ObjOf(object), &((object)->exitType), ch); }
 
-D(LABEL, Label)
 D(ENTRY, Entry)