Backend support for using dynamic styles. See also Ticket #49.

[rodin/chimara.git] / libchimara / chimara-glk-private.h

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index b3c90853795eb9465a6c62d3ae7cd5e044acd768..44a2a49988ede5de56f680b913d80312fbc5ce62 100644 (file)
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -23,17 +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;
+       /* 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 */
@@ -50,6 +51,9 @@ struct _ChimaraGlkPrivate {
     /* Abort mechanism */
     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;
@@ -58,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 */
@@ -81,10 +94,6 @@ 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;
-       /* Is widget still displaying windows from last run */
-       gboolean needs_reset;
 
        /* *** Platform-dependent Glk library data *** */
        /* Flag for functions to find out if they are being called from startup code */
@@ -96,8 +105,6 @@ 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_GNUC_INTERNAL void _chimara_glk_free_nonwindow_private_data(ChimaraGlkPrivate *self);
-
 G_END_DECLS
 
 #endif /* __CHIMARA_GLK_PRIVATE_H__ */