X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fpager.c;h=652a70dd411fe7948bd35a76623eefc795937f91;hb=0cc686dee7c3d71457b409a097fbc7435709429a;hp=194a21dc64edb9e46cccba7cd3e9b3ea4237cccd;hpb=bf5bc4b0d129685482eefea499f39f874744e2fd;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/pager.c b/libchimara/pager.c
index 194a21d..652a70d 100644
--- a/libchimara/pager.c
+++ b/libchimara/pager.c
@@ -46,7 +46,7 @@ static void
 start_paging(winid_t win)
 {
 	win->currently_paging = TRUE;
-	g_signal_handler_unblock(win->widget, win->pager_expose_handler);
+	gtk_widget_show(win->pager);
 	g_signal_handler_unblock(win->widget, win->pager_keypress_handler);
 }
 
@@ -55,7 +55,7 @@ static void
 stop_paging(winid_t win)
 {
 	win->currently_paging = FALSE;
-	g_signal_handler_block(win->widget, win->pager_expose_handler);
+	gtk_widget_hide(win->pager);
 	g_signal_handler_block(win->widget, win->pager_keypress_handler);
 }
 
@@ -80,7 +80,7 @@ pager_after_adjustment_changed(GtkAdjustment *adj, winid_t win)
 gboolean
 pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win)
 {
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(win->frame) );
+	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(win->scrolledwindow) );
 	gdouble page_size, upper, lower, value;
 	g_object_get(adj, 
 		"page-size", &page_size,
@@ -90,12 +90,12 @@ pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win)
 		NULL);
 	
 	switch (event->keyval) {
-		case GDK_space: case GDK_KP_Space:
-		case GDK_Page_Down: case GDK_KP_Page_Down:
-		case GDK_Return: case GDK_KP_Enter:
+		case GDK_KEY_space: case GDK_KEY_KP_Space:
+		case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+		case GDK_KEY_Return: case GDK_KEY_KP_Enter:
 			gtk_adjustment_set_value(adj, CLAMP(value + page_size, lower, upper - page_size));
 			return TRUE;
-		case GDK_Page_Up: case GDK_KP_Page_Up:
+		case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
 			gtk_adjustment_set_value(adj, CLAMP(value - page_size, lower, upper - page_size));
 			return TRUE;
 			/* don't handle "up" and "down", they're used for input history */
@@ -104,32 +104,10 @@ pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win)
 	return FALSE; /* if the key wasn't handled here, pass it to other handlers */
 }
 
-/* Draw the "more" prompt on top of the buffer, after the regular expose event has run */
-gboolean
-pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win)
-{
-	/* Calculate the position of the 'more' tag */
-	gint promptwidth, promptheight;
-	pango_layout_get_pixel_size(win->pager_layout, &promptwidth, &promptheight);
-
-	gint winx, winy, winwidth, winheight;
-	gdk_window_get_position(event->window, &winx, &winy);
-	gdk_drawable_get_size(GDK_DRAWABLE(event->window), &winwidth, &winheight);
-
-	/* Draw the 'more' tag */
-	GdkGC *context = gdk_gc_new(GDK_DRAWABLE(event->window));
-	gdk_draw_layout(event->window, context, 
-		winx + winwidth - promptwidth, 
-		winy + winheight - promptheight, 
-		win->pager_layout);
-
-	return FALSE; /* Propagate event further */
-}
-
 /* Check whether paging should be done. This function is called after the
  * textview has finished validating text positions. */
 void 
-pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, winid_t win) 
+pager_after_size_allocate(GtkTextView *textview, GdkRectangle *allocation, winid_t win)
 {
 	/* Move the pager to the last visible character in the buffer */
 	gint view_height, scroll_distance; 
@@ -151,7 +129,7 @@ pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, win
 	
 	/* Scroll past text already read by user. This is automatic scrolling, so disable the pager_ajustment_handler
 	 * first, that acts on the belief the scolling is performed by the user. */
-	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(win->frame));
+	GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(win->scrolledwindow));
 	g_signal_handler_block(adj, win->pager_adjustment_handler);
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(win->widget));
 	GtkTextMark *pager_position = gtk_text_buffer_get_mark(buffer, "pager_position");
@@ -161,13 +139,7 @@ pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, win
 	if(!win->currently_paging) {
 		if(scroll_distance > view_height) {
 			start_paging(win);
-			/* Seriously... */
-			/* COMPAT: */
-#if GTK_CHECK_VERSION(2,14,0)
 			gdk_window_invalidate_rect(gtk_widget_get_window(win->widget), NULL, TRUE);
-#else
-			gdk_window_invalidate_rect(win->widget->window, NULL, TRUE);
-#endif
 		}
 	}
 }