Changes in owl.h [b9517cf:ca1fb26a]

File:

• owl.h (modified) (11 diffs)

owl.h

@@ -10 +10 @@
 #define INC_BARNOWL_OWL_H
 
-#include "config.h"
+#include <config.h>
 
 #include "compat/compat.h"
@@ -47 +47 @@
 /* Perl and curses don't play nice. */
 #ifdef OWL_PERL
-typedef void WINDOW;
-typedef void PANEL;
+typedef struct _owl_fake_WINDOW WINDOW;
+typedef struct _owl_fake_PANEL PANEL;
 /* logout is defined in FreeBSD. */
 #define logout logout_
@@ -57 +57 @@
 #include "XSUB.h"
 #else
-typedef void SV;
-typedef void AV;
-typedef void HV;
+typedef struct _owl_fake_SV SV;
+typedef struct _owl_fake_AV AV;
+typedef struct _owl_fake_HV HV;
 #endif
 
 #include "window.h"
 
-#ifndef OWL_VERSION_STRING
-#ifdef  GIT_VERSION
-#define stringify(x)       __stringify(x)
-#define __stringify(x)     #x
-#define OWL_VERSION_STRING stringify(GIT_VERSION)
-#else
-#define OWL_VERSION_STRING PACKAGE_VERSION
-#endif
-#endif /* !OWL_VERSION_STRING */
+extern const char *version;
 
 /* Feature that is being tested to redirect stderr through a pipe. 
@@ -235 +227 @@
   char *name;
   int   type;  /* OWL_VARIABLE_* */
-  void *pval_default;  /* for types other and string */
-  int   ival_default;  /* for types int and bool     */
-  const char *validsettings;    /* documentation of valid settings */
+  char *default_str;            /* the default value as a string */
+  char *validsettings;          /* documentation of valid settings */
   char *summary;                /* summary of usage */
   char *description;            /* detailed description */
-  void *val;                    /* current value */
-  int  (*validate_fn)(const struct _owl_variable *v, const void *newval);
+  bool takes_on_off;            /* allow passing on/off in argument-less set/unset */
+  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_tostring_fn;
+                                /* converts val to a string;
+                                 * caller must free the result */
+
+  /* These are only valid for OWL_VARIABLE_{INT,BOOL,STRING} */
+  GValue val;                   /* current value, if default get_fn/set_fn */
+
+  GCallback get_fn;
+                                /* returns a reference to the current value.
+                                 * WARNING:  this approach is hard to make
+                                 * thread-safe... */
+  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.
-                                 * unless documented, this 
-                                 * should make a copy. 
-                                 * returns 0 on success. */
-  int  (*set_fromstring_fn)(struct _owl_variable *v, const char *newval);
-                                /* sets the variable to a value
-                                 * of the appropriate type.
-                                 * unless documented, this 
-                                 * should make a copy. 
-                                 * returns 0 on success. */
-  const void *(*get_fn)(const struct _owl_variable *v);
-                                /* 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);
-                                /* converts val to a string;
-                                 * caller must free the result */
-  void (*delete_fn)(struct _owl_variable *v);
-                                /* frees val as needed */
+                                 * of the appropriate type.
+                                 * unless documented, this
+                                 * should make a copy.
+                                 * returns 0 on success. */
 } owl_variable;
+
 
 typedef struct _owl_input {
@@ -452 +446 @@
   char *name;
   owl_filter *filter;
-  owl_messagelist ml;
+  owl_messagelist *ml;
   const owl_style *style;
   int cachedmsgid;
@@ -533 +527 @@
 
 typedef struct _owl_global {
-  owl_mainwin mw;
+  owl_mainwin *mw;
   owl_popwin *pw;
   owl_msgwin msgwin;
@@ -551 +545 @@
   int curmsg_vert_offset;
   owl_view current_view;
-  owl_messagelist msglist;
+  owl_messagelist *msglist;
   WINDOW *input_pad;
   owl_mainpanel mainpanel;
@@ -569 +563 @@
   time_t starttime;
   time_t lastinputtime;
+  time_t last_wakeup_time;
   char *startupargs;
   int nextmsgid;
@@ -596 +591 @@
   char *kill_buffer;
   int interrupt_count;
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  GMutex interrupt_lock;
+#else
   GMutex *interrupt_lock;
+#endif
 } owl_global;
 
@@ -602 +601 @@
 extern owl_global g;
 
-#include "owl_prototypes.h"
+#include <owl_prototypes.h>
 
 /* These were missing from the Zephyr includes before Zephyr 3. */
@@ -610 +609 @@
 #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 */