X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=c9132939237d5548f9632ff85a903f0e70148088;hb=3c59ba5eef5cb4d39c06eb7f523b9c3b026bdc9b;hp=85348f54502ce02de90a88b2406eb363b547cc5e;hpb=74177812e42bcd5f6abe84270855824163df753d;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 85348f5..c913293 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -74,8 +74,6 @@ window_close_common(winid_t win, gboolean destroy_node)
 	g_hash_table_destroy(win->hyperlinks);
 	g_free(win->current_hyperlink);
 
-	if(win->pager_layout)
-		g_object_unref(win->pager_layout);
 	if(win->backing_store)
 		cairo_surface_destroy(win->backing_store);
 
@@ -535,12 +533,20 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 		
 		case wintype_TextBuffer:
 		{
+			GtkWidget *overlay = gtk_overlay_new();
 			GtkWidget *scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
 			GtkWidget *textview = gtk_text_view_new();
+			GtkWidget *pager = gtk_button_new_with_label("More");
+			GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
 			GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(textview) );
 
 			gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
-			
+
+			gtk_button_set_image( GTK_BUTTON(pager), image );
+			gtk_widget_set_halign(pager, GTK_ALIGN_END);
+			gtk_widget_set_valign(pager, GTK_ALIGN_END);
+			gtk_widget_set_no_show_all(pager, TRUE);
+
 			gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR );
 			gtk_text_view_set_editable( GTK_TEXT_VIEW(textview), FALSE );
 			gtk_text_view_set_pixels_inside_wrap( GTK_TEXT_VIEW(textview), 3 );
@@ -548,16 +554,19 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			gtk_text_view_set_right_margin( GTK_TEXT_VIEW(textview), 20 );
 
 			gtk_container_add( GTK_CONTAINER(scrolledwindow), textview );
-			gtk_widget_show_all(scrolledwindow);
+			gtk_container_add( GTK_CONTAINER(overlay), scrolledwindow );
+			gtk_overlay_add_overlay( GTK_OVERLAY(overlay), pager );
+			gtk_widget_show_all(overlay);
 
 			win->widget = textview;
-			win->frame = scrolledwindow;
-			
+			win->scrolledwindow = scrolledwindow;
+			win->pager = pager;
+			win->frame = overlay;
+
 			/* 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) );
-			
+
 			/* 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) );
@@ -568,12 +577,11 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			
 			/* Pager */
 			g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win );
-			win->pager_expose_handler = g_signal_connect_after( textview, "draw", G_CALLBACK(pager_on_draw), 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);
 			GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
 			win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+			g_signal_connect(pager, "clicked", G_CALLBACK(pager_on_clicked), 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 );
@@ -971,24 +979,7 @@ glk_window_clear(winid_t win)
             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);
+			style_apply(win, &start, &end);
 
             gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start);