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

diff --git a/libchimara/strio.c b/libchimara/strio.c
index ea9d7b5..218adb2 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <pager.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
@@ -50,22 +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);
-
-		/* Schedule a check for the pager */
-		g_idle_add(pager_check, win);
-
 	}
 		break;
 
@@ -91,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;
@@ -112,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);
 			}
 		}