X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk-private.h;h=25417d368524d95c18533cd5b783c1d5fa767611;hb=deed9ccb2dacd8c2b4e58c2fdd947850299902bc;hp=ba638a0e6e8496833c41f457ca1851ef73171023;hpb=78652af29a2f39e626febd5f4213da57d3a13901;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index ba638a0..25417d3 100644
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -15,6 +15,8 @@ typedef struct _ChimaraGlkPrivate ChimaraGlkPrivate;
 struct _ChimaraGlkPrivate {
     /* Pointer back to the widget itself for use in thread */
     ChimaraGlk *self;
+
+	/* *** Widget properties *** */
     /* Whether user input is expected */
     gboolean interactive;
     /* Whether file operations are allowed */
@@ -25,6 +27,12 @@ struct _ChimaraGlkPrivate {
 	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 styles */
+	GHashTable *default_styles;
+
+	/* *** Threading data *** */
     /* Glk program loaded in widget */
     GModule *program;
     /* Thread in which Glk program is run */
@@ -37,6 +45,13 @@ struct _ChimaraGlkPrivate {
     /* Abort mechanism */
     GMutex *abort_lock;
     gboolean abort_signalled;
+	/* Window arrangement locks */
+	GMutex *arrange_lock;
+	GCond *rearranged;
+	gboolean needs_rearrange;
+	gboolean ignore_next_arrange_event;
+
+	/* *** Glk library data *** */
     /* User-defined interrupt handler */
     void (*interrupt_handler)(void);
     /* Global tree of all windows */
@@ -53,6 +68,12 @@ struct _ChimaraGlkPrivate {
 	giblorb_map_t *resource_map;
 	/* File stream pointing to the blorb used as current resource map */
 	strid_t resource_file;
+
+	/* *** Platform-dependent Glk library data *** */
+	/* Flag for functions to find out if they are being called from startup code */
+	gboolean in_startup;
+	/* "Current directory" for creating filerefs */
+	gchar *current_dir;
 };
 
 #define CHIMARA_GLK_PRIVATE(obj) \