X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstrio.c;h=ab8443f5f8eb2823576f995bf6cafb6976b7db33;hb=9cf2c15bb9775ea5c540bc4128f1b79881da3cd7;hp=6d54e825c50bcbd1ccf6c7fb9361a1495c6af7c8;hpb=f945dd447b55c34d88683ff48d7ffb0b7c3c2ad8;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/strio.c b/libchimara/strio.c
index 6d54e82..ab8443f 100644
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -31,6 +31,9 @@ write_utf8_to_window_buffer(winid_t win, gchar *s)
 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;
 
@@ -45,7 +48,8 @@ flush_window_buffer(winid_t win)
 	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);
 
@@ -53,8 +57,9 @@ flush_window_buffer(winid_t win)
 		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);
+		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);
@@ -74,8 +79,14 @@ flush_window_buffer(winid_t win)
 		}
 
 		// 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);
@@ -92,10 +103,12 @@ 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");
@@ -103,55 +116,78 @@ flush_window_buffer(winid_t win)
 		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);
 			}
 		}
 		
@@ -184,6 +220,44 @@ write_buffer_to_stream(strid_t str, gchar *buf, glui32 len)
 					
 			    /* 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);