X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=6272c67a8cad6f10f841b362ba73d74e8c0d6194;hb=87504b58306f29cf833637a9e9983e947e684ee1;hp=56cbd700e6d66f2a5d9b2f496073a18fcf91eb05;hpb=edc4db52f1fac6cc5f46c48786251e5a91b3406b;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 56cbd70..6272c67 100644
--- 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,15 +553,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* Connect signal handlers */
 			
 			/* Pager */
-			/* "size-allocate"? Really? WTF, GTK? */
-			g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), 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);
 			win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win );
 			g_signal_handler_block(textview, win->pager_keypress_handler);
-			//g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win );
 			GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
-			g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+			win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
 
 			/* Char and line input */
 			win->char_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
@@ -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();
 		}