X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=6d54e825c50bcbd1ccf6c7fb9361a1495c6af7c8;hb=b4edce061b3ad51cd2c2be1ae996c724481ef4e0;hp=b1df8ae570a712d7bf111f05115abdff1b549a60;hpb=a2719c489bac9e4c1902e5476140a924a7d42b78;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/strio.c b/libchimara/strio.c
index b1df8ae..6d54e82 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -44,22 +44,39 @@ flush_window_buffer(winid_t win)
 	switch(win->type) {
 	case wintype_TextBuffer:
 	{
-		GtkTextIter iter;
-		gtk_text_buffer_get_end_iter(buffer, &iter);
+		GtkTextIter start, end;
+		gtk_text_buffer_get_end_iter(buffer, &start);
 
 		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);
 
+		gtk_text_buffer_insert(buffer, &start, win->buffer->str, -1);
+		gtk_text_buffer_get_end_iter(buffer, &end);
+
+		// Default style
+		gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end);
+
+		// 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);
+
+		// 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_insert_with_tags(buffer, &iter, win->buffer->str, -1, default_tag, style_tag, glk_style_tag, link_style_tag, link_tag, NULL);
-		} else {
-			gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, default_tag, style_tag, glk_style_tag, NULL);
+			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);
+
 		ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
 		g_assert(glk);
 		g_signal_emit_by_name(glk, "text-buffer-output", win->rock, win->buffer->str);
@@ -80,25 +97,40 @@ flush_window_buffer(winid_t win)
 		/* Spaces available on this line */
 		gint available_space = win->width - gtk_text_iter_get_line_offset(&start);
 		
+		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);
+		GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
+
 		while(chars_left > available_space && !gtk_text_iter_is_end(&start))
 		{
 			GtkTextIter end = start;
 			gtk_text_iter_forward_to_line_end(&end);
 			gtk_text_buffer_delete(buffer, &start, &end);
 
-			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);
+			gtk_text_buffer_insert(buffer, &start, win->buffer->str + (length - chars_left), available_space);
+
+			// Default style
+			gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end);
 
+			// 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);
+
+			// 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_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, default_tag, style_tag, glk_style_tag, link_style_tag, link_tag, NULL);
-			} else {
-				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, default_tag, style_tag, glk_style_tag, NULL);
+				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);
+
 			chars_left -= available_space;
 			gtk_text_iter_forward_line(&start);
 			available_space = win->width;