X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=497f8626a2cf031a532a2322d518aa17867f3e62;hb=e2aad0fc9a4c2bc75db8f0b3f1d2d3c70e55e7bb;hp=b422ef1792c1f14e5c7cf563babb1b612e21effc;hpb=86bf905d2bf441c655a57d46e9260da8a3237b47;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index b422ef1..497f862 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -22,6 +22,7 @@
 #include "glkunix.h"
 #include "init.h"
 #include "magic.h"
+#include "style.h"
 
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
@@ -156,8 +157,8 @@ chimara_glk_init(ChimaraGlk *self)
     priv->self = self;
     priv->interactive = TRUE;
     priv->protect = FALSE;
-	priv->default_styles = g_new0(StyleSet,1);
-	priv->current_styles = g_new0(StyleSet,1);
+	priv->styles = g_new0(StyleSet,1);
+	priv->glk_styles = g_new0(StyleSet,1);
 	priv->pager_attr_list = pango_attr_list_new();
 	priv->final_message = g_strdup("[ The game has finished ]");
 	priv->running = FALSE;
@@ -257,10 +258,10 @@ chimara_glk_finalize(GObject *object)
 	/* Free widget properties */
 	g_free(priv->final_message);
 	/* Free styles */
-	g_hash_table_destroy(priv->default_styles->text_buffer);
-	g_hash_table_destroy(priv->default_styles->text_grid);
-	g_hash_table_destroy(priv->current_styles->text_buffer);
-	g_hash_table_destroy(priv->current_styles->text_grid);
+	g_hash_table_destroy(priv->styles->text_buffer);
+	g_hash_table_destroy(priv->styles->text_grid);
+	g_hash_table_destroy(priv->glk_styles->text_buffer);
+	g_hash_table_destroy(priv->glk_styles->text_grid);
 	pango_attr_list_unref(priv->pager_attr_list);
 	
     /* Free the event queue */
@@ -1067,10 +1068,6 @@ chimara_glk_set_css_from_file(ChimaraGlk *glk, const gchar *filename, GError **e
 	scanner->input_name = filename;
 	scan_css_file(scanner, glk);
 
-	/* Set the current style to a copy of the default style */
-	/* FIXME this is not correct */
-	copy_default_styles_to_current_styles(glk);
-	
 	if(close(fd) == -1) {
 		*error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno),
 		    _("Error closing file \"%s\": %s"), filename, g_strerror(errno));
@@ -1099,10 +1096,6 @@ chimara_glk_set_css_from_string(ChimaraGlk *glk, const gchar *css)
 	g_scanner_input_text(scanner, css, strlen(css));
 	scanner->input_name = "<string>";
 	scan_css_file(scanner, glk);
-
-	/* Set the current style to a copy of the default style */
-	/* FIXME this is not correct */
-	copy_default_styles_to_current_styles(glk);
 }
 
 /**
@@ -1380,3 +1373,99 @@ chimara_glk_feed_line_input(ChimaraGlk *glk, const gchar *text)
 	g_async_queue_push(priv->line_input_queue, g_strdup(text));
 	event_throw(glk, evtype_ForcedLineInput, NULL, 0, 0);
 }
+
+/**
+ * chimara_glk_get_tag:
+ * @glk: a #ChimarGlk widget
+ * @window: The type of window to retrieve the tag for
+ * @name: The name of the tag to retrieve
+ *
+ * Use this function to get a #GtkTextTag so style properties can be changed.
+ * See also #chimara_glk_set_css_from_string.
+ *
+ * The layout of the text in Chimara is controlled by two sets of tags: one set
+ * describing the style in text buffers and one for text grids. See also the
+ * GLK specification for the difference between the two. The main narrative of
+ * a game is usually rendered in text buffers, whereas text grids are mostly
+ * used for status bars and in game menus.
+ *
+ * The following tag names are supported:
+ * <itemizedlist>
+ *	<listitem><para>normal</para></listitem>
+ *	<listitem><para>emphasized</para></listitem>
+ *	<listitem><para>preformatted</para></listitem>
+ *	<listitem><para>header</para></listitem>
+ *	<listitem><para>subheader</para></listitem>
+ *	<listitem><para>alert</para></listitem>
+ *	<listitem><para>note</para></listitem>
+ *	<listitem><para>block-quote</para></listitem>
+ *	<listitem><para>input</para></listitem>
+ *	<listitem><para>user1</para></listitem>
+ *	<listitem><para>user2</para></listitem>
+ *	<listitem><para>hyperlink</para></listitem>
+ *	<listitem><para>pager</para></listitem>
+ * </itenizedlist>
+ */
+GtkTextTag*
+chimara_glk_get_tag(ChimaraGlk *glk, ChimaraGlkWindowType window, const gchar *name)
+{
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+
+	switch(window) {
+	case CHIMARA_GLK_TEXT_BUFFER:
+		return GTK_TEXT_TAG( g_hash_table_lookup(priv->styles->text_buffer, name) );
+		break;
+	case CHIMARA_GLK_TEXT_GRID:
+		return GTK_TEXT_TAG( g_hash_table_lookup(priv->styles->text_grid, name) );
+		break;
+	default:
+		ILLEGAL_PARAM("Unknown window type: %u", window);
+		return NULL;
+	}
+}
+
+/**
+ * chimara_glk_get_tag:
+ * @glk: a #ChimarGlk widget
+ *
+ * Retrieves the possible tag names to use in #chimara_glk_get_tag.
+ */
+const gchar**
+chimara_glk_get_tag_names(ChimaraGlk *glk)
+{
+	return style_get_tag_names();
+}
+
+/**
+ * chimara_glk_get_num_tag_names:
+ * @glk: a #ChimaraGlk widget
+ *
+ * Retrieves the number of style tags returned by #chimara_glk_get_tag_names.
+ */
+gint
+chimara_glk_get_num_tag_names(ChimaraGlk *glk)
+{
+	return CHIMARA_NUM_STYLES;
+}
+
+/**
+ * chimara_glk_update_style:
+ * @glk: a #ChimaraGlk widget
+ *
+ * Processes style updates and updates the widget to reflect the new style.
+ * Call this every time you change a property of a #GtkTextTag retrieved by
+ * #chimara_glk_get_tag.
+ */
+void
+chimara_glk_update_style(ChimaraGlk *glk)
+{
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+	style_update(glk);
+
+	/* Schedule a redraw */
+	g_mutex_lock(priv->arrange_lock);
+	priv->needs_rearrange = TRUE;
+	priv->ignore_next_arrange_event = TRUE;
+	g_mutex_unlock(priv->arrange_lock);
+	gtk_widget_queue_resize( GTK_WIDGET(priv->self) );
+}