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

diff --git a/libchimara/strio.c b/libchimara/strio.c
index bc645b9..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;
 
@@ -76,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);
@@ -107,9 +116,9 @@ 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, &insert, &end);
 
@@ -134,11 +143,13 @@ flush_window_buffer(winid_t win)
 			}
 
 			// 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);
+			}
 
 			chars_left -= available_space;
 			gtk_text_iter_forward_line(&insert);
@@ -171,10 +182,13 @@ flush_window_buffer(winid_t win)
 			}
 
 			// 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);
+			}
 		}
 		
 		gtk_text_buffer_move_mark(buffer, cursor, &start);
@@ -206,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);