X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=85e3af28dbd4d0c238a05a71584cfe6550d9424c;hb=40c961bdf2523ebdcb6717f2537f97156fd19ab4;hp=4a274fba227b7939dbefb78bb6b3960b9e950924;hpb=d0d1517f5447d0bd95c6b9769a92054f4c7fcaae;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 4a274fb..85e3af2 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -5,6 +5,7 @@
 #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"
@@ -30,10 +31,16 @@ 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;
+	gboolean style_initialized; /* Have styles been initialized */
+	/* Final message displayed when game exits */
+	gchar *final_message;
 
 	/* *** Threading data *** */
+	/* Whether program is running */
+	gboolean running;
     /* Glk program loaded in widget */
     GModule *program;
     /* Thread in which Glk program is run */
@@ -46,11 +53,24 @@ struct _ChimaraGlkPrivate {
     /* Abort mechanism */
     GMutex *abort_lock;
     gboolean abort_signalled;
+	/* Key press after shutdown mechanism */
+	GMutex *shutdown_lock;
+	GCond *shutdown_key_pressed;
 	/* Window arrangement locks */
 	GMutex *arrange_lock;
 	GCond *rearranged;
 	gboolean needs_rearrange;
 	gboolean ignore_next_arrange_event;
+	/* Input queues */
+	GAsyncQueue *char_input_queue;
+	GAsyncQueue *line_input_queue;
+	/* Resource loading locks */
+	GMutex *resource_lock;
+	GCond *resource_loaded;
+	GCond *resource_info_available;
+	guint32 resource_available;
+	/* Image cache */
+	GSList *image_cache;
 
 	/* *** Glk library data *** */
     /* User-defined interrupt handler */
@@ -82,9 +102,9 @@ 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
 
 #endif /* __CHIMARA_GLK_PRIVATE_H__ */