X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=0469b8da33ac313bacaf97e64c697630ed2f3fc7;hb=59f3bc1e4f21377c362c1f497fb225711127d7a0;hp=99e858992b42f1012e6e9e032cd04f8f7a0a9815;hpb=6a5f37b58f4e1b7ff1063864eded5661b080b2e5;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 99e8589..0469b8d 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -23,20 +23,18 @@ 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 */
 	gchar *css_file;
-	/* Hashtable containing the default and current style */
-	struct StyleSet *default_styles;
-	struct StyleSet *current_styles;
-	gboolean style_initialized; /* Have styles been initialized */
+	/* Hashtable containing the current styles set by CSS and GLK */
+	struct StyleSet *styles;
+	struct StyleSet *glk_styles;
+	PangoAttrList *pager_attr_list;
 	/* Final message displayed when game exits */
 	gchar *final_message;
+	/* Image cache */
+	GSList *image_cache;
 
 	/* *** Threading data *** */
 	/* Whether program is running */
@@ -71,6 +69,10 @@ struct _ChimaraGlkPrivate {
 	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 */
@@ -81,12 +83,18 @@ struct _ChimaraGlkPrivate {
     strid_t current_stream;
     /* List of streams currently in existence */
     GList *stream_list;
+	/* List of sound channels currently in existence */
+	GList *schannel_list;
 	/* Current timer */
 	guint timer_id;
 	/* Current resource blorb map */
 	giblorb_map_t *resource_map;
 	/* File stream pointing to the blorb used as current resource map */
 	strid_t resource_file;
+	/* Optional callback for loading resource data */
+	ChimaraResourceLoadFunc resource_load_callback;
+	gpointer resource_load_callback_data;
+	GDestroyNotify resource_load_callback_destroy_data;
 	/* Callbacks for registering and unregistering dispatch objects */
 	gidispatch_rock_t (*register_obj)(void *, glui32);
 	void (*unregister_obj)(void *, glui32, gidispatch_rock_t);