From 65ace942fdabfd6116163a21eec7cd7bbd3cbcb1 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Mon, 25 Jul 2011 19:06:10 +0000
Subject: introduce getter and setter functions.

some variables didn't always have a value reflecting the browser's
internal state. for example, if `default_encoding` was never set then
`print @default_encoding` would always print a blank string.

this introduces getter functions that ensure the value of a variable is
always in sync with the internal state of the browser.

also: setters, because sometimes you need to process user input
before storing it.
---
 src/type.h | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'src/type.h')

diff --git a/src/type.h b/src/type.h
index 20de0b4..eda02c1 100644
--- a/src/type.h
+++ b/src/type.h
@@ -2,6 +2,9 @@
  * Uzbl Types
  */
 
+#ifndef __UZBL_TYPE__
+#define __UZBL_TYPE__
+
 enum ptr_type {
     TYPE_INT = 1,
     TYPE_STR,
@@ -12,15 +15,30 @@ enum ptr_type {
     TYPE_STR_ARRAY
 };
 
+// I'm doing this instead of just using "uzbl_value *" because this way our
+// list of variables can be:
+//  { .ptr = { .s = &some_char_star }, ... }
+// instead of
+//  { .ptr = (uzbl_value *)&some_char_star, ... }
+// which works here, but I suspect has portability issues.
+typedef union uzbl_value_ptr_t {
+    int   *i;
+    float *f;
+    gchar **s;
+} uzbl_value_ptr;
+
+/* a really generic function pointer. */
+typedef void (*uzbl_fp)(void);
+
 typedef struct {
     enum ptr_type type;
-    union {
-        int   *i;
-        float *f;
-        gchar **s;
-    } ptr;
+    uzbl_value_ptr ptr;
     int dump;
     int writeable;
-    /*@null@*/ void (*func)(void);
+
+    /* the various get_/set_ functions cast these back into something useful. */
+    uzbl_fp getter;
+    uzbl_fp setter;
 } uzbl_cmdprop;
 
+#endif
-- 
cgit v1.2.3