X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=b51082f24dfde8aada92f9c383fe296bb24cfd49;hb=594edf9b1277d5ec88892c2ea02c2bdc2f2e8b0e;hp=2ff80f18d4c35c11cdd3264aec71dd0452309557;hpb=2af881bd90a35b4f1343b027ba7c3c0464930fb1;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 2ff80f18..b51082f2 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <math.h>
 #include <gtk/gtkalignment.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkbindings.h>
@@ -29,6 +30,11 @@
 #include "ev-marshal.h"
 #include "ev-view.h"
 #include "ev-document-find.h"
+#include "ev-document-misc.h"
+#include "ev-debug.h"
+#include "ev-job-queue.h"
+#include "ev-page-cache.h"
+#include "ev-pixbuf-cache.h"
 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
@@ -48,6 +54,11 @@ enum {
   TARGET_TEXT_BUFFER_CONTENTS
 };
 
+enum {
+	EV_SCROLL_PAGE_FORWARD,
+	EV_SCROLL_PAGE_BACKWARD
+};
+
 static const GtkTargetEntry targets[] = {
 	{ "STRING", 0, TARGET_STRING },
 	{ "TEXT",   0, TARGET_TEXT },
@@ -58,37 +69,53 @@ static const GtkTargetEntry targets[] = {
 typedef enum {
 	EV_VIEW_CURSOR_NORMAL,
 	EV_VIEW_CURSOR_LINK,
-	EV_VIEW_CURSOR_WAIT
+	EV_VIEW_CURSOR_WAIT,
+	EV_VIEW_CURSOR_HIDDEN
 } EvViewCursor;
 
+#define ZOOM_IN_FACTOR  1.2
+#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
+
+#define MIN_SCALE 0.05409
+#define MAX_SCALE 18.4884
+
 struct _EvView {
 	GtkWidget parent_instance;
 
 	EvDocument *document;
-	EvHistory  *history;
-	
+
 	GdkWindow *bin_window;
 
 	char *status;
 	char *find_status;
-	
+
 	int scroll_x;
 	int scroll_y;
 
 	gboolean pressed_button;
 	gboolean has_selection;
-	GdkRectangle selection;
+	GdkPoint selection_start;
+	EvRectangle selection;
 	EvViewCursor cursor;
 
 	GtkAdjustment *hadjustment;
 	GtkAdjustment *vadjustment;
 
-        GArray *find_results;
-	int results_on_this_page;
-	int next_page_with_result;
-	double find_percent_complete;
+	EvPageCache *page_cache;
+	EvPixbufCache *pixbuf_cache;
+
+	gint current_page;
+	EvJobRender *current_job;
+
+	int find_page;
+	int find_result;
+	int spacing;
 
 	double scale;
+	int width;
+	int height;
+	GtkBorder border;
+	gboolean show_border;
 };
 
 struct _EvViewClass {
@@ -100,27 +127,24 @@ struct _EvViewClass {
 	void    (*scroll_view)		  (EvView         *view,
 					   GtkScrollType   scroll,
 					   gboolean        horizontal);
-	
-	/* Should this be notify::page? */
-	void	(*page_changed)           (EvView         *view);
+
 };
 
-static guint page_changed_signal = 0;
 
 static void ev_view_set_scroll_adjustments (EvView         *view,
 					    GtkAdjustment  *hadjustment,
 					    GtkAdjustment  *vadjustment);
-    
+
 G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET)
 
-/*** Helper functions ***/       
-     
+/*** Helper functions ***/
+
 static void
 view_update_adjustments (EvView *view)
 {
 	int old_x = view->scroll_x;
 	int old_y = view->scroll_y;
-  
+
 	if (view->hadjustment)
 		view->scroll_x = view->hadjustment->value;
 	else
@@ -130,7 +154,7 @@ view_update_adjustments (EvView *view)
 		view->scroll_y = view->vadjustment->value;
 	else
 		view->scroll_y = 0;
-  
+
 	if (GTK_WIDGET_REALIZED (view) &&
 	    (view->scroll_x != old_x || view->scroll_y != old_y)) {
 		gdk_window_move (view->bin_window, - view->scroll_x, - view->scroll_y);
@@ -160,7 +184,7 @@ view_set_adjustment_values (EvView         *view,
 
 	if (!adjustment)
 		return;
-  
+
 	adjustment->page_size = allocation;
 	adjustment->step_increment = allocation * 0.1;
 	adjustment->page_increment = allocation * 0.9;
@@ -177,24 +201,18 @@ view_set_adjustment_values (EvView         *view,
 		gtk_adjustment_value_changed (adjustment);
 }
 
-/*** Virtual function implementations ***/       
-     
+/*** Virtual function implementations ***/
+
 static void
 ev_view_finalize (GObject *object)
 {
 	EvView *view = EV_VIEW (object);
 
-	if (view->document)
-		g_object_unref (view->document);
-
-	if (view->history)
-		g_object_unref (view->history);
+	LOG ("Finalize");
 
-	ev_view_set_scroll_adjustments (view, NULL, NULL);
+	g_free (view->status);
+	g_free (view->find_status);
 
-        g_array_free (view->find_results, TRUE);
-        view->find_results = NULL;
-        
 	G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
 
@@ -203,31 +221,173 @@ ev_view_destroy (GtkObject *object)
 {
 	EvView *view = EV_VIEW (object);
 
+	if (view->document) {
+		g_object_unref (view->document);
+		view->document = NULL;
+	}
+	if (view->pixbuf_cache) {
+		g_object_unref (view->pixbuf_cache);
+		view->pixbuf_cache = NULL;
+	}
 	ev_view_set_scroll_adjustments (view, NULL, NULL);
-  
+
 	GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object);
 }
 
+static void
+ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset)
+{
+	EvDocument *document = view->document;
+	GtkWidget *widget = GTK_WIDGET (view);
+	int width, height, target_width, target_height;
+
+	g_return_if_fail (EV_IS_DOCUMENT (document));
+
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				view->scale,
+				&width, &height);
+
+	*x_offset = view->spacing;
+	*y_offset = view->spacing;
+	target_width = width + view->border.left +
+		       view->border.right + view->spacing * 2;
+	target_height = height + view->border.top +
+			view->border.bottom + view->spacing * 2;
+	*x_offset += MAX (0, (widget->allocation.width - target_width) / 2);
+	*y_offset += MAX (0, (widget->allocation.height - target_height) / 2);
+}
+
+static void
+view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, EvRectangle *doc_rect)
+{
+	int x_offset, y_offset;
+
+	ev_view_get_offsets (view, &x_offset, &y_offset);
+	doc_rect->x1 = (double) (view_rect->x - x_offset) / view->scale;
+	doc_rect->y1 = (double) (view_rect->y - y_offset) / view->scale;
+	doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale;
+	doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
+}
+
+static void
+doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_rect)
+{
+	int x_offset, y_offset;
+
+	ev_view_get_offsets (view, &x_offset, &y_offset);
+	view_rect->x = floor (doc_rect->x1 * view->scale) + x_offset;
+	view_rect->y = floor (doc_rect->y1 * view->scale) + y_offset;
+	view_rect->width = ceil (doc_rect->x2 * view->scale) + x_offset - view_rect->x;
+	view_rect->height = ceil (doc_rect->y2 * view->scale) + y_offset - view_rect->y;
+}
+
+static void
+compute_border (EvView *view, int width, int height, GtkBorder *border)
+{
+	if (view->show_border) {
+		ev_document_misc_get_page_border_size (width, height, border);
+	} else {
+		border->left = 0;
+		border->right = 0;
+		border->top = 0;
+		border->bottom = 0;
+	}
+}
+
+static void
+compute_zoom_factor (EvView *view)
+{
+	int doc_width, doc_height;
+	double scale, scale_w, scale_h;
+	GtkBorder border;
+
+	if (view->width <= 0 && view->height <= 0) {
+		return;
+	}
+
+	doc_width = doc_height = 0;
+	scale = scale_w = scale_h = 1.0;
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				1.0,
+				&doc_width,
+				&doc_height);
+
+	compute_border (view, doc_width, doc_height, &border);
+
+	if (doc_width == 0 || doc_height == 0) {
+		return;
+	}
+
+	if (view->width >= 0) {
+		int target_width;
+
+		target_width = view->width - (view->spacing * 2 + view->border.left +
+					      view->border.right);
+		scale = scale_w = (double)target_width / doc_width;
+	}
+
+	if (view->height >= 0) {
+		int target_height;
+
+		target_height = view->height - (view->spacing * 2 + view->border.top +
+						view->border.bottom);
+		scale = scale_h = (double)target_height / doc_height;
+	}
+
+	if (view->width >= 0 && view->height >= 0) {
+		scale = (scale_w < scale_h) ? scale_w : scale_h;
+	}
+
+	view->scale = scale;
+}
+
+/* Called by size_request to make sure we have appropriate jobs running.
+ */
 static void
 ev_view_size_request (GtkWidget      *widget,
 		      GtkRequisition *requisition)
 {
 	EvView *view = EV_VIEW (widget);
+	gint width, height;
 
-	if (GTK_WIDGET_REALIZED (widget)) {
-		if (view->document) {
-			ev_document_get_page_size (view->document,
-						   &requisition->width,
-						   &requisition->height);
-		} else {
-			requisition->width = 10;
-			requisition->height = 10;
-		}
+	if (!GTK_WIDGET_REALIZED (widget))
+		return;
+
+	if (!view->document) {
+		requisition->width = 1;
+		requisition->height = 1;
+		return;
+	}
+
+	compute_zoom_factor (view);
+
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				view->scale,
+				&width, &height);
 
-		requisition->width += 2;
-		requisition->height += 2;
+	compute_border (view, width, height, &(view->border));
+
+	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
+					view->current_page,
+					view->current_page,
+					view->scale);
+
+	if (view->width >= 0) {
+		requisition->width = 0;
+	} else {
+		requisition->width = width + view->border.left +
+				     view->border.right + view->spacing * 2;
+	}
+
+	if (view->height >= 0) {
+		requisition->height = 0;
+	} else {
+		requisition->height = height + view->border.top +
+				      view->border.bottom + view->spacing * 2;
 	}
-  
 }
 
 static void
@@ -255,18 +415,19 @@ ev_view_realize (GtkWidget *widget)
 	GdkWindowAttr attributes;
 
 	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  
+
+
 	attributes.window_type = GDK_WINDOW_CHILD;
 	attributes.wclass = GDK_INPUT_OUTPUT;
 	attributes.visual = gtk_widget_get_visual (widget);
 	attributes.colormap = gtk_widget_get_colormap (widget);
-  
+
 	attributes.x = widget->allocation.x;
 	attributes.y = widget->allocation.y;
 	attributes.width = widget->allocation.width;
 	attributes.height = widget->allocation.height;
 	attributes.event_mask = 0;
-  
+
 	widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
 					 &attributes,
 					 GDK_WA_X | GDK_WA_Y |
@@ -274,7 +435,8 @@ ev_view_realize (GtkWidget *widget)
 					 GDK_WA_VISUAL);
 	gdk_window_set_user_data (widget->window, widget);
 	widget->style = gtk_style_attach (widget->style, widget->window);
-  
+	gdk_window_set_background (widget->window, &widget->style->mid[widget->state]);
+
 	attributes.x = 0;
 	attributes.y = 0;
 	attributes.width = MAX (widget->allocation.width, widget->requisition.width);
@@ -284,8 +446,9 @@ ev_view_realize (GtkWidget *widget)
 				GDK_BUTTON_RELEASE_MASK |
 				GDK_SCROLL_MASK |
 				GDK_KEY_PRESS_MASK |
-				GDK_POINTER_MOTION_MASK;
-  
+				GDK_POINTER_MOTION_MASK |
+		                GDK_LEAVE_NOTIFY_MASK;
+
 	view->bin_window = gdk_window_new (widget->window,
 					   &attributes,
 					   GDK_WA_X | GDK_WA_Y |
@@ -295,11 +458,9 @@ ev_view_realize (GtkWidget *widget)
 	gdk_window_show (view->bin_window);
 
 	widget->style = gtk_style_attach (widget->style, view->bin_window);
-	gtk_style_set_background (widget->style, view->bin_window, GTK_STATE_NORMAL);
+	gdk_window_set_background (view->bin_window, &widget->style->mid[widget->state]);
 
 	if (view->document) {
-		ev_document_set_target (view->document, view->bin_window);
-
 		/* We can't get page size without a target, so we have to
 		 * queue a size request at realization. Could be fixed
 		 * with EvDocument changes to allow setting a GdkScreen
@@ -314,9 +475,6 @@ ev_view_unrealize (GtkWidget *widget)
 {
 	EvView *view = EV_VIEW (widget);
 
-	if (view->document)
-		ev_document_set_target (view->document, NULL);
-
 	gdk_window_set_user_data (view->bin_window, NULL);
 	gdk_window_destroy (view->bin_window);
 	view->bin_window = NULL;
@@ -335,7 +493,8 @@ ev_gdk_color_to_rgb (const GdkColor *color)
 }
 
 static void
-draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
+draw_rubberband (GtkWidget *widget, GdkWindow *window,
+		 const GdkRectangle *rect, guchar alpha)
 {
 	GdkGC *gc;
 	GdkPixbuf *pixbuf;
@@ -343,7 +502,7 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
 	guint fill_color;
 
 	fill_color_gdk = gdk_color_copy (&GTK_WIDGET (widget)->style->base[GTK_STATE_SELECTED]);
-	fill_color = ev_gdk_color_to_rgb (fill_color_gdk) << 8 | 0x40;
+	fill_color = ev_gdk_color_to_rgb (fill_color_gdk) << 8 | alpha;
 
 	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
 				 rect->width, rect->height);
@@ -351,7 +510,7 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
 
 	gdk_draw_pixbuf (window, NULL, pixbuf,
 			 0, 0,
-			 rect->x,rect->y,
+			 rect->x, rect->y,
 			 rect->width, rect->height,
 			 GDK_RGB_DITHER_NONE,
 			 0, 0);
@@ -369,58 +528,110 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
 	gdk_color_free (fill_color_gdk);
 }
 
+static void
+highlight_find_results (EvView *view)
+{
+	EvDocumentFind *find;
+	int i, results = 0;
+
+	g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
+
+	find = EV_DOCUMENT_FIND (view->document);
+
+	g_mutex_lock (EV_DOC_MUTEX);
+	results = ev_document_find_get_n_results (find, view->current_page);
+	g_mutex_unlock (EV_DOC_MUTEX);
+
+	for (i = 0; i < results; i++) {
+		EvRectangle rectangle;
+		GdkRectangle view_rectangle;
+		guchar alpha;
+
+		alpha = (i == view->find_result) ? 0x90 : 0x20;
+		g_mutex_lock (EV_DOC_MUTEX);
+		ev_document_find_get_result (find, view->current_page,
+					     i, &rectangle);
+		g_mutex_unlock (EV_DOC_MUTEX);
+		doc_rect_to_view_rect (view, &rectangle, &view_rectangle);
+		draw_rubberband (GTK_WIDGET (view), view->bin_window,
+				 &view_rectangle, alpha);
+        }
+}
+
+
 static void
 expose_bin_window (GtkWidget      *widget,
 		   GdkEventExpose *event)
 {
 	EvView *view = EV_VIEW (widget);
-        int i, current_page;
+	gint width, height;
+	GdkRectangle area;
 	int x_offset, y_offset;
-        const EvFindResult *results;
+	GdkPixbuf *scaled_image;
+	GdkPixbuf *current_pixbuf;
 
 	if (view->document == NULL)
 		return;
 
-	x_offset = MAX (0, (widget->allocation.width -
-			    widget->requisition.width) / 2);
-	y_offset = MAX (0, (widget->allocation.height -
-			    widget->requisition.height) / 2);
-	gdk_draw_rectangle (view->bin_window,
-                            widget->style->black_gc,
-                            FALSE,
-                            x_offset,
-			    y_offset,
-                            widget->requisition.width - 1,
-			    widget->requisition.height - 1);
-
-	ev_document_set_page_offset (view->document,
-				     x_offset + 1,
-				     y_offset + 1);
-
-	ev_document_render (view->document,
-			    event->area.x, event->area.y,
-			    event->area.width, event->area.height);
-
-        results = (EvFindResult*) view->find_results->data;
-	current_page = ev_document_get_page (view->document);
-        i = 0;
-        while (i < view->find_results->len) {
-#if 0
-                g_printerr ("highlighting result %d page %d at %d,%d %dx%d\n",
-                            i, results[i].page_num,
-                            results[i].highlight_area.x,
-                            results[i].highlight_area.y,
-                            results[i].highlight_area.width,
-                            results[i].highlight_area.height);
-#endif
-		if (results[i].page_num == current_page)
-			draw_rubberband (widget, view->bin_window,
-					 &results[i].highlight_area);
-                ++i;
-        }
+	ev_view_get_offsets (view, &x_offset, &y_offset);
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				view->scale,
+				&width, &height);
+
+	/* Paint the frame */
+	area.x = x_offset;
+	area.y = y_offset;
+	area.width = width + view->border.left + view->border.right;
+	area.height = height + view->border.top + view->border.bottom;
+
+	if (view->show_border) {
+		ev_document_misc_paint_one_page (view->bin_window, widget, &area,
+						 &(view->border));
+	}
+
+	/* Render the document itself */
+	LOG ("Render area %d %d %d %d - Offset %d %d",
+	     event->area.x, event->area.y,
+             event->area.width, event->area.height,
+	     x_offset, y_offset);
+
+	current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, view->current_page);
+
+	if (current_pixbuf == NULL)
+		scaled_image = NULL;
+	else if (width == gdk_pixbuf_get_width (current_pixbuf) &&
+		 height == gdk_pixbuf_get_height (current_pixbuf))
+		scaled_image = g_object_ref (current_pixbuf);
+	else
+		scaled_image = gdk_pixbuf_scale_simple (current_pixbuf,
+							width, height,
+							GDK_INTERP_NEAREST);
+	if (scaled_image) {
+		gdk_draw_pixbuf (view->bin_window,
+				 GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
+				 scaled_image,
+				 0, 0,
+				 area.x + view->border.left,
+				 area.y + view->border.top,
+				 width, height,
+				 GDK_RGB_DITHER_NORMAL,
+				 0, 0);
+		g_object_unref (scaled_image);
+	}
+
+	if (EV_IS_DOCUMENT_FIND (view->document)) {
+		highlight_find_results (view);
+	}
 
 	if (view->has_selection) {
-		draw_rubberband (widget, view->bin_window, &view->selection);
+		GdkRectangle rubberband;
+
+		doc_rect_to_view_rect (view, &view->selection, &rubberband);
+		if (rubberband.width > 0 && rubberband.height > 0) {
+			draw_rubberband (widget, view->bin_window,
+					 &rubberband, 0x40);
+		}
 	}
 }
 
@@ -442,13 +653,25 @@ void
 ev_view_select_all (EvView *ev_view)
 {
 	GtkWidget *widget = GTK_WIDGET (ev_view);
+	GdkRectangle selection;
+	int width, height;
+	int x_offset, y_offset;
 
 	g_return_if_fail (EV_IS_VIEW (ev_view));
 
+
+	ev_view_get_offsets (ev_view, &x_offset, &y_offset);
+	ev_page_cache_get_size (ev_view->page_cache,
+				ev_view->current_page,
+				ev_view->scale,
+				&width, &height);
+
 	ev_view->has_selection = TRUE;
-	ev_view->selection.x = ev_view->selection.y = 0;
-	ev_view->selection.width = widget->requisition.width;
-	ev_view->selection.height = widget->requisition.height;
+	selection.x = x_offset + ev_view->border.left;
+        selection.y = y_offset + ev_view->border.top;
+	selection.width = width;
+	selection.height = height;
+	view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection);
 
 	gtk_widget_queue_draw (widget);
 }
@@ -459,13 +682,32 @@ ev_view_copy (EvView *ev_view)
 	GtkClipboard *clipboard;
 	char *text;
 
-	text = ev_document_get_text (ev_view->document, &ev_view->selection);
+	if (!ev_document_can_get_text (ev_view->document)) {
+		return;
+	}
+
+	g_mutex_lock (EV_DOC_MUTEX);
+	text = ev_document_get_text (ev_view->document,
+				     ev_view->current_page,
+				     &ev_view->selection);
+	g_mutex_unlock (EV_DOC_MUTEX);
+
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
 					      GDK_SELECTION_CLIPBOARD);
 	gtk_clipboard_set_text (clipboard, text, -1);
 	g_free (text);
 }
 
+void
+ev_view_set_show_border (EvView *view, gboolean show_border)
+{
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	view->show_border = show_border;
+
+	gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
 static void
 ev_view_primary_get_cb (GtkClipboard     *clipboard,
 			GtkSelectionData *selection_data,
@@ -475,7 +717,15 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
 	EvView *ev_view = EV_VIEW (data);
 	char *text;
 
-	text = ev_document_get_text (ev_view->document, &ev_view->selection);
+	if (!ev_document_can_get_text (ev_view->document)) {
+		return;
+	}
+
+	g_mutex_lock (EV_DOC_MUTEX);
+	text = ev_document_get_text (ev_view->document,
+				     ev_view->current_page,
+				     &ev_view->selection);
+	g_mutex_unlock (EV_DOC_MUTEX);
 	gtk_selection_data_set_text (selection_data, text, -1);
 }
 
@@ -529,10 +779,8 @@ ev_view_button_press_event (GtkWidget      *widget,
 				gtk_widget_queue_draw (widget);
 			}
 
-			view->selection.x = event->x;
-			view->selection.y = event->y;
-			view->selection.width = 0;
-			view->selection.height = 0;
+			view->selection_start.x = event->x;
+			view->selection_start.y = event->y;
 			break;
 	}
 
@@ -540,27 +788,29 @@ ev_view_button_press_event (GtkWidget      *widget,
 }
 
 static char *
-status_message_from_link (EvLink *link)
+status_message_from_link (EvView *view, EvLink *link)
 {
 	EvLinkType type;
-	char *msg;
-	int page;
+	char *msg = NULL;
+	char *page_label;
 
 	type = ev_link_get_link_type (link);
-	
+
 	switch (type) {
 		case EV_LINK_TYPE_TITLE:
-			msg = g_strdup (ev_link_get_title (link));
+			if (ev_link_get_title (link))
+				msg = g_strdup (ev_link_get_title (link));
 			break;
 		case EV_LINK_TYPE_PAGE:
-			page = ev_link_get_page (link);
-			msg = g_strdup_printf (_("Go to page %d"), page);
+			page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link));
+			msg = g_strdup_printf (_("Go to page %s"), page_label);
+			g_free (page_label);
 			break;
 		case EV_LINK_TYPE_EXTERNAL_URI:
 			msg = g_strdup (ev_link_get_uri (link));
 			break;
 		default:
-			msg = NULL;
+			break;
 	}
 
 	return msg;
@@ -582,12 +832,24 @@ static void
 ev_view_set_find_status (EvView *view, const char *message)
 {
 	g_return_if_fail (EV_IS_VIEW (view));
-	
+
 	g_free (view->find_status);
 	view->find_status = g_strdup (message);
 	g_object_notify (G_OBJECT (view), "find-status");
 }
 
+static GdkCursor *
+ev_view_create_invisible_cursor(void)
+{
+       GdkBitmap *empty;
+       GdkColor black = { 0, 0, 0, 0 };
+       static char bits[] = { 0x00 };
+
+       empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
+
+       return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0);
+}
+
 static void
 ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
 {
@@ -613,6 +875,10 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
 		case EV_VIEW_CURSOR_WAIT:
 			cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
 			break;
+                case EV_VIEW_CURSOR_HIDDEN:
+                        cursor = ev_view_create_invisible_cursor ();
+                        break;
+
 	}
 
 	if (cursor) {
@@ -622,6 +888,54 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
 	}
 }
 
+
+static void
+find_page_at_location (EvView  *view,
+		       gdouble  x,
+		       gdouble  y,
+		       gint    *page,
+		       gint    *x_offset,
+		       gint    *y_offset)
+{
+	gint width, height;
+
+	ev_page_cache_get_size (view->page_cache,
+				view->current_page,
+				view->scale,
+				&width, &height);
+
+	x -= (view->border.left + view->spacing);
+	y -= (view->border.top + view->spacing);
+
+	if ((x < 0) || (y < 0) ||
+	    (x >= width) || (y >= height)) {
+		*page = -1;
+		return;
+	}
+	*page = view->current_page;
+	*x_offset = (gint) x;
+	*y_offset = (gint) y;
+}
+
+static EvLink *
+get_link_at_location (EvView  *view,
+		      gdouble  x,
+		      gdouble  y)
+{
+	gint page;
+	gint x_offset, y_offset;
+	GList *link_mapping;
+
+	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
+	if (page == -1)
+		return NULL;
+
+	link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page);
+
+	return ev_link_mapping_find (link_mapping, x_offset /view->scale, y_offset /view->scale);
+}
+
+
 static gboolean
 ev_view_motion_notify_event (GtkWidget      *widget,
 			     GdkEventMotion *event)
@@ -629,24 +943,27 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 	EvView *view = EV_VIEW (widget);
 
 	if (view->pressed_button > 0) {
+		GdkRectangle selection;
+
 		view->has_selection = TRUE;
-		view->selection.x = MIN (view->selection.x, event->x);
-		view->selection.y = MIN (view->selection.y, event->y);
-		view->selection.width = ABS (view->selection.x - event->x) + 1;
-		view->selection.height = ABS (view->selection.y - event->y) + 1;
+		selection.x = MIN (view->selection_start.x, event->x);
+		selection.y = MIN (view->selection_start.y, event->y);
+		selection.width = ABS (view->selection_start.x - event->x) + 1;
+		selection.height = ABS (view->selection_start.y - event->y) + 1;
+		view_rect_to_doc_rect (view, &selection, &view->selection);
+
+		gtk_widget_queue_draw (widget);
 	} else if (view->document) {
 		EvLink *link;
 
-		link = ev_document_get_link (view->document, event->x, event->y);
+		link = get_link_at_location (view, event->x, event->y);
                 if (link) {
 			char *msg;
 
-			msg = status_message_from_link (link);
+			msg = status_message_from_link (view, link);
 			ev_view_set_status (view, msg);
 			ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
 			g_free (msg);
-
-                        g_object_unref (link);
 		} else {
 			ev_view_set_status (view, NULL);
 			if (view->cursor == EV_VIEW_CURSOR_LINK) {
@@ -655,11 +972,34 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 		}
 	}
 
-	gtk_widget_queue_draw (widget);
-
 	return TRUE;
 }
 
+/* FIXME: standardize this sometime */
+static void
+go_to_link (EvView *view, EvLink *link)
+{
+	EvLinkType type;
+	const char *uri;
+	int page;
+
+	type = ev_link_get_link_type (link);
+
+	switch (type) {
+		case EV_LINK_TYPE_TITLE:
+			break;
+		case EV_LINK_TYPE_PAGE:
+			page = ev_link_get_page (link);
+			ev_page_cache_set_current_page (view->page_cache, page);
+			break;
+		case EV_LINK_TYPE_EXTERNAL_URI:
+			uri = ev_link_get_uri (link);
+			gnome_vfs_url_show (uri);
+			break;
+	}
+}
+
+
 static gboolean
 ev_view_button_release_event (GtkWidget      *widget,
 			      GdkEventButton *event)
@@ -673,12 +1013,9 @@ ev_view_button_release_event (GtkWidget      *widget,
 	} else if (view->document) {
 		EvLink *link;
 
-		link = ev_document_get_link (view->document,
-					     event->x,
-					     event->y);
+		link = get_link_at_location (view, event->x, event->y);
 		if (link) {
-			ev_view_go_to_link (view, link);
-			g_object_unref (link);
+			go_to_link (view, link);
 		}
 	}
 
@@ -703,7 +1040,7 @@ set_scroll_adjustment (EvView *view,
 		to_set = &view->hadjustment;
 	else
 		to_set = &view->vadjustment;
-  
+
 	if (*to_set != adjustment) {
 		if (*to_set) {
 			g_signal_handlers_disconnect_by_func (*to_set,
@@ -735,13 +1072,13 @@ ev_view_set_scroll_adjustments (EvView *view,
 }
 
 static void
-add_scroll_binding (GtkBindingSet  *binding_set,
-		    guint           keyval,
-		    GtkScrollType   scroll,
-		    gboolean        horizontal)
+add_scroll_binding_keypad (GtkBindingSet  *binding_set,
+    			   guint           keyval,
+    			   GtkScrollType   scroll,
+			   gboolean        horizontal)
 {
   guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
-  
+
   gtk_binding_entry_add_signal (binding_set, keyval, 0,
                                 "scroll_view", 2,
                                 GTK_TYPE_SCROLL_TYPE, scroll,
@@ -752,21 +1089,94 @@ add_scroll_binding (GtkBindingSet  *binding_set,
 				G_TYPE_BOOLEAN, horizontal);
 }
 
+static void
+add_scroll_binding_shifted (GtkBindingSet  *binding_set,
+    			    guint           keyval,
+    			    GtkScrollType   scroll_normal,
+    			    GtkScrollType   scroll_shifted,
+			    gboolean        horizontal)
+{
+  gtk_binding_entry_add_signal (binding_set, keyval, 0,
+                                "scroll_view", 2,
+                                GTK_TYPE_SCROLL_TYPE, scroll_normal,
+				G_TYPE_BOOLEAN, horizontal);
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+                                "scroll_view", 2,
+                                GTK_TYPE_SCROLL_TYPE, scroll_shifted,
+				G_TYPE_BOOLEAN, horizontal);
+}
+
+static void
+ev_view_jump (EvView        *view,
+	      GtkScrollType  scroll)
+{
+	GtkAdjustment *adjustment;
+	double value, increment;
+	gboolean first_page = FALSE;
+	gboolean last_page = FALSE;
+
+	/* Assign values for increment and vertical adjustment */
+	adjustment = view->vadjustment;
+	increment = adjustment->page_size * 0.75;
+	value = adjustment->value;
+
+	/* Assign boolean for first and last page */
+	if (view->current_page == 0)
+		first_page = TRUE;
+	if (view->current_page == ev_page_cache_get_n_pages (view->page_cache) - 1)
+		last_page = TRUE;
+
+	switch (scroll) {
+		case EV_SCROLL_PAGE_BACKWARD:
+			/* Do not jump backwards if at the first page */
+			if (value == (adjustment->lower) && first_page) {
+				/* Do nothing */
+				/* At the top of a page, assign the upper bound limit of previous page */
+			} else if (value == (adjustment->lower)) {
+				value = adjustment->upper - adjustment->page_size;
+				ev_page_cache_set_current_page (view->page_cache, view->current_page - 1);
+				/* Jump to the top */
+			} else {
+				value = MAX (value - increment, adjustment->lower);
+			}
+			break;
+		case EV_SCROLL_PAGE_FORWARD:
+			/* Do not jump forward if at the last page */
+			if (value == (adjustment->upper - adjustment->page_size) && last_page) {
+				/* Do nothing */
+			/* At the bottom of a page, assign the lower bound limit of next page */
+			} else if (value == (adjustment->upper - adjustment->page_size)) {
+				value = 0;
+				ev_page_cache_set_current_page (view->page_cache, view->current_page + 1);
+			/* Jump to the bottom */
+			} else {
+				value = MIN (value + increment, adjustment->upper - adjustment->page_size);
+			}
+			break;
+		default:
+			break;
+	}
+
+	gtk_adjustment_set_value (adjustment, value);
+}
+
 static void
 ev_view_scroll_view (EvView *view,
 		     GtkScrollType scroll,
 		     gboolean horizontal)
 {
 	if (scroll == GTK_SCROLL_PAGE_BACKWARD) {
-		ev_view_set_page (view, ev_view_get_page (view) - 1);
+		ev_page_cache_prev_page (view->page_cache);
 	} else if (scroll == GTK_SCROLL_PAGE_FORWARD) {
-		ev_view_set_page (view, ev_view_get_page (view) + 1);
+		ev_page_cache_next_page (view->page_cache);
+	} else if (scroll == EV_SCROLL_PAGE_BACKWARD || scroll == EV_SCROLL_PAGE_FORWARD) {
+ 		ev_view_jump (view, scroll);
 	} else {
 		GtkAdjustment *adjustment;
 		double value;
 
 		if (horizontal) {
-			adjustment = view->hadjustment;	
+			adjustment = view->hadjustment;
 		} else {
 			adjustment = view->vadjustment;
 		}
@@ -774,11 +1184,11 @@ ev_view_scroll_view (EvView *view,
 		value = adjustment->value;
 
 		switch (scroll) {
-			case GTK_SCROLL_STEP_BACKWARD:	
-				value -= adjustment->step_increment; 
+			case GTK_SCROLL_STEP_BACKWARD:
+				value -= adjustment->step_increment;
 				break;
 			case GTK_SCROLL_STEP_FORWARD:
-				value += adjustment->step_increment; 
+				value += adjustment->step_increment;
 				break;
 			default:
 				break;
@@ -859,13 +1269,6 @@ ev_view_class_init (EvViewClass *class)
 								     G_TYPE_NONE, 2,
 								     GTK_TYPE_ADJUSTMENT,
 								     GTK_TYPE_ADJUSTMENT);
-	page_changed_signal = g_signal_new ("page-changed",
-					    G_OBJECT_CLASS_TYPE (object_class),
-					    G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-					    G_STRUCT_OFFSET (EvViewClass, page_changed),
-					    NULL, NULL,
-					    ev_marshal_VOID__NONE,
-					    G_TYPE_NONE, 0);
 
 	g_signal_new ("scroll_view",
 		      G_TYPE_FROM_CLASS (object_class),
@@ -886,7 +1289,7 @@ ev_view_class_init (EvViewClass *class)
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class,
-					 PROP_STATUS,
+					 PROP_FIND_STATUS,
 					 g_param_spec_string ("find-status",
 							      "Find Status Message",
 							      "The find status message",
@@ -895,13 +1298,29 @@ ev_view_class_init (EvViewClass *class)
 
 	binding_set = gtk_binding_set_by_class (class);
 
-	add_scroll_binding (binding_set, GDK_Left,  GTK_SCROLL_STEP_BACKWARD, TRUE);
-	add_scroll_binding (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD,  TRUE);
-	add_scroll_binding (binding_set, GDK_Up,    GTK_SCROLL_STEP_BACKWARD, FALSE);
-	add_scroll_binding (binding_set, GDK_Down,  GTK_SCROLL_STEP_FORWARD,  FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Left,  GTK_SCROLL_STEP_BACKWARD, TRUE);
+	add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD,  TRUE);
+	add_scroll_binding_keypad (binding_set, GDK_Up,    GTK_SCROLL_STEP_BACKWARD, FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Down,  GTK_SCROLL_STEP_FORWARD,  FALSE);
+
+	add_scroll_binding_keypad (binding_set, GDK_Page_Up,   GTK_SCROLL_PAGE_BACKWARD, FALSE);
+	add_scroll_binding_keypad (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD,  FALSE);
 
-	add_scroll_binding (binding_set, GDK_Page_Up,   GTK_SCROLL_PAGE_BACKWARD, FALSE);
-	add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD,  FALSE);
+	add_scroll_binding_shifted (binding_set, GDK_space, EV_SCROLL_PAGE_FORWARD, EV_SCROLL_PAGE_BACKWARD, FALSE);
+	add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE);
+}
+
+void
+ev_view_set_spacing (EvView     *view,
+		     int         spacing)
+{
+	g_return_if_fail (EV_IS_VIEW (view));
+
+	view->spacing = spacing;
+
+	if (view->document) {
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	}
 }
 
 static void
@@ -909,357 +1328,255 @@ ev_view_init (EvView *view)
 {
 	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
 
+	view->spacing = 0;
 	view->scale = 1.0;
+	view->current_page = 0;
 	view->pressed_button = -1;
 	view->cursor = EV_VIEW_CURSOR_NORMAL;
-	
-        view->find_results = g_array_new (FALSE,
-                                          FALSE,
-                                          sizeof (EvFindResult));
-	view->results_on_this_page = 0;
-	view->next_page_with_result = 0;
+	view->show_border = TRUE;
 }
 
-static char *
-ev_view_get_find_status_message (EvView *view)
+static void
+update_find_status_message (EvView *view)
 {
-	if (view->find_results->len == 0) {
-		if (view->find_percent_complete >= (1.0 - 1e-10)) {
-			return g_strdup (_("Not found"));
-		} else {
-			return g_strdup_printf (_("%3d%% remaining to search"),
-						(int) ((1.0 - view->find_percent_complete) * 100));
-		}
-	} else if (view->results_on_this_page == 0) {
-		g_assert (view->next_page_with_result != 0);
-		return g_strdup_printf (_("Found on page %d"),
-					view->next_page_with_result);
+	char *message;
+
+//	g_mutex_lock (EV_DOC_MUTEX);
+	if (view->current_page == view->find_page) {
+		int results;
+
+//		g_mutex_lock (EV_DOC_MUTEX);
+		results = ev_document_find_get_n_results
+				(EV_DOCUMENT_FIND (view->document),
+				 view->current_page);
+//		g_mutex_unlock (EV_DOC_MUTEX);
+		/* TRANS: Sometimes this could be better translated as
+		   "%d hit(s) on this page".  Therefore this string
+		   contains plural cases. */
+		message = g_strdup_printf (ngettext ("%d found on this page",
+						     "%d found on this page",
+						     results),
+					   results);
 	} else {
-		return g_strdup_printf (_("%d found on this page"),
-					view->results_on_this_page);
-	}
-}
-
-static void
-update_find_results (EvView *view)
-{
-	const EvFindResult *results;
-	int i;
-	int on_this_page;
-	int next_page_with_result;
-	int earliest_page_with_result;
-	int current_page;
-	gboolean counts_changed;
-	
-	results = (EvFindResult*) view->find_results->data;
-	current_page = ev_document_get_page (view->document);
-	next_page_with_result = 0;
-	on_this_page = 0;
-	earliest_page_with_result = 0;
-	
-	i = 0;
-	while (i < view->find_results->len) {
-		if (results[i].page_num == current_page) {
-			++on_this_page;
+		double percent;
+
+		g_mutex_lock (EV_DOC_MUTEX);
+		percent = ev_document_find_get_progress
+				(EV_DOCUMENT_FIND (view->document));
+		g_mutex_unlock (EV_DOC_MUTEX);
+		if (percent >= (1.0 - 1e-10)) {
+			message = g_strdup (_("Not found"));
 		} else {
-			int delta = results[i].page_num - current_page;
-			
-			if (delta > 0 && /* result on later page */
-			    (next_page_with_result == 0 ||
-			     results[i].page_num < next_page_with_result))
-				next_page_with_result = results[i].page_num;
-
-			if (delta < 0 && /* result on a previous page */
-			    (earliest_page_with_result == 0 ||
-			     results[i].page_num < earliest_page_with_result))
-				earliest_page_with_result = results[i].page_num;
+			message = g_strdup_printf (_("%3d%% remaining to search"),
+						   (int) ((1.0 - percent) * 100));
 		}
-		++i;
-	}
 
-	/* If earliest page is just the current page, there is no earliest page */
-	if (earliest_page_with_result == current_page)
-		earliest_page_with_result = 0;
-	
-	/* If no next page, then wrap and the wrapped page is the next page */
-	if (next_page_with_result == 0)
-		next_page_with_result = earliest_page_with_result;
-
-	counts_changed = FALSE;
-	if (on_this_page != view->results_on_this_page ||
-	    next_page_with_result != view->next_page_with_result) {
-		view->results_on_this_page = on_this_page;
-		view->next_page_with_result = next_page_with_result;
-		counts_changed = TRUE;
 	}
+//	g_mutex_unlock (EV_DOC_MUTEX);
 
-	if (counts_changed ||
-	    view->find_results->len == 0) {
-		char *message;
-
-		message = ev_view_get_find_status_message (view);
-		ev_view_set_find_status (view, message);
-		g_free (message);
-	}
+	ev_view_set_find_status (view, message);
+//	g_free (message);
 }
 
-static void
-found_results_callback (EvDocument         *document,
-                        const EvFindResult *results,
-                        int                 n_results,
-                        double              percent_complete,
-                        void               *data)
-{
-  EvView *view = EV_VIEW (data);
-  
-  g_array_set_size (view->find_results, 0);
-
-  if (n_results > 0)
-          g_array_append_vals (view->find_results,
-                               results, n_results);
-
-#if 0
-  {
-	  int i;
-
-	  g_printerr ("%d results %d%%: ", n_results,
-		      (int) (percent_complete * 100));
-	  i = 0;
-	  while (i < n_results) {
-		  g_printerr ("%d ", results[i].page_num);
-		  ++i;
-	  }
-	  g_printerr ("\n");
-  }
-#endif
-
-  view->find_percent_complete = percent_complete;
-  update_find_results (view);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (view));
-}
+#define MARGIN 5
 
 static void
-document_changed_callback (EvDocument *document,
-			   EvView     *view)
+ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect)
 {
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-	ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-}
+	GtkWidget *widget = GTK_WIDGET (view);
+	GtkAdjustment *adjustment;
+	int value;
+
+	adjustment = view->vadjustment;
+
+	if (rect->y < adjustment->value) {
+		value = MAX (adjustment->lower, rect->y - MARGIN);
+		gtk_adjustment_set_value (view->vadjustment, value);
+	} else if (rect->y + rect->height >
+		   adjustment->value + widget->allocation.height) {
+		value = MIN (adjustment->upper, rect->y + rect->height -
+			     widget->allocation.height + MARGIN);
+		gtk_adjustment_set_value (view->vadjustment, value);
+	}
 
-/*** Public API ***/       
-     
-GtkWidget*
-ev_view_new (void)
-{
-	return g_object_new (EV_TYPE_VIEW, NULL);
+	adjustment = view->hadjustment;
+
+	if (rect->x < adjustment->value) {
+		value = MAX (adjustment->lower, rect->x - MARGIN);
+		gtk_adjustment_set_value (view->hadjustment, value);
+	} else if (rect->x + rect->height >
+		   adjustment->value + widget->allocation.width) {
+		value = MIN (adjustment->upper, rect->x + rect->width -
+			     widget->allocation.width + MARGIN);
+		gtk_adjustment_set_value (view->hadjustment, value);
+	}
 }
 
-void
-ev_view_set_document (EvView     *view,
-		      EvDocument *document)
+static void
+jump_to_find_result (EvView *view)
 {
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	if (document != view->document) {
-		if (view->document) {
-                        g_signal_handlers_disconnect_by_func (view->document,
-                                                              found_results_callback,
-                                                              view);
-                        g_array_set_size (view->find_results, 0);
-			view->results_on_this_page = 0;
-			view->next_page_with_result = 0;
-
-			g_object_unref (view->document);
-                }
-
-		view->document = document;
-
-		if (view->document) {
-			g_object_ref (view->document);
-			if (EV_IS_DOCUMENT_FIND (view->document))
-				g_signal_connect (view->document,
-						  "found",
-						  G_CALLBACK (found_results_callback),
-						  view);
-			g_signal_connect (view->document,
-					  "changed",
-					  G_CALLBACK (document_changed_callback),
-					  view);
-                }
-
-		if (GTK_WIDGET_REALIZED (view))
-			ev_document_set_target (view->document, view->bin_window);
-		
-		gtk_widget_queue_resize (GTK_WIDGET (view));
-		
-		g_signal_emit (view, page_changed_signal, 0);
+	EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+	EvRectangle rect;
+	GdkRectangle view_rect;
+	int n_results;
+
+	g_mutex_lock (EV_DOC_MUTEX);
+	n_results = ev_document_find_get_n_results (find, view->current_page);
+	g_mutex_unlock (EV_DOC_MUTEX);
+
+	if (n_results > view->find_result) {
+		g_mutex_lock (EV_DOC_MUTEX);
+		ev_document_find_get_result
+			(find, view->current_page, view->find_result, &rect);
+		g_mutex_unlock (EV_DOC_MUTEX);
+
+		doc_rect_to_view_rect (view, &rect, &view_rect);
+		ensure_rectangle_is_visible (view, &view_rect);
 	}
 }
 
 static void
-set_document_page (EvView *view, int page)
+jump_to_find_page (EvView *view)
 {
-	if (view->document) {
-		int old_page = ev_document_get_page (view->document);
+	int n_pages, i;
 
-		if (old_page != page) {
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
-			ev_document_set_page (view->document, page);
-		}
+	n_pages = ev_page_cache_get_n_pages (view->page_cache);
 
-		if (old_page != ev_document_get_page (view->document)) {
-			g_signal_emit (view, page_changed_signal, 0);
+	for (i = 0; i < n_pages; i++) {
+		int has_results;
+		int page;
 
-			view->find_percent_complete = 0.0;
-			update_find_results (view);	
+		page = i + view->find_page;
+		if (page >= n_pages) {
+			page = page - n_pages;
 		}
-	}
-}
 
-static void
-go_to_link (EvView *view, EvLink *link)
-{
-	EvLinkType type;
-	const char *uri;
-	int page;
-
-	type = ev_link_get_link_type (link);
-	
-	switch (type) {
-		case EV_LINK_TYPE_TITLE:
+		//		g_mutex_lock (EV_DOC_MUTEX);
+		has_results = ev_document_find_page_has_results
+				(EV_DOCUMENT_FIND (view->document), page);
+		if (has_results == -1) {
+			view->find_page = page;
 			break;
-		case EV_LINK_TYPE_PAGE:
-			page = ev_link_get_page (link);
-			set_document_page (view, page);
-			break;
-		case EV_LINK_TYPE_EXTERNAL_URI:
-			uri = ev_link_get_uri (link);
-			gnome_vfs_url_show (uri);
+		} else if (has_results == 1) {
+			ev_page_cache_set_current_page (view->page_cache, page);
+			jump_to_find_result (view);
 			break;
+		}
 	}
 }
 
-void
-ev_view_go_to_link (EvView *view, EvLink *link)
+static void
+find_changed_cb (EvDocument *document, int page, EvView *view)
 {
-	EvLinkType type;
-
-	go_to_link (view, link);
+	jump_to_find_page (view);
+	jump_to_find_result (view);
+	update_find_status_message (view);
 
-	type = ev_link_get_link_type (link);
-	if (type == EV_LINK_TYPE_PAGE) {
-		ev_history_add_link (view->history, link);
-	}
+	if (view->current_page == page)
+		gtk_widget_queue_draw (GTK_WIDGET (view));
 }
+/*** Public API ***/
 
-static void
-go_to_index (EvView *view, int index)
+GtkWidget*
+ev_view_new (void)
 {
-	EvLink *link;
-	
-	link = ev_history_get_link_nth (view->history, index);
-	g_return_if_fail (link != NULL);
-
-	go_to_link (view, link);
+	return g_object_new (EV_TYPE_VIEW, NULL);
 }
 
-gboolean
-ev_view_can_go_back (EvView *view)
+static void
+job_finished_cb (EvPixbufCache *pixbuf_cache,
+		 EvView        *view)
 {
-	int index, n;
-
-	if (view->history == NULL) {
-		return FALSE;
-	}
-
-	index = ev_history_get_current_index (view->history);
-	n = ev_history_get_n_links (view->history);
-
-	if (n > 0) {
-		return index != MAX (0, index - 1);
-	} else {
-		return FALSE;
-	}
+	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
-void
-ev_view_go_back	(EvView	*view)
+
+static void
+page_changed_cb (EvPageCache *page_cache,
+		 int          new_page,
+		 EvView      *view)
 {
-	int index, n;
+	int old_page = view->current_page;
+	int old_width, old_height;
+	int new_width, new_height;
 
-	g_return_if_fail (EV_IS_HISTORY (view->history));
+	if (old_page == new_page)
+		return;
 
-	index = ev_history_get_current_index (view->history);
-	n = ev_history_get_n_links (view->history);
+	ev_page_cache_get_size (page_cache,
+				old_page,
+				view->scale,
+				&old_width, &old_height);
 
-	if (n > 0) {
-		index = MAX (0, index - 1);
-		ev_history_set_current_index (view->history, index);
-	}
-}
+	view->current_page = new_page;
+	view->has_selection = FALSE;
 
-gboolean
-ev_view_can_go_forward (EvView *view)
-{
-	int index, n;
+	compute_zoom_factor (view);
 
-	if (view->history == NULL) {
-		return FALSE;
-	}
+	ev_page_cache_get_size (page_cache,
+				new_page,
+				view->scale,
+				&new_width, &new_height);
 
-	index = ev_history_get_current_index (view->history);
-	n = ev_history_get_n_links (view->history);
+	compute_border (view, new_width, new_height, &(view->border));
 
-	if (n > 0) {
-		return 	index != MIN (n - 1, index + 1);
-	} else {
-		return FALSE;
-	}
-}
-
-void
-ev_view_go_forward (EvView *view)
-{
-	int index, n;
+	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
+					view->current_page,
+					view->current_page,
+					view->scale);
 
-	g_return_if_fail (EV_IS_HISTORY (view->history));
+	if (new_width != old_width || new_height != old_height)
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	else
+		gtk_widget_queue_draw (GTK_WIDGET (view));
 
-	index = ev_history_get_current_index (view->history);
-	n = ev_history_get_n_links (view->history);
+	gtk_adjustment_set_value (view->vadjustment,
+				  view->vadjustment->lower);
 
-	if (n > 0) {
-		index = MIN (n - 1, index + 1);
-		ev_history_set_current_index (view->history, index);
+	if (EV_IS_DOCUMENT_FIND (view->document)) {
+		view->find_page = new_page;
+		view->find_result = 0;
+		update_find_status_message (view);
 	}
 }
 
-
 void
-ev_view_set_page (EvView *view,
-		  int     page)
+ev_view_set_document (EvView     *view,
+		      EvDocument *document)
 {
 	g_return_if_fail (EV_IS_VIEW (view));
-	g_return_if_fail (EV_IS_HISTORY (view->history));
 
-	set_document_page (view, page);
-	ev_history_add_page (view->history, page);
-}
+	if (document != view->document) {
+		if (view->document) {
+                        g_signal_handlers_disconnect_by_func (view->document,
+                                                              find_changed_cb,
+                                                              view);
+			g_object_unref (view->document);
+			view->page_cache = NULL;
 
-int
-ev_view_get_page (EvView *view)
-{
-	if (view->document)
-		return ev_document_get_page (view->document);
-	else
-		return 1;
-}
+                }
 
-#define ZOOM_IN_FACTOR  1.2
-#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
+		view->document = document;
+		view->find_page = 0;
+		view->find_result = 0;
 
-#define MIN_SCALE 0.05409
-#define MAX_SCALE 18.4884
+		if (view->document) {
+			g_object_ref (view->document);
+			if (EV_IS_DOCUMENT_FIND (view->document)) {
+				g_signal_connect (view->document,
+						  "find_changed",
+						  G_CALLBACK (find_changed_cb),
+						  view);
+			}
+			view->page_cache = ev_document_get_page_cache (view->document);
+			g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
+			view->pixbuf_cache = ev_pixbuf_cache_new (view->document);
+			g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
+                }
+
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	}
+}
 
 static void
 ev_view_zoom (EvView   *view,
@@ -1273,10 +1590,10 @@ ev_view_zoom (EvView   *view,
 	else
 		scale = factor;
 
-	view->scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
-
-	ev_document_set_scale (view->document, view->scale);
+	scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 
+	view->scale = scale;
+	view->width = view->height = -1;
 	gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
@@ -1293,90 +1610,123 @@ ev_view_zoom_out (EvView *view)
 }
 
 void
-ev_view_normal_size (EvView *view)
+ev_view_set_size (EvView     *view,
+		  int         width,
+		  int         height)
 {
-	ev_view_zoom (view, 1.0, FALSE);
+	if (!view->document) {
+		return;
+	}
+
+	if (width != view->width || height != view->height) {
+		view->width = width;
+		view->height = height;
+		gtk_widget_queue_resize (GTK_WIDGET (view));
+	}
 }
 
-void
-ev_view_best_fit (EvView *view)
+const char *
+ev_view_get_status (EvView *view)
 {
-	double scale;
-	int width, height;
+	g_return_val_if_fail (EV_IS_VIEW (view), NULL);
+
+	return view->status;
+}
+
+const char *
+ev_view_get_find_status (EvView *view)
+{
+	g_return_val_if_fail (EV_IS_VIEW (view), NULL);
 
-	width = height = 0;
-	ev_document_get_page_size (view->document, &width, &height);
+	return view->find_status;
+}
 
-	scale = 1.0;
-	if (width != 0 && height != 0) {
-		double scale_w, scale_h;
+gboolean
+ev_view_can_find_next (EvView *view)
+{
+	int n_results = 0;
 
-		scale_w = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
-		scale_h = (double)GTK_WIDGET (view)->allocation.height * view->scale / height;
+	if (EV_IS_DOCUMENT_FIND (view->document)) {
+		EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
 
-		scale = (scale_w < scale_h) ? scale_w : scale_h;
+		g_mutex_lock (EV_DOC_MUTEX);
+		n_results = ev_document_find_get_n_results (find, view->current_page);
+		g_mutex_unlock (EV_DOC_MUTEX);
 	}
 
-	ev_view_zoom (view, scale, FALSE);
+	return n_results > 0;
 }
 
 void
-ev_view_fit_width (EvView *view)
+ev_view_find_next (EvView *view)
 {
-	double scale = 1.0;
-	int width;
+	EvPageCache *page_cache;
+	int n_results, n_pages;
+	EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
 
-	width = 0;
-	ev_document_get_page_size (view->document, &width, NULL);
+	page_cache = ev_document_get_page_cache (view->document);
+	g_mutex_lock (EV_DOC_MUTEX);
+	n_results = ev_document_find_get_n_results (find, view->current_page);
+	g_mutex_unlock (EV_DOC_MUTEX);
 
-	scale = 1.0;
-	if (width != 0)
-		scale = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
+	n_pages = ev_page_cache_get_n_pages (page_cache);
 
-	ev_view_zoom (view, scale, FALSE);
-}
+	view->find_result++;
 
-static void
-history_index_changed_cb (EvHistory  *history,
-			  GParamSpec *pspec,
-			  EvView     *view)
-{
-	int index;
+	if (view->find_result >= n_results) {
+		view->find_result = 0;
+		view->find_page++;
+
+		if (view->find_page >= n_pages) {
+			view->find_page = 0;
+		}
 
-	index = ev_history_get_current_index (history);
-	go_to_index (view, index);
+		jump_to_find_page (view);
+	} else {
+		jump_to_find_result (view);
+		gtk_widget_queue_draw (GTK_WIDGET (view));
+	}
 }
 
 void
-ev_view_set_history (EvView     *view,
-		     EvHistory  *history)
+ev_view_find_previous (EvView *view)
 {
-	if (view->history) {
-		g_object_unref (view->history);
-	}
+	int n_results, n_pages;
+	EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+	EvPageCache *page_cache;
 
-	view->history = g_object_ref (history);
-	ev_history_add_page (view->history, ev_view_get_page (view));
+	page_cache = ev_document_get_page_cache (view->document);
 
-	g_signal_connect (view->history, "notify::index",
-			  G_CALLBACK (history_index_changed_cb),
-			  view);
-}
+	g_mutex_lock (EV_DOC_MUTEX);
+	n_results = ev_document_find_get_n_results (find, view->current_page);
+	g_mutex_unlock (EV_DOC_MUTEX);
 
-const char *
-ev_view_get_status (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), NULL);
+	n_pages = ev_page_cache_get_n_pages (page_cache);
 
-	return view->status;
-}
+	view->find_result--;
 
-const char *
-ev_view_get_find_status (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), NULL);
+	if (view->find_result < 0) {
+		view->find_result = 0;
+		view->find_page--;
 
-	return view->find_status;
-}
+		if (view->find_page < 0) {
+			view->find_page = n_pages - 1;
+		}
 
+		jump_to_find_page (view);
+	} else {
+		jump_to_find_result (view);
+		gtk_widget_queue_draw (GTK_WIDGET (view));
+	}
+}
+void
+ev_view_hide_cursor (EvView *view)
+{
+       ev_view_set_cursor (view, EV_VIEW_CURSOR_HIDDEN);
+}
 
+void
+ev_view_show_cursor (EvView *view)
+{
+       ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+}