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

diff --git a/libchimara/strio.c b/libchimara/strio.c
index f668cb9..218adb2 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -49,19 +49,19 @@ flush_window_buffer(winid_t win)
 
 		GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
 		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, 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, 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;
 
@@ -87,13 +87,14 @@ flush_window_buffer(winid_t win)
 
 			GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
 			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, 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, style_tag, glk_style_tag, NULL);
 			}
 
 			chars_left -= available_space;
@@ -108,13 +109,14 @@ flush_window_buffer(winid_t win)
 
 			GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
 			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, 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, style_tag, glk_style_tag, NULL);
 			}
 		}
 		
@@ -258,7 +260,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 +267,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;