X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=e302a1eedc06201a79dbf87f40815499db9e169f;hb=0cc686dee7c3d71457b409a097fbc7435709429a;hp=7bef6d0b2fd5bbc922f615cd6352bc65ec7fe429;hpb=7f5205d4bee2fbc2ca2b9e26b961d37b2d656c55;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 7bef6d0..e302a1e 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -74,8 +74,8 @@ 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);
 
 	g_free(win);
 }
@@ -533,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 );
@@ -546,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) );
@@ -566,8 +577,6 @@ 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));
@@ -603,7 +612,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 
 		case wintype_Graphics:
 		{
-		    GtkWidget *image = gtk_image_new_from_pixmap(NULL, NULL);
+		    GtkWidget *image = gtk_drawing_area_new();
 			gtk_widget_show(image);
 
 			win->unit_width = 1;
@@ -611,13 +620,15 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 		    win->widget = image;
 		    win->frame = image;
 			win->background_color = 0x00FFFFFF;
-		    		
+			win->backing_store = NULL;
+
 			/* Connect signal handlers */
 			win->button_press_event_handler = g_signal_connect(image, "button-press-event", G_CALLBACK(on_window_button_press), win);
 			g_signal_handler_block(image, win->button_press_event_handler);
 			win->shutdown_keypress_handler = g_signal_connect(image, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win);
 			g_signal_handler_block(image, win->shutdown_keypress_handler);			
-			win->size_allocate_handler = g_signal_connect(image, "size-allocate", G_CALLBACK(on_graphics_size_allocate), win);
+			g_signal_connect(image, "configure-event", G_CALLBACK(on_graphics_configure), win);
+			g_signal_connect(image, "draw", G_CALLBACK(on_graphics_draw), win);
 		}
 		    break;