X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=bc645b9a6c6bfb926d08dbffaa276f10cbbadc11;hb=6c2209c7aa7db00d64a70263d2ffd516d43e952f;hp=3309392a8da71660abdfca5c6f26d385202a59bf;hpb=f48bef46bd39ddac5067af1a4ac9b977b6158d07;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/strio.c b/libchimara/strio.c index 3309392..bc645b9 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -13,55 +13,6 @@ * */ -/* Internal function: write a UTF-8 string to a text grid window's text buffer. */ -static void -write_utf8_to_grid(winid_t win, gchar *s) -{ - if(win->input_request_type == INPUT_REQUEST_LINE || win->input_request_type == INPUT_REQUEST_LINE_UNICODE) - { - ILLEGAL("Tried to print to a text grid window with line input pending."); - return; - } - - /* Number of characters to insert */ - glong length = g_utf8_strlen(s, -1); - glong chars_left = length; - - gdk_threads_enter(); - - GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) ); - 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); - /* Spaces available on this line */ - gint available_space = win->width - gtk_text_iter_get_line_offset(&start); - - 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_insert_with_tags_by_name(buffer, &start, s + (length - chars_left), available_space, win->window_stream->style, NULL); - chars_left -= available_space; - gtk_text_iter_forward_line(&start); - available_space = win->width; - } - if(!gtk_text_iter_is_end(&start)) - { - GtkTextIter end = start; - gtk_text_iter_forward_chars(&end, chars_left); - gtk_text_buffer_delete(buffer, &start, &end); - gtk_text_buffer_insert_with_tags_by_name(buffer, &start, s + (length - chars_left), -1, win->window_stream->style, NULL); - } - - gtk_text_buffer_move_mark(buffer, cursor, &start); - - gdk_threads_leave(); -} - - /* Internal function: write a UTF-8 string to a text buffer window's text buffer. */ static void write_utf8_to_window_buffer(winid_t win, gchar *s) @@ -80,6 +31,9 @@ write_utf8_to_window_buffer(winid_t win, gchar *s) void flush_window_buffer(winid_t win) { + if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid) + return; + if(win->buffer->len == 0) return; @@ -87,15 +41,148 @@ flush_window_buffer(winid_t win) GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) ); - GtkTextIter iter; - gtk_text_buffer_get_end_iter(buffer, &iter); - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, win->buffer->str, -1, win->window_stream->style, NULL); + switch(win->type) { + case wintype_TextBuffer: + { + 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_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; + + case wintype_TextGrid: + { + /* Number of characters to insert */ + glong length = win->buffer->len; + glong chars_left = length; + + GtkTextMark *cursor = gtk_text_buffer_get_mark(buffer, "cursor_position"); + + /* Get cursor position */ + 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(&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, &insert, &end); + + 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_tag = win->current_hyperlink->tag; + 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(&insert); + available_space = win->width; + } + if(!gtk_text_iter_is_end(&insert)) + { + GtkTextIter end = insert; + gtk_text_iter_forward_chars(&end, chars_left); + 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); + + // 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_tag = win->current_hyperlink->tag; + 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); + } + break; + } gdk_threads_leave(); - - 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); g_string_truncate(win->buffer, 0); } @@ -117,26 +204,12 @@ write_buffer_to_stream(strid_t str, gchar *buf, glui32 len) str->write_count += len; break; - /* Text grid window */ + /* Text grid/buffer windows */ case wintype_TextGrid: + case wintype_TextBuffer: { gchar *utf8 = convert_latin1_to_utf8(buf, len); - if(utf8 != NULL) - { - /* FIXME: What to do if string contains \n? Split the input string at newlines and write each string separately? */ - write_utf8_to_grid(str->window, utf8); - g_free(utf8); - } - } - str->write_count += len; - break; - - /* Text buffer window */ - case wintype_TextBuffer: - { - gchar *utf8 = convert_latin1_to_utf8(buf, len); - if(utf8 != NULL) - { + if(utf8 != NULL) { write_utf8_to_window_buffer(str->window, utf8); g_free(utf8); } @@ -218,26 +291,12 @@ write_buffer_to_stream_uni(strid_t str, glui32 *buf, glui32 len) str->write_count += len; break; - /* Text grid window */ + /* Text grid/buffer windows */ case wintype_TextGrid: + case wintype_TextBuffer: { gchar *utf8 = convert_ucs4_to_utf8(buf, len); - if(utf8 != NULL) - { - /* FIXME: What to do if string contains \n? Split the input string at newlines and write each string separately? */ - write_utf8_to_grid(str->window, utf8); - g_free(utf8); - } - } - str->write_count += len; - break; - - /* Text buffer window */ - case wintype_TextBuffer: - { - gchar *utf8 = convert_ucs4_to_utf8(buf, len); - if(utf8 != NULL) - { + if(utf8 != NULL) { write_utf8_to_window_buffer(str->window, utf8); g_free(utf8); }