X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=e8bcf3724a9a947fc86998d34231189121cd6ac1;hb=a2e82e317a6000511953c2dbc0eb1026c7b245a7;hp=af470566ccd734bf72eaba9b0b45983039287bc0;hpb=6a19bed210500ab8303a0e94d74adbf2ee0e2920;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index af47056..e8bcf37 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -3,6 +3,7 @@
 #include "magic.h"
 #include "chimara-glk-private.h"
 #include "gi_dispa.h"
+#include "pager.h"
 
 extern GPrivate *glk_data_key;
 
@@ -65,6 +66,10 @@ window_close_common(winid_t win, gboolean destroy_node)
 	g_string_free(win->buffer, TRUE);
 	g_hash_table_destroy(win->hyperlinks);
 	g_free(win->current_hyperlink);
+
+	if(win->pager_layout)
+		g_object_unref(win->pager_layout);
+
 	g_free(win);
 }
 
@@ -525,13 +530,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			gtk_container_add( GTK_CONTAINER(scrolledwindow), textview );
 			gtk_widget_show_all(scrolledwindow);
 
+			win->widget = textview;
+			win->frame = scrolledwindow;
+			
 			/* Create the styles available to the window stream */
 			style_init_textbuffer(textbuffer);
+			style_init_more_prompt(win);
 			gtk_widget_modify_font( textview, get_current_font(wintype) );
 			
-			win->widget = textview;
-			win->frame = scrolledwindow;
-			
 			/* Determine the size of a "0" character in pixels */
 			PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0");
 			pango_layout_set_font_description( zero, get_current_font(wintype) );
@@ -539,15 +545,28 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			g_object_unref(zero);
 
 			/* Connect signal handlers */
+			
+			/* Pager */
+			win->pager_expose_handler = g_signal_connect( 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);
+
+			/* 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 );
 			g_signal_handler_block(textview, win->char_input_keypress_handler);
 			win->line_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win );
 			g_signal_handler_block(textview, win->line_input_keypress_handler);
-			win->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win );
-			g_signal_handler_block(textview, win->shutdown_keypress_handler);			
 			win->insert_text_handler = g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(after_window_insert_text), win );
 			g_signal_handler_block(textbuffer, win->insert_text_handler);
 
+			/* Shutdown key press */
+			win->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win );
+			g_signal_handler_block(textview, win->shutdown_keypress_handler);			
+
 			/* Create an editable tag to indicate uneditable parts of the window
 			(for line input) */
 			gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL);
@@ -556,6 +575,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			GtkTextIter end;
 			gtk_text_buffer_get_end_iter(textbuffer, &end);
 			gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE);
+
+			/* Create the pager position mark; it stands for the last character in the buffer
+			 that has been on-screen */
+			gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
 		}
 			break;