X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=6743ecd3aa41d7862a4da5af42beb6da780eeb25;hb=7e8eb7e80c6d900fc07412037d5b0a835d8ca1cd;hp=903d3530705f93f2dd163692e50e35d2a6e4b3f3;hpb=4b0bbd6bb235b4cad89d321cdd7f570610a97712;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 903d353..6743ecd 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -23,10 +23,6 @@ struct _ChimaraGlkPrivate {
     gboolean interactive;
     /* Whether file operations are allowed */
     gboolean protect;
-	/* Font description of proportional font */
-	PangoFontDescription *default_font_desc;
-	/* Font description of monospace font */
-	PangoFontDescription *monospace_font_desc;
 	/* Spacing between Glk windows */
 	guint spacing;
 	/* The CSS file to read style defaults from */
@@ -34,9 +30,11 @@ struct _ChimaraGlkPrivate {
 	/* Hashtable containing the default and current style */
 	struct StyleSet *default_styles;
 	struct StyleSet *current_styles;
-	gboolean style_initialized; /* Have styles been initialized */
+	PangoAttrList *pager_attr_list;
 	/* Final message displayed when game exits */
 	gchar *final_message;
+	/* Image cache */
+	GSList *image_cache;
 
 	/* *** Threading data *** */
 	/* Whether program is running */
@@ -64,8 +62,17 @@ struct _ChimaraGlkPrivate {
 	/* 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;
 
 	/* *** Glk library data *** */
+	/* Info about current plugin */
+	gchar *program_name;
+	gchar *program_info;
+	gchar *story_name;
     /* User-defined interrupt handler */
     void (*interrupt_handler)(void);
     /* Global tree of all windows */