X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fstrio.c;h=b1df8ae570a712d7bf111f05115abdff1b549a60;hp=218adb2a92868b54ae3963cb261d6dad7261cbb9;hb=6fea4d9d2b3cbe24bb760bbdeda5fefa3c74033b;hpb=e2aad0fc9a4c2bc75db8f0b3f1d2d3c70e55e7bb diff --git a/libchimara/strio.c b/libchimara/strio.c index 218adb2..b1df8ae 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -48,15 +48,16 @@ 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, glk_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, glk_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)); @@ -86,15 +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, glk_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, glk_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; @@ -108,15 +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, glk_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, glk_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); } }