X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=66fb989c40622473e55d33821318e4f25353abda;hb=0edb4482f7a5d5de3b2fe82ad9a4b977eacb8721;hp=467c6c67a202a1a981eb630e802e575d5dc343af;hpb=f463bc32aa6199dcd0d253bd42862ef67c32c784;p=rodin%2Fchimara.git

diff --git a/libchimara/strio.c b/libchimara/strio.c
index 467c6c6..66fb989 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -46,12 +46,21 @@ flush_window_buffer(winid_t win)
 	{
 		GtkTextIter iter;
 		gtk_text_buffer_get_end_iter(buffer, &iter);
-		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, win->buffer->str, -1, win->window_stream->style, NULL);
+
+		GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+		GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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);
+		} else {
+			gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, 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;
 
@@ -74,7 +83,18 @@ flush_window_buffer(winid_t win)
 			GtkTextIter end = start;
 			gtk_text_iter_forward_to_line_end(&end);
 			gtk_text_buffer_delete(buffer, &start, &end);
-			gtk_text_buffer_insert_with_tags_by_name(buffer, &start, win->buffer->str + (length - chars_left), available_space, win->window_stream->style, NULL);
+
+			GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+			GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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);
+			} else {
+				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, style_tag, NULL);
+			}
+
 			chars_left -= available_space;
 			gtk_text_iter_forward_line(&start);
 			available_space = win->width;
@@ -84,7 +104,17 @@ flush_window_buffer(winid_t win)
 			GtkTextIter end = start;
 			gtk_text_iter_forward_chars(&end, chars_left);
 			gtk_text_buffer_delete(buffer, &start, &end);
-			gtk_text_buffer_insert_with_tags_by_name(buffer, &start, win->buffer->str + (length - chars_left), -1, win->window_stream->style, NULL);
+
+			GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+			GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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);
+			} else {
+				gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, NULL);
+			}
 		}
 		
 		gtk_text_buffer_move_mark(buffer, cursor, &start);