From 03bebb41ab618cb31b3a3994b338db4a8d8fbeef Mon Sep 17 00:00:00 2001 From: Marijn van Vliet Date: Sun, 16 Sep 2012 18:00:53 +0200 Subject: [PATCH] Some style cleanup work in glk_window_clear() --- libchimara/window.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libchimara/window.c b/libchimara/window.c index 9ebde93..c913293 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -979,24 +979,7 @@ glk_window_clear(winid_t win) GtkTextIter start, end; gtk_text_buffer_get_start_iter(textbuffer, &start); gtk_text_buffer_get_end_iter(textbuffer, &end); - - /* Determine default style */ - GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer); - GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default"); - GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, "normal"); - GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, "normal"); - - // Default style - gtk_text_buffer_apply_tag(textbuffer, default_tag, &start, &end); - - // Player's style overrides - gtk_text_buffer_apply_tag(textbuffer, style_tag, &start, &end); - - // GLK Program's style overrides - gtk_text_buffer_apply_tag(textbuffer, glk_style_tag, &start, &end); - - if(win->zcolor != NULL) - gtk_text_buffer_apply_tag(textbuffer, win->zcolor, &start, &end); + style_apply(win, &start, &end); gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start); -- 2.30.2