X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=bac31537c231a69fb4749df5afc54400118e1aac;hb=37e3cee8525bb02d3c12d75a55dd6f9c0f576861;hp=921b75cc771f0331828220061dbfc9030726fcd1;hpb=0b85f1dd5993e2ed111ec2ba13bbbb4ebda06ada;p=rodin%2Fchimara.git diff --git a/libchimara/strio.c b/libchimara/strio.c index 921b75c..bac3153 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -13,73 +13,119 @@ * */ -/* 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(buffer, &start, s + (length - chars_left), available_space); - 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(buffer, &start, s + (length - chars_left), -1); - } - - 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(winid_t win, gchar *s) +write_utf8_to_window_buffer(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 buffer window with line input pending."); return; } + + // Write to the buffer + g_string_append(win->buffer, s); +} +/* Internal function: flush a window's text buffer to the screen. */ +void +flush_window_buffer(winid_t win) +{ + if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid) + return; + + if(win->buffer->len == 0) + return; + gdk_threads_enter(); 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, s, -1, win->window_stream->style, NULL); + switch(win->type) { + case wintype_TextBuffer: + { + GtkTextIter iter; + gtk_text_buffer_get_end_iter(buffer, &iter); + + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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, &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); + } + + 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; + 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); + + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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), 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); + } + + 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); + + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->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); + } else { + gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, NULL); + } + } + + gtk_text_buffer_move_mark(buffer, cursor, &start); + } + break; + } gdk_threads_leave(); + + g_string_truncate(win->buffer, 0); } /* Internal function: write a Latin-1 buffer with length to a stream. */ @@ -99,27 +145,13 @@ 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) - { - write_utf8_to_window(str->window, utf8); + if(utf8 != NULL) { + write_utf8_to_window_buffer(str->window, utf8); g_free(utf8); } } @@ -200,27 +232,13 @@ 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) - { - write_utf8_to_window(str->window, utf8); + if(utf8 != NULL) { + write_utf8_to_window_buffer(str->window, utf8); g_free(utf8); } } @@ -337,6 +355,9 @@ void glk_put_string_stream(strid_t str, char *s) { VALID_STREAM(str, return); + if(*s == 0) + return; + g_return_if_fail(str->file_mode != filemode_Read); write_buffer_to_stream(str, s, strlen(s)); @@ -355,6 +376,9 @@ void glk_put_string_stream_uni(strid_t str, glui32 *s) { VALID_STREAM(str, return); + if(*s == 0) + return; + g_return_if_fail(str->file_mode != filemode_Read); /* An impromptu strlen() for glui32 arrays */ @@ -379,6 +403,9 @@ void glk_put_buffer_stream(strid_t str, char *buf, glui32 len) { VALID_STREAM(str, return); + if(len == 0) + return; + g_return_if_fail(str->file_mode != filemode_Read); write_buffer_to_stream(str, buf, len); @@ -398,6 +425,9 @@ void glk_put_buffer_stream_uni(strid_t str, glui32 *buf, glui32 len) { VALID_STREAM(str, return); + if(len == 0) + return; + g_return_if_fail(str->file_mode != filemode_Read); write_buffer_to_stream_uni(str, buf, len); @@ -880,9 +910,14 @@ glk_get_line_stream(strid_t str, char *buf, glui32 len) } else /* Regular binary file */ { - fgets(buf, len, str->file_pointer); - str->read_count += strlen(buf); - return strlen(buf); + if( !fgets(buf, len, str->file_pointer) ) { + *buf = 0; + return 0; + } + + int nread = strlen(buf); + str->read_count += nread; + return nread; } } else /* Text mode is the same for Unicode and regular files */ @@ -1018,10 +1053,14 @@ glk_get_line_stream_uni(strid_t str, glui32 *buf, glui32 len) else /* Regular binary file */ { gchar *readbuffer = g_new0(gchar, len); - fgets(readbuffer, len, str->file_pointer); - glui32 count = strlen(readbuffer) + 1; /* Copy terminator */ + if( !fgets(readbuffer, len, str->file_pointer) ) { + *buf = 0; + return 0; + } + + glui32 count = strlen(readbuffer); int foo; - for(foo = 0; foo < count; foo++) + for(foo = 0; foo < count + 1; foo++) /* Copy terminator */ buf[foo] = (unsigned char)(readbuffer[foo]); str->read_count += count; return count; @@ -1109,7 +1148,7 @@ glk_stream_get_position(strid_t str) * glk_stream_set_position: * @str: A file or memory stream. * @pos: The position to set the mark to, relative to @seekmode. - * @seekmode: One of #seekmode_Start, #seekmode_Current, or #seekmode_End. + * @seekmode: One of %seekmode_Start, %seekmode_Current, or %seekmode_End. * * Sets the position of the read/write mark in @str. The position is controlled * by @pos, and the meaning of @pos is controlled by @seekmode. See the @@ -1136,7 +1175,7 @@ glk_stream_set_position(strid_t str, glsi32 pos, glui32 seekmode) { VALID_STREAM(str, return); g_return_if_fail(!(seekmode == seekmode_Start && pos < 0)); - g_return_if_fail(!(seekmode == seekmode_End || pos > 0)); + g_return_if_fail(!(seekmode == seekmode_End && pos > 0)); switch(str->type) {