X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=dc0d4bb942acb13d4e73ddbeeca3bac7131e1f4f;hb=ed91d840318ed6ebfe3a5a77fa17114ddbf56640;hp=02d9ab2d01300e1f5adda0cab6b57bdedc207561;hpb=47c116d672f1d9f9a8251b4a384e856359e3738f;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 02d9ab2..dc0d4bb 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -239,9 +239,6 @@ style_init(ChimaraGlk *glk)
 	GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
 	GtkTextTag *tag;
 
-	PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif");
-	PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace");
-	
 	/* Initialise the default styles for a text grid */
 	tag = gtk_text_tag_new("default");
 	g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL);
@@ -344,9 +341,6 @@ style_init(ChimaraGlk *glk)
 	g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
 	text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
 
-	pango_font_description_free(default_font_desc);
-	pango_font_description_free(monospace_font_desc);
-	
 	priv->styles->text_grid = default_text_grid_styles;
 	priv->styles->text_buffer = default_text_buffer_styles;
 
@@ -1103,21 +1097,45 @@ PangoFontDescription *
 get_current_font(guint32 wintype)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	GtkTextTag *tag;
+	GHashTable *styles, *glk_styles;
+	PangoFontDescription *font;
 
 	switch(wintype) {
 	case wintype_TextGrid:
-		tag = g_hash_table_lookup(glk_data->styles->text_grid, "default");
+		styles = glk_data->styles->text_grid;
+		glk_styles = glk_data->glk_styles->text_grid;
+		font = pango_font_description_from_string("Monospace");
 		break;
 	case wintype_TextBuffer:
-		tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default");
+		styles = glk_data->styles->text_buffer;
+		glk_styles = glk_data->glk_styles->text_buffer;
+		font = pango_font_description_from_string("Serif");
 		break;
 	default:
 		return NULL;
 	}
 
-	PangoFontDescription *font;
-	g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
+	PangoAttrList *list = pango_attr_list_new();
+
+	text_tag_to_attr_list( g_hash_table_lookup(styles, "default"), list );
+	PangoAttrIterator *it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	text_tag_to_attr_list( g_hash_table_lookup(styles, "normal"), list );
+	it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	text_tag_to_attr_list( g_hash_table_lookup(glk_styles, "glk-normal"), list );
+	it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	/* Make a copy of the family, preventing it's destruction at the end of this function. */
+	pango_font_description_set_family( font, pango_font_description_get_family(font) );
+
+	pango_attr_list_unref(list);
 
 	return font;
 }
@@ -1156,7 +1174,8 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
 	}
 
 	/* Font description updates the following properties simultaniously:
-	 * family, style, weight, variant, stretch, size
+	 * family, style, weight, variant, stretch, size.
+	 * FIXME: Except it doesn't really.
 	 */
 	g_object_get(tag, "font-desc", &font_desc, NULL);
 	pango_attr_list_insert(
@@ -1253,3 +1272,44 @@ 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
+ */
+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);
+	}
+}
+