Changeset 06e04a9 for owl.h

Timestamp:

Feb 19, 2013, 8:28:55 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

353719a

Parents:

6a20996

git-author:

Adam Glasgall <adam@crossproduct.net> (07/20/11 00:04:42)

git-committer:

David Benjamin <davidben@mit.edu> (02/19/13 20:28:55)

Message:

perlvariables - iteration N

Later commits reworked a lot of this, but the use of GValue over void*
was kept.

File:

• owl.h (modified) (5 diffs)

owl.h

@@ -235 +235 @@
   char *name;
   int   type;  /* OWL_VARIABLE_* */
+  GValue gval_default;
+  const char *validsettings;    /* documentation of valid settings */
+  char *summary;                /* summary of usage */
+  char *description;            /* detailed description */
+  GValue val;                    /* current value */
+  GClosure *validate_fn;
+                                /* returns 1 if newval is valid */
+  GClosure *set_fn;
+                                /* sets the variable to a value
+                                 * of the appropriate type.
+                                 * unless documented, this 
+                                 * should make a copy. 
+                                 * returns 0 on success. */
+  GClosure *set_fromstring_fn;
+                                /* sets the variable to a value
+                                 * of the appropriate type.
+                                 * unless documented, this 
+                                 * should make a copy. 
+                                 * returns 0 on success. */
+  GClosure *get_fn;
+                                /* returns a reference to the current value.
+                                 * WARNING:  this approach is hard to make
+                                 * thread-safe... */
+  GClosure *get_tostring_fn;
+                                /* converts val to a string;
+                                 * caller must free the result */
+  GClosure *delete_fn;
+                                /* frees val as needed */
+  GClosure *get_default_fn;
+                               /* return the default value, as set at creation time */
+  
+} owl_variable;
+
+typedef struct _owl_variable_init_params {
+  char *name;
+  int   type;  /* OWL_VARIABLE_* */
   void *pval_default;  /* for types other and string */
   int   ival_default;  /* for types int and bool     */
@@ -241 +277 @@
   char *description;            /* detailed description */
   void *val;                    /* current value */
-  int  (*validate_fn)(const struct _owl_variable *v, const void *newval);
+  GCallback validate_fn;
                                 /* returns 1 if newval is valid */
-  int  (*set_fn)(struct _owl_variable *v, const void *newval); 
+  GCallback set_fn;
                                 /* sets the variable to a value
                                  * of the appropriate type.
@@ -249 +285 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  int  (*set_fromstring_fn)(struct _owl_variable *v, const char *newval);
+  GCallback set_fromstring_fn;
                                 /* sets the variable to a value
                                  * of the appropriate type.
@@ -255 +291 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  const void *(*get_fn)(const struct _owl_variable *v);
+  GCallback get_fn;
                                 /* returns a reference to the current value.
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  CALLER_OWN char *(*get_tostring_fn)(const struct _owl_variable *v, const void *val);
+  GCallback get_tostring_fn;
                                 /* converts val to a string;
                                  * caller must free the result */
-  void (*delete_fn)(struct _owl_variable *v);
+  GCallback delete_fn;
                                 /* frees val as needed */
-} owl_variable;
+  GCallback get_default_fn;
+                                /* return the default value as set at creation time */
+} owl_variable_init_params;
+
 
 typedef struct _owl_input {
@@ -614 +653 @@
 #endif
 
+/* We have to dynamically bind these ourselves */
+extern gboolean (*gvalue_from_sv) (GValue * value, SV * sv);
+extern SV * (*sv_from_gvalue) (const GValue * value);
+extern GClosure * (*perl_closure_new) (SV * callback, SV * data, gboolean swap);
+
+
 #endif /* INC_BARNOWL_OWL_H */