Remove code for styling the pager

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

diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h
index 7b00d0a5b76ace09316839b06d7e2477ac64edd5..01b4a256ddfdc731d7e0fd8ee8a99545a30dbb75 100644 (file)
--- a/libchimara/chimara-glk-private.h
+++ b/libchimara/chimara-glk-private.h
@@ -27,10 +27,9 @@ struct _ChimaraGlkPrivate {
        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;
-       PangoAttrList *pager_attr_list;
+       /* 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 */
@@ -69,6 +68,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 */
@@ -79,12 +82,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);