From b4edce061b3ad51cd2c2be1ae996c724481ef4e0 Mon Sep 17 00:00:00 2001 From: Marijn van Vliet Date: Sat, 29 Jan 2011 17:02:04 +0100 Subject: [PATCH] Began garglk_set_zcolors() implementation --- libchimara/garglk.c | 23 +++++++++++++++++- libchimara/strio.c | 58 +++++++++++++++++++++++++++++++++++---------- libchimara/style.c | 1 - libchimara/window.h | 3 +++ 4 files changed, 70 insertions(+), 15 deletions(-) diff --git a/libchimara/garglk.c b/libchimara/garglk.c index df5c6b3..eba89a8 100644 --- a/libchimara/garglk.c +++ b/libchimara/garglk.c @@ -3,6 +3,7 @@ #include "chimara-glk-private.h" #include "stream.h" #include "fileref.h" +#include "style.h" extern GPrivate *glk_data_key; @@ -177,8 +178,28 @@ garglk_set_zcolors(glui32 fg, glui32 bg) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); g_return_if_fail(glk_data->current_stream->window != NULL); + + winid_t window = glk_data->current_stream->window; + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(window->widget) ); + //GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GdkColor fore, back; + glkcolor_to_gdkcolor(fg, &fore); + glkcolor_to_gdkcolor(bg, &back); + + gchar *id = g_strdup_printf("%d", ++window->last_zcolor_id); + printf("id = %s\nfg = %08X\nbg = %08X\n\n", id, fg, bg); - WARNING(_("Not implemented")); + GtkTextTag *tag = gtk_text_buffer_create_tag( + buffer, + g_strdup_printf("%d", ++window->last_zcolor_id), + "foreground-gdk", &fore, + "foreground-set", TRUE, + "background-gdk", &back, + "background-set", TRUE, + NULL + ); + + window->zcolor = tag; } static void diff --git a/libchimara/strio.c b/libchimara/strio.c index b1df8ae..6d54e82 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -44,22 +44,39 @@ flush_window_buffer(winid_t win) switch(win->type) { case wintype_TextBuffer: { - GtkTextIter iter; - gtk_text_buffer_get_end_iter(buffer, &iter); + GtkTextIter start, end; + gtk_text_buffer_get_end_iter(buffer, &start); 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); + gtk_text_buffer_insert(buffer, &start, win->buffer->str, -1); + gtk_text_buffer_get_end_iter(buffer, &end); + + // Default style + gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end); + + // Player's style overrides + gtk_text_buffer_apply_tag(buffer, style_tag, &start, &end); + + // GLK Program's style overrides + gtk_text_buffer_apply_tag(buffer, glk_style_tag, &start, &end); + + // Link style overrides 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, 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, default_tag, style_tag, glk_style_tag, NULL); + gtk_text_buffer_apply_tag(buffer, link_style_tag, &start, &end); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &end); } + // GLK Program's style overrides using garglk_set_zcolors() + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end); + 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); @@ -80,25 +97,40 @@ flush_window_buffer(winid_t win) /* Spaces available on this line */ gint available_space = win->width - gtk_text_iter_get_line_offset(&start); + 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); + GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink"); + while(chars_left > available_space && !gtk_text_iter_is_end(&start)) { GtkTextIter end = start; gtk_text_iter_forward_to_line_end(&end); 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); + gtk_text_buffer_insert(buffer, &start, win->buffer->str + (length - chars_left), available_space); + + // Default style + gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end); + // Player's style overrides + gtk_text_buffer_apply_tag(buffer, style_tag, &start, &end); + + // GLK Program's style overrides + gtk_text_buffer_apply_tag(buffer, glk_style_tag, &start, &end); + + // Link style overrides 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, 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, default_tag, style_tag, glk_style_tag, NULL); + gtk_text_buffer_apply_tag(buffer, link_style_tag, &start, &end); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &end); } + // GLK Program's style overrides using garglk_set_zcolors() + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end); + chars_left -= available_space; gtk_text_iter_forward_line(&start); available_space = win->width; diff --git a/libchimara/style.c b/libchimara/style.c index e9bfd88..48883a9 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -749,7 +749,6 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, step be a scaling of 1.2 */ scale = pow(1.2, (double)val); } - g_printerr("Setting tag to %f\n", scale); g_object_set(tag_object, "scale", scale, "scale-set", TRUE, NULL); } break; diff --git a/libchimara/window.h b/libchimara/window.h index bb9a2f6..7ba3112 100644 --- a/libchimara/window.h +++ b/libchimara/window.h @@ -82,6 +82,9 @@ struct glk_window_struct gulong pager_adjustment_handler; /* Window buffer */ GString *buffer; + /* Styles */ + GtkTextTag *zcolor; + glui32 last_zcolor_id; /* Hyperlinks */ GHashTable *hyperlinks; struct hyperlink *current_hyperlink; -- 2.30.2