X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fstyle.c;h=b4aa029367a61443955c413b832235a9caea33b3;hp=36d6d2644dce293390f019981420f3a0c8ac0001;hb=523811df4155ac5a10b206cb16374d1383e108fc;hpb=81becb22fdc69e406c685c65b9f55fd514df142b

diff --git a/libchimara/style.c b/libchimara/style.c
index 36d6d26..b4aa029 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -8,7 +8,7 @@
 #include "stream.h"
 #include "strio.h"
 
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
 
 static gboolean style_accept(GScanner *scanner, GTokenType token);
 static gboolean style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk);
@@ -34,7 +34,7 @@ static void style_cascade_colors(GtkTextTag *tag, GtkTextTag *glk_tag, GtkTextTa
 void
 glk_set_style(glui32 styl)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	g_return_if_fail(glk_data->current_stream != NULL);
 	glk_set_style_stream(glk_data->current_stream, styl);
 }
@@ -53,7 +53,6 @@ static const gchar* TAG_NAMES[] = {
 	"user1",
 	"user2",
 	"hyperlink",
-	"pager",
 	"default"
 };
 
@@ -123,23 +122,13 @@ glk_set_style_stream(strid_t str, glui32 styl) {
 	str->glk_style = (gchar*) get_glk_tag_name(styl);
 }
 
-/* Internal function: call this to initialize the layout of the 'more' prompt. */
-void
-style_init_more_prompt(winid_t win)
-{
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
-	win->pager_layout = gtk_widget_create_pango_layout(win->widget, "More");
-	pango_layout_set_attributes(win->pager_layout, glk_data->pager_attr_list);
-}
-
 /* Internal function: call this to initialize the default styles to a textbuffer. */
 void
 style_init_textbuffer(GtkTextBuffer *buffer)
 {
 	g_return_if_fail(buffer != NULL);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 
 	/* Place the default text tags in the textbuffer's tag table */
 	g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@ -157,8 +146,8 @@ void
 style_init_textgrid(GtkTextBuffer *buffer)
 {
 	g_return_if_fail(buffer != NULL);
-	
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 
 	/* Place the default text tags in the textbuffer's tag table */
 	g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@ -242,8 +231,6 @@ style_init(ChimaraGlk *glk)
 	
 	GHashTable *default_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
 	GHashTable *default_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
-	GHashTable *glk_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
-	GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
 	GtkTextTag *tag;
 
 	/* Initialise the default styles for a text grid */
@@ -343,14 +330,23 @@ style_init(ChimaraGlk *glk)
 	g_object_set(tag, "foreground", "#0000ff", "foreground-set", TRUE, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
 	g_hash_table_insert(default_text_buffer_styles, "hyperlink", tag);
 
-	GtkTextTag *pager_tag = gtk_text_tag_new("pager");
-	g_object_set(pager_tag, "family", "Monospace", "family-set", TRUE, "foreground", "#ffffff", "foreground-set", TRUE, "background", "#000000", "background-set", TRUE, NULL);
-	g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
-	text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
-
 	priv->styles->text_grid = default_text_grid_styles;
 	priv->styles->text_buffer = default_text_buffer_styles;
 
+	style_reset_glk(glk);
+}
+
+/* Reset the style hints set from the Glk program to be blank. Call this when
+starting a new game so that style hints from the previous game don't carry
+over. */
+void
+style_reset_glk(ChimaraGlk *glk)
+{
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+
+	GHashTable *glk_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
+	GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
+	GtkTextTag *tag;
 
 	/* Initialize the GLK styles to empty tags */
 	int i;
@@ -396,9 +392,6 @@ scan_css_file(GScanner *scanner, ChimaraGlk *glk)
 	}
 
 	g_scanner_destroy(scanner);
-
-	/* Update the pager prompt to the new style */
-	style_update(glk);
 }
 
 /* Internal function: parses a token */
@@ -661,7 +654,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, glui32 styl, glui32 hint
 {
 	g_return_if_fail(tag != NULL);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	GObject *tag_object = G_OBJECT(tag);
 
 	gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") );
@@ -821,7 +814,7 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint)
 
 	g_return_val_if_fail(tag != NULL, 0);
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 
 	switch(hint) {
 	case stylehint_Indentation:
@@ -916,7 +909,7 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val)
 	g_printf("glk_stylehint_set(wintype=%d, styl=%d, hint=%d, val=%d)\n", wintype, styl, hint, val);
 #endif
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 
 	GtkTextTag *to_change;
 	if(wintype == wintype_TextBuffer || wintype == wintype_AllTypes) {
@@ -951,7 +944,7 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
 	g_printf("glk_stylehint_clear(wintype=%d, styl=%d, hint=%d)\n", wintype, styl, hint);
 #endif
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	GtkTextTag *tag;
 
 	switch(wintype) {
@@ -1077,7 +1070,7 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
 	g_printf("glk_style_measure(win->rock=%d, styl=%d, hint=%d, result=...)\n", win->rock, styl, hint);
 #endif
 
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	GtkTextTag *tag;
 
 	switch(win->type) {
@@ -1103,7 +1096,7 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
 PangoFontDescription *
 get_current_font(guint32 wintype)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	GHashTable *styles, *glk_styles;
 	PangoFontDescription *font;
 
@@ -1206,16 +1199,6 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
 	}
 }
 
-/* Update pager tag */
-void
-style_update(ChimaraGlk *glk)
-{
-	CHIMARA_GLK_USE_PRIVATE(glk, priv);
-
-	GtkTextTag *pager_tag = GTK_TEXT_TAG( g_hash_table_lookup(priv->styles->text_buffer, "pager") );
-	text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
-}
-
 /* Determine the current colors used to render the text for a given stream. 
  * This can be set in a number of places */
 static void
@@ -1279,3 +1262,45 @@ style_stream_colors(strid_t str, GdkColor **foreground, GdkColor **background)
 			g_object_get(str->window->zcolor, "background-gdk", background, NULL);
 	}
 }
+
+/* Apply styles to a segment of text in a GtkTextBuffer, combining multiple
+ * GtkTextTags.
+ */
+void
+style_apply(winid_t win, GtkTextIter *start, GtkTextIter *end)
+{
+	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+	GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+
+	GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
+	GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style);
+	GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style);
+
+	// Player's style overrides
+	gtk_text_buffer_apply_tag(buffer, style_tag, start, end);
+
+	// GLK Program's style overrides
+	gtk_text_buffer_apply_tag(buffer, glk_style_tag, start, end);
+
+	// Default style
+	gtk_text_buffer_apply_tag(buffer, default_tag, start, end);
+
+	// Link style overrides
+	if(win->window_stream->hyperlink_mode) {
+		GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
+		GtkTextTag *link_tag = win->current_hyperlink->tag;
+		gtk_text_buffer_apply_tag(buffer, link_style_tag, start, end);
+		gtk_text_buffer_apply_tag(buffer, link_tag, start, end);
+	}
+
+	// GLK Program's style overrides using garglk_set_zcolors()
+	if(win->zcolor != NULL) {
+		gtk_text_buffer_apply_tag(buffer, win->zcolor, start, end);
+	}
+
+	// GLK Program's style overrides using garglk_set_reversevideo()
+	if(win->zcolor_reversed != NULL) {
+		gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, start, end);
+	}
+}
+