X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=b1df8ae570a712d7bf111f05115abdff1b549a60;hb=HEAD;hp=f668cb9484637431ad849f62246b0365cadc5c79;hpb=cb434cde33f75d939c6b10eabea3ab21f05f2810;p=rodin%2Fchimara.git

diff --git a/libchimara/strio.c b/libchimara/strio.c
index f668cb9..b1df8ae 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -48,20 +48,21 @@ flush_window_buffer(winid_t win)
 		gtk_text_buffer_get_end_iter(buffer, &iter);
 
 		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);
 
 		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, style_tag, link_style_tag, link_tag, NULL);
+			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, style_tag, NULL);
+			gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, default_tag, style_tag, glk_style_tag, NULL);
 		}
 
 		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);
-
 	}
 		break;
 
@@ -86,14 +87,16 @@ flush_window_buffer(winid_t win)
 			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);
 
 			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, style_tag, link_style_tag, link_tag, NULL);
+				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, style_tag, NULL);
+				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, default_tag, style_tag, glk_style_tag, NULL);
 			}
 
 			chars_left -= available_space;
@@ -107,14 +110,16 @@ flush_window_buffer(winid_t win)
 			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);
 
 			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), -1, style_tag, link_style_tag, link_tag, NULL);
+				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, 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), -1, style_tag, NULL);
+				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, default_tag, style_tag, glk_style_tag, NULL);
 			}
 		}
 		
@@ -258,7 +263,6 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
 			if(str->unicode && str->ubuffer)
 			{
 				int copycount = MIN(len, str->buflen - str->mark);
-				g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
 				memmove(str->ubuffer + str->mark, buf, copycount * sizeof(glui32));
 				str->mark += copycount;
 			}
@@ -266,7 +270,6 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
 			{
 				gchar *latin1 = convert_ucs4_to_latin1_binary(buf, len);
 				int copycount = MIN(len, str->buflen - str->mark);
-				g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
 				memmove(str->buffer + str->mark, latin1, copycount);
 				g_free(latin1);
 				str->mark += copycount;