X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=1ce36c377103f24225a9b1bf6f0c7076e8dd7caf;hb=b4658298daef53fb2ccc3f4fdb48554b17af5b55;hp=25417d368524d95c18533cd5b783c1d5fa767611;hpb=2ce0ccd78003fce557bb76883c87ca2cb101608d;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 25417d3..1ce36c3 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -5,7 +5,9 @@
 #include <gmodule.h>
 #include <pango/pango.h>
 #include "glk.h"
+#include "style.h"
 #include "gi_blorb.h"
+#include "gi_dispa.h"
 #include "chimara-glk.h"
 
 G_BEGIN_DECLS
@@ -29,10 +31,13 @@ struct _ChimaraGlkPrivate {
 	guint spacing;
 	/* The CSS file to read style defaults from */
 	gchar *css_file;
-	/* Hashtable containing the default styles */
-	GHashTable *default_styles;
+	/* Hashtable containing the default and current style */
+	struct StyleSet *default_styles;
+	struct StyleSet *current_styles;
 
 	/* *** Threading data *** */
+	/* Whether program is running */
+	gboolean running;
     /* Glk program loaded in widget */
     GModule *program;
     /* Thread in which Glk program is run */
@@ -68,6 +73,11 @@ struct _ChimaraGlkPrivate {
 	giblorb_map_t *resource_map;
 	/* File stream pointing to the blorb used as current resource map */
 	strid_t resource_file;
+	/* Callbacks for registering and unregistering dispatch objects */
+	gidispatch_rock_t (*register_obj)(void *, glui32);
+	void (*unregister_obj)(void *, glui32, gidispatch_rock_t);
+	gidispatch_rock_t (*register_arr)(void *, glui32, char *);
+	void (*unregister_arr)(void *, glui32, char *, gidispatch_rock_t);
 
 	/* *** Platform-dependent Glk library data *** */
 	/* Flag for functions to find out if they are being called from startup code */
@@ -76,8 +86,8 @@ struct _ChimaraGlkPrivate {
 	gchar *current_dir;
 };
 
-#define CHIMARA_GLK_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((obj), CHIMARA_TYPE_GLK, ChimaraGlkPrivate))
+#define CHIMARA_GLK_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHIMARA_TYPE_GLK, ChimaraGlkPrivate))
+#define CHIMARA_GLK_USE_PRIVATE(o, n) ChimaraGlkPrivate *n = CHIMARA_GLK_PRIVATE(o)
 	
 G_END_DECLS