Began garglk_set_zcolors() implementation

[projects/chimara/chimara.git] / libchimara / strio.c

diff --git a/libchimara/strio.c b/libchimara/strio.c
index f668cb9484637431ad849f62246b0365cadc5c79..6d54e825c50bcbd1ccf6c7fb9361a1495c6af7c8 100644 (file)
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -44,24 +44,42 @@ 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, 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_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);
-
        }
                break;
 
@@ -79,23 +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 *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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, 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_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;
@@ -107,14 +142,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, 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, NULL);
+                               gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, default_tag, style_tag, glk_style_tag, NULL);
                        }
                }
                
@@ -258,7 +295,6 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
                        if(str->unicode && str->ubuffer)
                        {
                                int copycount = MIN(len, str->buflen - str->mark);
-                               g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
                                memmove(str->ubuffer + str->mark, buf, copycount * sizeof(glui32));
                                str->mark += copycount;
                        }
@@ -266,7 +302,6 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len)
                        {
                                gchar *latin1 = convert_ucs4_to_latin1_binary(buf, len);
                                int copycount = MIN(len, str->buflen - str->mark);
-                               g_printerr("Attempting to copy %d units; %d units of space left in buffer\n", len, str->buflen - str->mark);
                                memmove(str->buffer + str->mark, latin1, copycount);
                                g_free(latin1);
                                str->mark += copycount;