void
flush_window_buffer(winid_t win)
{
+#ifdef DEBUG_STYLES
+ g_printf("%s\n", win->buffer->str);
+#endif
if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid)
return;
case wintype_TextBuffer:
{
GtkTextIter start, end;
- gtk_text_buffer_get_end_iter(buffer, &start);
+ gtk_text_buffer_get_end_iter(buffer, &end);
+ gint start_offset;
GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
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);
+ 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);
// 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);
+ // Default style
+ gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end);
+
// Link style overrides
if(win->window_stream->hyperlink_mode) {
GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
}
// GLK Program's style overrides using garglk_set_zcolors()
- if(win->zcolor != NULL)
+ if(win->zcolor != NULL) {
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end);
+ }
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &end);
+ }
ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
g_assert(glk);
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))
+ while(chars_left > available_space && !gtk_text_iter_is_end(&insert))
{
- GtkTextIter end = start;
+ GtkTextIter end = insert;
gtk_text_iter_forward_to_line_end(&end);
- gtk_text_buffer_delete(buffer, &start, &end);
+ gtk_text_buffer_delete(buffer, &insert, &end);
- gtk_text_buffer_insert(buffer, &start, win->buffer->str + (length - chars_left), available_space);
+ 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, &end);
+ gtk_text_buffer_apply_tag(buffer, default_tag, &start, &insert);
// Player's style overrides
- gtk_text_buffer_apply_tag(buffer, style_tag, &start, &end);
+ 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, &end);
+ 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, &end);
- gtk_text_buffer_apply_tag(buffer, link_tag, &start, &end);
+ 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, &end);
+ gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert);
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &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);
- 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(&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_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, 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, default_tag, style_tag, glk_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);
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &insert);
}
}
/* Text grid/buffer windows */
case wintype_TextGrid:
+ {
+ gchar *utf8 = convert_latin1_to_utf8(buf, len);
+ if(utf8 != NULL) {
+ /* Deal with newlines */
+ int i;
+ gchar *line = utf8;
+ for(i=0; i<len; i++) {
+ if(utf8[i] == '\n') {
+ utf8[i] = '\0';
+ write_utf8_to_window_buffer(str->window, line);
+ flush_window_buffer(str->window);
+
+ /* Move cursor position forward to the next line */
+ gdk_threads_enter();
+ GtkTextIter cursor_pos;
+ GtkTextView *textview = GTK_TEXT_VIEW(str->window->widget);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
+ GtkTextMark *cursor_mark = gtk_text_buffer_get_mark(buffer, "cursor_position");
+
+ gtk_text_buffer_get_iter_at_mark( buffer, &cursor_pos, cursor_mark);
+ gtk_text_view_forward_display_line(textview, &cursor_pos);
+ gtk_text_view_backward_display_line_start(textview, &cursor_pos);
+ gtk_text_buffer_move_mark(buffer, cursor_mark, &cursor_pos);
+ gdk_threads_leave();
+
+ line = utf8 + (i < len-1 ? (i+1):(len-1));
+ }
+ }
+
+ /* No more newlines left. */
+ write_utf8_to_window_buffer(str->window, line);
+ g_free(utf8);
+ }
+
+ str->write_count += len;
+ }
+ break;
+
case wintype_TextBuffer:
{
gchar *utf8 = convert_latin1_to_utf8(buf, len);
* glk_get_char_stream_uni:
* @str: An input stream.
*
- * Reads one character from the stream @str. The result will be between 0 and
- * 0x7FFFFFFF. If the end of the stream has been reached, the result will be -1.
+ * Reads one character from the stream @str. If the end of the stream has been
+ * reached, the result will be -1.
*
* Returns: A value between 0 and 0x7FFFFFFF, or -1 on end of stream.
*/
* good for much anyhow.
* </para></note>
*
+ * glk_stream_get_position() on a window stream will always return zero.
+ *
+ * <note><para>
+ * It might make more sense to return the number of characters written to the
+ * window, but existing libraries do not support this and it's not really
+ * worth adding the feature.
+ * </para></note>
+ *
* Returns: position of the read/write mark in @str.
*/
glui32
return str->mark;
case STREAM_TYPE_FILE:
return ftell(str->file_pointer);
+ case STREAM_TYPE_WINDOW:
+ return 0;
default:
ILLEGAL_PARAM("Seeking illegal on stream type: %u", str->type);
return 0;
*
* Again, in Latin-1 streams, characters are bytes. In Unicode streams,
* characters are 32-bit words, or four bytes each.
+ *
+ * A window stream doesn't have a movable mark, so calling
+ * glk_stream_set_position() has no effect.
*/
void
glk_stream_set_position(strid_t str, glsi32 pos, glui32 seekmode)
WARNING("Seek failed on file stream");
break;
}
+ case STREAM_TYPE_WINDOW:
+ break; /* Quietly do nothing */
default:
ILLEGAL_PARAM("Seeking illegal on stream type: %u", str->type);
return;
projects / projects / chimara / chimara.git / blobdiff