projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed documentation to work with Gtk-Doc 1.14 and produce as few warnings as possible
[rodin/chimara.git]
/
libchimara
/
chimara-glk-private.h
diff --git
a/libchimara/chimara-glk-private.h
b/libchimara/chimara-glk-private.h
index 4a274fba227b7939dbefb78bb6b3960b9e950924..7b00d0a5b76ace09316839b06d7e2477ac64edd5 100644
(file)
--- a/
libchimara/chimara-glk-private.h
+++ b/
libchimara/chimara-glk-private.h
@@
-5,6
+5,7
@@
#include <gmodule.h>
#include <pango/pango.h>
#include "glk.h"
#include <gmodule.h>
#include <pango/pango.h>
#include "glk.h"
+#include "style.h"
#include "gi_blorb.h"
#include "gi_dispa.h"
#include "chimara-glk.h"
#include "gi_blorb.h"
#include "gi_dispa.h"
#include "chimara-glk.h"
@@
-22,18
+23,22
@@
struct _ChimaraGlkPrivate {
gboolean interactive;
/* Whether file operations are allowed */
gboolean protect;
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;
/* 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;
+ /* Hashtable containing the default and current style */
+ struct StyleSet *default_styles;
+ struct StyleSet *current_styles;
+ PangoAttrList *pager_attr_list;
+ /* Final message displayed when game exits */
+ gchar *final_message;
+ /* Image cache */
+ GSList *image_cache;
/* *** Threading data *** */
/* *** Threading data *** */
+ /* Whether program is running */
+ gboolean running;
/* Glk program loaded in widget */
GModule *program;
/* Thread in which Glk program is run */
/* Glk program loaded in widget */
GModule *program;
/* Thread in which Glk program is run */
@@
-46,11
+51,22
@@
struct _ChimaraGlkPrivate {
/* Abort mechanism */
GMutex *abort_lock;
gboolean abort_signalled;
/* 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;
gboolean needs_rearrange;
gboolean ignore_next_arrange_event;
/* Window arrangement locks */
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 *** */
/* User-defined interrupt handler */
/* *** Glk library data *** */
/* User-defined interrupt handler */
@@
-82,9
+98,9
@@
struct _ChimaraGlkPrivate {
gchar *current_dir;
};
gchar *current_dir;
};
-#define CHIMARA_GLK_PRIVATE(obj)
\
-
(G_TYPE_INSTANCE_GET_PRIVATE((obj), CHIMARA_TYPE_GLK, 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__ */
G_END_DECLS
#endif /* __CHIMARA_GLK_PRIVATE_H__ */