X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=33e8ebf5b8ea20d26d4a1658a006f697bf870df1;hb=39ba0dbcd29275355508e25ac5e74bfa5e075293;hp=4a274fba227b7939dbefb78bb6b3960b9e950924;hpb=1d19cdbaca8b7cd239cd5d1e1f650bd48fa37bee;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 4a274fb..33e8ebf 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,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 */
@@ -51,6 +55,9 @@ struct _ChimaraGlkPrivate {
 	GCond *rearranged;
 	gboolean needs_rearrange;
 	gboolean ignore_next_arrange_event;
+	/* Input queues */
+	GAsyncQueue *char_input_queue;
+	GAsyncQueue *line_input_queue;
 
 	/* *** Glk library data *** */
     /* User-defined interrupt handler */
@@ -74,6 +81,8 @@ struct _ChimaraGlkPrivate {
 	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);
+	/* Have styles been initialized */
+	gboolean style_initialized;
 
 	/* *** Platform-dependent Glk library data *** */
 	/* Flag for functions to find out if they are being called from startup code */
@@ -82,8 +91,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