X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=5a73939a8384748078f6c9375e504ac38c7c7c95;hb=e4a75256e901a89729c48fcc2f9229cd0cfe9124;hp=3b1460a812c124de8a438c54e57e42cd4a9472fd;hpb=2090f5576f520435b22417c3246ad2286d95a391;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 3b1460a..5a73939 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -23,43 +23,57 @@ 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;
+	/* Hashtable containing the current styles set by CSS and GLK */
+	struct StyleSet *styles;
+	struct StyleSet *glk_styles;
+	/* Final message displayed when game exits */
+	gchar *final_message;
+	/* Image cache */
+	GSList *image_cache;
 
 	/* *** Threading data *** */
 	/* Whether program is running */
 	gboolean running;
+	/* Whether widget has been finalized */
+	gboolean after_finalize;
     /* Glk program loaded in widget */
     GModule *program;
     /* Thread in which Glk program is run */
     GThread *thread;
     /* Event queue and threading stuff */
     GQueue *event_queue;
-    GMutex *event_lock;
-    GCond *event_queue_not_empty;
-    GCond *event_queue_not_full;
+	GMutex event_lock;
+	GCond event_queue_not_empty;
+	GCond event_queue_not_full;
     /* Abort mechanism */
-    GMutex *abort_lock;
+	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;
+	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;
 
 	/* *** 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 */
@@ -70,12 +84,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);
@@ -91,7 +111,7 @@ struct _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__ */