X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=bc645b9a6c6bfb926d08dbffaa276f10cbbadc11;hb=6c2209c7aa7db00d64a70263d2ffd516d43e952f;hp=f668cb9484637431ad849f62246b0365cadc5c79;hpb=30a24d6641c2e4a7c73c07c6d9f1b1dc8f074628;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/strio.c b/libchimara/strio.c index f668cb9..bc645b9 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -44,24 +44,44 @@ 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, &end); + gint start_offset; 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); + + start_offset = gtk_text_iter_get_offset(&end); + gtk_text_buffer_insert(buffer, &end, win->buffer->str, -1); + gtk_text_buffer_get_iter_at_offset(buffer, &start, start_offset); + + // 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; @@ -74,48 +94,87 @@ flush_window_buffer(winid_t win) GtkTextMark *cursor = gtk_text_buffer_get_mark(buffer, "cursor_position"); /* Get cursor position */ - GtkTextIter start; - gtk_text_buffer_get_iter_at_mark(buffer, &start, cursor); + GtkTextIter start, insert; + gint start_offset; + + gtk_text_buffer_get_iter_at_mark(buffer, &insert, cursor); /* Spaces available on this line */ - gint available_space = win->width - gtk_text_iter_get_line_offset(&start); + gint available_space = win->width - gtk_text_iter_get_line_offset(&insert); + 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); + gtk_text_buffer_delete(buffer, &insert, &end); - GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); - GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style); + start_offset = gtk_text_iter_get_offset(&insert); + gtk_text_buffer_insert(buffer, &insert, win->buffer->str + (length - chars_left), available_space); + gtk_text_buffer_get_iter_at_offset(buffer, &start, start_offset); + // Default style + gtk_text_buffer_apply_tag(buffer, default_tag, &start, &insert); + + // Player's style overrides + gtk_text_buffer_apply_tag(buffer, style_tag, &start, &insert); + + // GLK Program's style overrides + gtk_text_buffer_apply_tag(buffer, glk_style_tag, &start, &insert); + + // 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, &insert); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &insert); } + // GLK Program's style overrides using garglk_set_zcolors() + /* + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert); + */ + + chars_left -= available_space; - gtk_text_iter_forward_line(&start); + gtk_text_iter_forward_line(&insert); available_space = win->width; } - if(!gtk_text_iter_is_end(&start)) + if(!gtk_text_iter_is_end(&insert)) { - GtkTextIter end = start; + GtkTextIter end = insert; gtk_text_iter_forward_chars(&end, chars_left); - gtk_text_buffer_delete(buffer, &start, &end); + gtk_text_buffer_delete(buffer, &insert, &end); + + start_offset = gtk_text_iter_get_offset(&insert); + gtk_text_buffer_insert(buffer, &insert, win->buffer->str + (length - chars_left), -1); + gtk_text_buffer_get_iter_at_offset(buffer, &start, start_offset); + + // Default style + gtk_text_buffer_apply_tag(buffer, default_tag, &start, &insert); - GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); - GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style); + // Player's style overrides + gtk_text_buffer_apply_tag(buffer, style_tag, &start, &insert); + // GLK Program's style overrides + gtk_text_buffer_apply_tag(buffer, glk_style_tag, &start, &insert); + + // 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), -1, 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_apply_tag(buffer, link_style_tag, &start, &insert); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &insert); } + + // GLK Program's style overrides using garglk_set_zcolors() + /* + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert); + */ } gtk_text_buffer_move_mark(buffer, cursor, &start); @@ -258,7 +317,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 +324,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;