Overhauled the whole reverse video thing.

[projects/chimara/chimara.git] / libchimara / window.c

diff --git a/libchimara/window.c b/libchimara/window.c
index 94042d1a9aaa901b0d2233453858cecc28518897..6272c67a8cad6f10f841b362ba73d74e8c0d6194 100644 (file)
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -26,6 +26,7 @@ window_new_common(glui32 rock)
        win->window_stream->type = STREAM_TYPE_WINDOW;
        win->window_stream->window = win;
        win->window_stream->style = "normal";
+       win->window_stream->glk_style = "normal";
 
        win->echo_stream = NULL;
        win->input_request_type = INPUT_REQUEST_NONE;
@@ -552,7 +553,6 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
                        /* Connect signal handlers */
                        
                        /* Pager */
-                       //g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_after_expose_event), win );
                        g_signal_connect_after( textview, "size-request", G_CALLBACK(pager_after_size_request), win );
                        win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
                        g_signal_handler_block(textview, win->pager_expose_handler);
@@ -585,8 +585,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 
                        /* Create the pager position mark; it stands for the last character in the buffer
                         that has been on-screen */
-                       GtkTextMark *pager_position = gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
-                       gtk_text_mark_set_visible(pager_position, TRUE);
+                       gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
                }
                        break;
 
@@ -952,9 +951,29 @@ glk_window_clear(winid_t win)
             gtk_text_buffer_set_text(textbuffer, text, -1);
             g_free(text);
             
-            GtkTextIter begin;
-            gtk_text_buffer_get_start_iter(textbuffer, &begin);
-            gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &begin);
+            GtkTextIter start, end;
+            gtk_text_buffer_get_start_iter(textbuffer, &start);
+            gtk_text_buffer_get_end_iter(textbuffer, &end);
+
+                       /* Determine default style */
+                       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer);
+                       GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
+                       GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, "normal");
+                       GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, "normal");
+
+                       // Default style
+                       gtk_text_buffer_apply_tag(textbuffer, default_tag, &start, &end);
+
+                       // Player's style overrides
+                       gtk_text_buffer_apply_tag(textbuffer, style_tag, &start, &end);
+
+                       // GLK Program's style overrides
+                       gtk_text_buffer_apply_tag(textbuffer, glk_style_tag, &start, &end);
+
+                       if(win->zcolor != NULL)
+                               gtk_text_buffer_apply_tag(textbuffer, win->zcolor, &start, &end);
+
+            gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start);
                    
                    gdk_threads_leave();
                }