]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-view.c
Fix crash on exit and scrolling to page
[evince.git] / shell / ev-view.c
index e76f5b81728af22109298bb499683c81d825e767..07a71ead20aca43ec66f1d267df493ab3d398b30 100644 (file)
@@ -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>
 #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))
 enum {
        PROP_0,
        PROP_STATUS,
-       PROP_FIND_STATUS
+       PROP_FIND_STATUS,
+       PROP_CONTINUOUS,
+       PROP_DUAL_PAGE,
+       PROP_FULL_SCREEN,
+       PROP_PRESENTATION,
+       PROP_SIZING_MODE,
 };
 
 enum {
@@ -48,6 +59,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 +74,60 @@ 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 6.0
+
 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 start_page;
+       gint end_page;
+       gint current_page;
+
+       EvJobRender *current_job;
+
+       int find_page;
+       int find_result;
+       int spacing;
 
        double scale;
+       GtkBorder border;
+       gboolean show_border;
+
+       gboolean continuous;
+       gboolean dual_page;
+       gboolean full_screen;
+       gboolean presentation;
+       EvSizingMode sizing_mode;
 };
 
 struct _EvViewClass {
@@ -100,27 +139,29 @@ 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);
-    
+static void ev_view_set_scroll_adjustments     (EvView        *view,
+                                               GtkAdjustment *hadjustment,
+                                               GtkAdjustment *vadjustment);
+static void get_bounding_box_size              (EvView        *view,
+                                               int           *max_width,
+                                               int           *max_height);
+static void view_update_range_and_current_page (EvView        *view);
+
+
 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,12 +171,15 @@ 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);
-               gdk_window_process_updates (view->bin_window, TRUE);
+               //              gdk_window_process_updates (view->bin_window, TRUE);
        }
+
+       if (view->document)
+               view_update_range_and_current_page (view);
 }
 
 static void
@@ -160,7 +204,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 +221,94 @@ view_set_adjustment_values (EvView         *view,
                gtk_adjustment_value_changed (adjustment);
 }
 
-/*** Virtual function implementations ***/       
-     
+static void
+view_update_range_and_current_page (EvView *view)
+{
+
+       /* Presentation trumps all other modes */
+       if (view->presentation) {
+               view->start_page = view->current_page;
+               view->end_page = view->current_page;
+       } else if (view->continuous) {
+               GdkRectangle current_area, unused, page_area;
+               gboolean found = FALSE;
+               int i;
+               
+               get_bounding_box_size (view, &(page_area.width), &(page_area.height));
+               page_area.x = view->spacing;
+               page_area.y = view->spacing;
+
+               if (view->hadjustment) {
+                       current_area.x = view->hadjustment->value;
+                       current_area.width = view->hadjustment->page_size;
+               } else {
+                       current_area.x = page_area.x;
+                       current_area.width = page_area.width;
+               }
+
+               if (view->vadjustment) {
+                       current_area.y = view->vadjustment->value;
+                       current_area.height = view->vadjustment->page_size;
+               } else {
+                       current_area.y = page_area.y;
+                       current_area.height = page_area.height;
+               }
+
+               for (i = 0; i < ev_page_cache_get_n_pages (view->page_cache); i++) {
+                       if (gdk_rectangle_intersect (&current_area, &page_area, &unused)) {
+                               if (! found) {
+                                       view->start_page = i;
+                                       found = TRUE;
+                               }
+                               view->end_page = i;
+                       } else if (found) {
+                               break;
+                       }
+                       if (view->dual_page) {
+                               if (i % 2 == 0) {
+                                       page_area.x += page_area.width + view->spacing;
+                               } else {
+                                       page_area.x = view->spacing;
+                                       page_area.y += page_area.height + view->spacing;
+                               }
+                       } else {
+                               page_area.y += page_area.height + view->spacing;
+                       }
+               }
+       } else {
+               if (view->dual_page) {
+                       if (view->current_page % 2 == 0) {
+                               view->start_page = view->current_page;
+                               if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
+                                       view->end_page = view->start_page + 1;
+                       } else {
+                               view->start_page = view->current_page - 1;
+                               view->end_page = view->current_page;
+                       }
+               } else {
+                       view->start_page = view->current_page;
+                       view->end_page = view->current_page;
+               }
+       }
+
+       ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
+                                       view->start_page,
+                                       view->end_page,
+                                       view->scale);
+}
+
+/*** 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,28 +317,245 @@ 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
+get_bounding_box_size (EvView *view, int *max_width, int *max_height)
+{
+       GtkBorder border;
+       int width, height;
+
+       if (max_width) {
+               ev_page_cache_get_max_width_size (view->page_cache,
+                                                 view->scale,
+                                                 &width, &height);
+               compute_border (view, width, height, &border);
+               *max_width = width + border.left + border.right;
+       }
+
+
+       if (max_height) {
+               ev_page_cache_get_max_height_size (view->page_cache,
+                                                  view->scale,
+                                                  &width, &height);
+               compute_border (view, width, height, &border);
+               *max_height = height + border.top + border.bottom;
+       }
+}
+
+
+static void
+ev_view_size_request_continuous_and_dual_page (EvView         *view,
+                                              GtkRequisition *requisition)
+{
+       int max_width, max_height;
+       int n_rows;
+
+       get_bounding_box_size (view, &max_width, &max_height);
+
+       n_rows = (1 + ev_page_cache_get_n_pages (view->page_cache)) / 2;
+
+       requisition->width = (max_width * 2) + (view->spacing * 3);
+       requisition->height = max_height * n_rows + (view->spacing * (n_rows + 1));
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
+               requisition->width = 1;
+       } else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+               requisition->width = 1;
+               /* FIXME: This could actually be set on one page docs or docs
+                * with a strange aspect ratio. */
+               /* requisition->height = 1;*/
+       }
+}
+
+static void
+ev_view_size_request_continuous (EvView         *view,
+                                GtkRequisition *requisition)
+{
+       int max_width, max_height;
+       int n_pages;
+
+       get_bounding_box_size (view, &max_width, &max_height);
+
+       n_pages = ev_page_cache_get_n_pages (view->page_cache);
+
+       requisition->width = max_width + (view->spacing * 2);
+       requisition->height = max_height * n_pages + (view->spacing * (n_pages + 1));
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
+               requisition->width = 1;
+       } else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+               requisition->width = 1;
+               /* FIXME: This could actually be set on one page docs or docs
+                * with a strange aspect ratio. */
+               /* requisition->height = 1;*/
+       }
+}
+
+static void
+ev_view_size_request_dual_page (EvView         *view,
+                               GtkRequisition *requisition)
+{
+       GtkBorder border;
+       gint width, height;
+
+       /* Find the largest of the two. */
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &width, &height);
+       if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) {
+               gint width_2, height_2;
+               ev_page_cache_get_size (view->page_cache,
+                                       view->current_page + 1,
+                                       view->scale,
+                                       &width_2, &height_2);
+               if (width_2 > width) {
+                       width = width_2;
+                       height = height_2;
+               }
+       }
+       compute_border (view, width, height, &border);
+
+       requisition->width = ((width + border.left + border.right) * 2) +
+               (view->spacing * 3);
+       requisition->height = (height + border.top + border.bottom) +
+               (view->spacing * 2);
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
+               requisition->width = 1;
+       } else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+               requisition->width = 1;
+               requisition->height = 1;
+       }
+}
+
+static void
+ev_view_size_request_single_page (EvView         *view,
+                                 GtkRequisition *requisition)
+{
+       GtkBorder border;
+       gint width, height;
+
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &width, &height);
+       compute_border (view, width, height, &border);
+
+       requisition->width = width + border.left + border.right + (2 * view->spacing);
+       requisition->height = height + border.top + border.bottom + (2 * view->spacing);
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
+               requisition->width = 1;
+               requisition->height = height + border.top + border.bottom + (2 * view->spacing);
+       } else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+               requisition->width = 1;
+               requisition->height = 1;
+       }
+}
+
 static void
 ev_view_size_request (GtkWidget      *widget,
                      GtkRequisition *requisition)
 {
        EvView *view = EV_VIEW (widget);
 
-       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 == NULL) {
+               requisition->width = 1;
+               requisition->height = 1;
+               return;
+       }
+
+       if (view->presentation) {
+               requisition->width = 1;
+               requisition->height = 1;
+               return;
        }
-  
+
+       if (view->continuous && view->dual_page)
+               ev_view_size_request_continuous_and_dual_page (view, requisition);
+       else if (view->continuous)
+               ev_view_size_request_continuous (view, requisition);
+       else if (view->dual_page)
+               ev_view_size_request_dual_page (view, requisition);
+       else
+               ev_view_size_request_single_page (view, requisition);
 }
 
 static void
@@ -243,17 +574,9 @@ ev_view_size_allocate (GtkWidget      *widget,
                                   MAX (widget->allocation.width, widget->requisition.width),
                                   MAX (widget->allocation.height, widget->requisition.height));
        }
-}
 
-static void
-update_window_backgrounds (EvView *view)
-{
-       GtkWidget *widget = GTK_WIDGET (view);
-  
-       if (GTK_WIDGET_REALIZED (view)) {
-               gdk_window_set_background (view->bin_window,
-                                          &widget->style->base[GTK_WIDGET_STATE (widget)]);
-       }
+       if (view->document)
+               view_update_range_and_current_page (view);
 }
 
 static void
@@ -263,18 +586,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 |
@@ -282,7 +606,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);
@@ -292,8 +617,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 |
@@ -302,9 +628,10 @@ ev_view_realize (GtkWidget *widget)
        gdk_window_set_user_data (view->bin_window, widget);
        gdk_window_show (view->bin_window);
 
-       if (view->document) {
-               ev_document_set_target (view->document, view->bin_window);
+       widget->style = gtk_style_attach (widget->style, view->bin_window);
+       gdk_window_set_background (view->bin_window, &widget->style->mid[widget->state]);
 
+       if (view->document) {
                /* 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
@@ -312,8 +639,6 @@ ev_view_realize (GtkWidget *widget)
                 */
                gtk_widget_queue_resize (widget);
        }
-
-       update_window_backgrounds (view);
 }
 
 static void
@@ -321,9 +646,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;
@@ -331,20 +653,7 @@ ev_view_unrealize (GtkWidget *widget)
        GTK_WIDGET_CLASS (ev_view_parent_class)->unrealize (widget);
 }
 
-static void
-ev_view_style_set (GtkWidget      *widget,
-                  GtkStyle       *previous_style)
-{
-       update_window_backgrounds (EV_VIEW (widget));
-}
-
-static void
-ev_view_state_changed (GtkWidget    *widget,
-                      GtkStateType  previous_state)
-{
-       update_window_backgrounds (EV_VIEW (widget));
-}
-
+#if 0
 static guint32
 ev_gdk_color_to_rgb (const GdkColor *color)
 {
@@ -356,7 +665,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;
@@ -364,7 +674,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);
@@ -372,7 +682,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);
@@ -390,43 +700,242 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
        gdk_color_free (fill_color_gdk);
 }
 
+
 static void
-expose_bin_window (GtkWidget      *widget,
-                  GdkEventExpose *event)
+highlight_find_results (EvView *view)
 {
-       EvView *view = EV_VIEW (widget);
-        int i;
-       int current_page;
-        const EvFindResult *results;
+       EvDocumentFind *find;
+       int i, results = 0;
+
+       g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
+
+       find = EV_DOCUMENT_FIND (view->document);
+
+       results = ev_document_find_get_n_results (find, view->current_page);
+
+       for (i = 0; i < results; i++) {
+               EvRectangle rectangle;
+               GdkRectangle view_rectangle;
+               guchar alpha;
+
+               alpha = (i == view->find_result) ? 0x90 : 0x20;
+               ev_document_find_get_result (find, view->current_page,
+                                            i, &rectangle);
+               doc_rect_to_view_rect (view, &rectangle, &view_rectangle);
+               draw_rubberband (GTK_WIDGET (view), view->bin_window,
+                                &view_rectangle, alpha);
+        }
+}
+#endif
+
+
+static gboolean
+get_page_extents (EvView       *view,
+                 gint          page,
+                 GdkRectangle *page_area,
+                 GtkBorder    *border)
+{
+       GtkWidget *widget;
+       int width, height;
+
+       widget = GTK_WIDGET (view);
+
+       /* Quick sanity check */
+       if (view->presentation) {
+               if (view->current_page != page)
+                       return FALSE;
+       } else if (view->continuous) {
+               if (page < view->start_page ||
+                   page > view->end_page)
+                       return FALSE;
+       } else if (view->dual_page) {
+               if (ABS (page - view->current_page) > 1)
+                       return FALSE;
+       } else {
+               if (view->current_page != page)
+                       return FALSE;
+       }
+
+       /* Get the size of the page */
+       ev_page_cache_get_size (view->page_cache, page,
+                               view->scale,
+                               &width, &height);
+       compute_border (view, width, height, border);
+       page_area->width = width + border->left + border->right;
+       page_area->height = height + border->top + border->bottom;
+
+       if (view->presentation) {
+               page_area->x = (MAX (0, widget->allocation.width - width))/2;
+               page_area->y = (MAX (0, widget->allocation.height - height))/2;
+       } else if (view->continuous) {
+               gint max_width, max_height;
+               gint x, y;
+
+               get_bounding_box_size (view, &max_width, &max_height);
+               /* Get the location of the bounding box */
+               if (view->dual_page) {
+                       x = view->spacing + (page % 2) * (max_width + view->spacing);
+                       y = view->spacing + (page / 2) * (max_height + view->spacing);
+                       x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3))/2;
+               } else {
+                       x = view->spacing;
+                       y = view->spacing + page * (max_height + view->spacing);
+                       x = x + MAX (0, widget->allocation.width - (max_width + view->spacing * 2))/2;
+               }
+               page_area->x = x;
+               page_area->y = y;
+       } else {
+               gint x, y;
+               if (view->dual_page) {
+                       gint width_2, height_2;
+                       gint max_width = width;
+                       gint max_height = height;
+                       GtkBorder overall_border;
+                       gint other_page;
+
+                       other_page = page ^ 1;
+
+                       /* First, we get the bounding box of the two pages */
+                       if (other_page < ev_page_cache_get_n_pages (view->page_cache)) {
+                               ev_page_cache_get_size (view->page_cache,
+                                                       page + 1,
+                                                       view->scale,
+                                                       &width_2, &height_2);
+                               if (width_2 > width)
+                                       max_width = width_2;
+                               if (height_2 > height)
+                                       max_height = height_2;
+                       }
+                       compute_border (view, max_width, max_height, &overall_border);
+
+                       /* Find the offsets */
+                       x = view->spacing;
+                       y = view->spacing;
+
+                       /* Adjust for being the left or right page */
+                       if (page % 2 == 0)
+                               x = x + max_width - width;
+                       else
+                               x = x + (max_width + overall_border.left + overall_border.right) + view->spacing;
+
+                       y = y + (max_height - height)/2;
+
+                       /* Adjust for extra allocation */
+                       x = x + MAX (0, widget->allocation.width -
+                                    ((max_width + overall_border.left + overall_border.right) * 2 + view->spacing * 3))/2;
+                       y = y + MAX (0, widget->allocation.height - (height + view->spacing * 2))/2;
+               } else {
+                       x = view->spacing;
+                       y = view->spacing;
+
+                       /* Adjust for extra allocation */
+                       x = x + MAX (0, widget->allocation.width - (width + view->spacing * 2))/2;
+                       y = y + MAX (0, widget->allocation.height - (height + view->spacing * 2))/2;
+               }
+
+               page_area->x = x;
+               page_area->y = y;
+       }
+
+       return TRUE;
+}
+
+static void
+draw_one_page (EvView       *view,
+              gint          page,
+              GdkRectangle *page_area,
+              GtkBorder    *border,
+              GdkRectangle *expose_area)
+{
+       gint width, height;
+       GdkPixbuf *scaled_image;
+       GdkPixbuf *current_pixbuf;
+       GdkRectangle overlap;
+       GdkRectangle real_page_area;
+
+       g_assert (view->document);
+
+       if (! gdk_rectangle_intersect (page_area, expose_area, &overlap))
+               return;
+
+       ev_page_cache_get_size (view->page_cache,
+                               page, view->scale,
+                               &width, &height);
+
+       if (view->show_border)
+               ev_document_misc_paint_one_page (view->bin_window,
+                                                GTK_WIDGET (view),
+                                                page_area, border);
+
+       /* Render the document itself */
+       real_page_area = *page_area;
+
+       real_page_area.x += border->left;
+       real_page_area.y += border->top;
+       real_page_area.width -= (border->left + border->right);
+       real_page_area.height -= (border->top + border->bottom);
+
+       if (! gdk_rectangle_intersect (&real_page_area, expose_area, &overlap))
+               return;
+
+       current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, 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,
+                                overlap.x - real_page_area.x,
+                                overlap.y - real_page_area.y,
+                                overlap.x, overlap.y,
+                                overlap.width, overlap.height,
+                                GDK_RGB_DITHER_NORMAL,
+                                0, 0);
+               g_object_unref (scaled_image);
+       }
+}
+
+static void
+ev_view_bin_expose (EvView         *view,
+                   GdkEventExpose *event)
+{
+       int i;
 
        if (view->document == NULL)
                return;
-       
-       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) {
+
+       for (i = view->start_page; i <= view->end_page; i++) {
+               GdkRectangle page_area;
+               GtkBorder border;
+
+               if (! get_page_extents (view, i, &page_area, &border))
+                       continue;
+               draw_one_page (view, i, &page_area, &border, &(event->area));
+       }
+
 #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;
-        }
+       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 (GTK_WIDGET (view), view->bin_window,
+                                        &rubberband, 0x40);
+               }
        }
+#endif
 }
 
 static gboolean
@@ -436,7 +945,7 @@ ev_view_expose_event (GtkWidget      *widget,
        EvView *view = EV_VIEW (widget);
 
        if (event->window == view->bin_window)
-               expose_bin_window (widget, event);
+               ev_view_bin_expose (view, event);
        else
                return GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event (widget, event);
 
@@ -447,13 +956,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);
 }
@@ -464,13 +985,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;
+       }
+
+       ev_document_doc_mutex_lock ();
+       text = ev_document_get_text (ev_view->document,
+                                    ev_view->current_page,
+                                    &ev_view->selection);
+       ev_document_doc_mutex_unlock ();
+
        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,
@@ -480,7 +1020,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;
+       }
+
+       ev_document_doc_mutex_lock ();
+       text = ev_document_get_text (ev_view->document,
+                                    ev_view->current_page,
+                                    &ev_view->selection);
+       ev_document_doc_mutex_unlock ();
        gtk_selection_data_set_text (selection_data, text, -1);
 }
 
@@ -534,10 +1082,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;
        }
 
@@ -545,27 +1091,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;
@@ -587,16 +1135,28 @@ 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 void
-ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
+static GdkCursor *
+ev_view_create_invisible_cursor(void)
 {
-       GdkCursor *cursor = NULL;
+       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)
+{
+       GdkCursor *cursor = NULL;
        GdkDisplay *display;
        GtkWidget *widget;
 
@@ -618,6 +1178,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) {
@@ -627,6 +1191,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)
@@ -634,24 +1246,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) {
@@ -660,11 +1275,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)
@@ -678,12 +1316,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);
                }
        }
 
@@ -708,7 +1343,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,
@@ -740,13 +1375,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,
@@ -757,21 +1392,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;
                }
@@ -779,11 +1487,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;
@@ -797,17 +1505,32 @@ ev_view_scroll_view (EvView *view,
 }
 
 static void
-ev_view_set_property (GObject *object,
-                     guint prop_id,
+ev_view_set_property (GObject      *object,
+                     guint         prop_id,
                      const GValue *value,
-                     GParamSpec *pspec)
+                     GParamSpec   *pspec)
 {
+       EvView *view = EV_VIEW (object);
+
        switch (prop_id)
        {
-               /* Read only */
-               case PROP_STATUS:
-               case PROP_FIND_STATUS:
-                       break;
+       case PROP_CONTINUOUS:
+               ev_view_set_continuous (view, g_value_get_boolean (value));
+               break;
+       case PROP_DUAL_PAGE:
+               ev_view_set_dual_page (view, g_value_get_boolean (value));
+               break;
+       case PROP_FULL_SCREEN:
+               ev_view_set_full_screen (view, g_value_get_boolean (value));
+               break;
+       case PROP_PRESENTATION:
+               ev_view_set_presentation (view, g_value_get_boolean (value));
+               break;
+       case PROP_SIZING_MODE:
+               ev_view_set_sizing_mode (view, g_value_get_enum (value));
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }
 }
 
@@ -821,12 +1544,29 @@ ev_view_get_property (GObject *object,
 
        switch (prop_id)
        {
-               case PROP_STATUS:
-                       g_value_set_string (value, view->status);
-                       break;
-               case PROP_FIND_STATUS:
-                       g_value_set_string (value, view->status);
-                       break;
+       case PROP_STATUS:
+               g_value_set_string (value, view->status);
+               break;
+       case PROP_FIND_STATUS:
+               g_value_set_string (value, view->status);
+               break;
+       case PROP_CONTINUOUS:
+               g_value_set_boolean (value, view->continuous);
+               break;
+       case PROP_DUAL_PAGE:
+               g_value_set_boolean (value, view->dual_page);
+               break;
+       case PROP_FULL_SCREEN:
+               g_value_set_boolean (value, view->full_screen);
+               break;
+       case PROP_PRESENTATION:
+               g_value_set_boolean (value, view->presentation);
+               break;
+       case PROP_SIZING_MODE:
+               g_value_set_enum (value, view->sizing_mode);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }
 }
 
@@ -850,8 +1590,6 @@ ev_view_class_init (EvViewClass *class)
        widget_class->size_allocate = ev_view_size_allocate;
        widget_class->realize = ev_view_realize;
        widget_class->unrealize = ev_view_unrealize;
-       widget_class->style_set = ev_view_style_set;
-       widget_class->state_changed = ev_view_state_changed;
        gtk_object_class->destroy = ev_view_destroy;
 
        class->set_scroll_adjustments = ev_view_set_scroll_adjustments;
@@ -866,13 +1604,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),
@@ -893,177 +1624,312 @@ 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",
                                                              NULL,
                                                              G_PARAM_READABLE));
 
+       g_object_class_install_property (object_class,
+                                        PROP_CONTINUOUS,
+                                        g_param_spec_boolean ("continuous",
+                                                              "Continuous",
+                                                              "Continuous scrolling mode",
+                                                              TRUE,
+                                                              G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class,
+                                        PROP_DUAL_PAGE,
+                                        g_param_spec_boolean ("dual-page",
+                                                              "Dual Page",
+                                                              "Two pages visible at once",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE));
+       g_object_class_install_property (object_class,
+                                        PROP_FULL_SCREEN,
+                                        g_param_spec_boolean ("full-screen",
+                                                              "Full Screen",
+                                                              "Draw page in a full-screen fashion",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE));
+       g_object_class_install_property (object_class,
+                                        PROP_PRESENTATION,
+                                        g_param_spec_boolean ("presentation",
+                                                              "Presentation",
+                                                              "Draw page in presentation mode",
+                                                              TRUE,
+                                                              G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class,
+                                        PROP_SIZING_MODE,
+                                        g_param_spec_enum ("sizing-mode",
+                                                           "Sizing Mode",
+                                                           "Sizing Mode",
+                                                           EV_TYPE_SIZING_MODE,
+                                                           EV_SIZING_FIT_WIDTH,
+                                                           G_PARAM_READWRITE));
+
        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
 ev_view_init (EvView *view)
 {
-       static const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-
        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;
-       
-       gtk_widget_modify_bg (GTK_WIDGET (view), GTK_STATE_NORMAL, &white);
+       view->show_border = TRUE;
 
-        view->find_results = g_array_new (FALSE,
-                                          FALSE,
-                                          sizeof (EvFindResult));
-       view->results_on_this_page = 0;
-       view->next_page_with_result = 0;
+       view->continuous = TRUE;
+       view->dual_page = FALSE;
+       view->presentation = FALSE;
+       view->full_screen = FALSE;
+       view->sizing_mode = EV_SIZING_FIT_WIDTH;
 }
 
-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"));
+       char *message;
+
+//     ev_document_doc_mutex_lock ();
+       if (view->current_page == view->find_page) {
+               int results;
+
+//             ev_document_doc_mutex_lock ();
+               results = ev_document_find_get_n_results
+                               (EV_DOCUMENT_FIND (view->document),
+                                view->current_page);
+//             ev_document_doc_mutex_unlock ();
+               /* 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 {
+               double percent;
+
+               ev_document_doc_mutex_lock ();
+               percent = ev_document_find_get_progress
+                               (EV_DOCUMENT_FIND (view->document));
+               ev_document_doc_mutex_unlock ();
+               if (percent >= (1.0 - 1e-10)) {
+                       message = g_strdup (_("Not found"));
                } else {
-                       return g_strdup_printf (_("%3d%% remaining to search"),
-                                               (int) ((1.0 - view->find_percent_complete) * 100));
+                       message = g_strdup_printf (_("%3d%% remaining to search"),
+                                                  (int) ((1.0 - percent) * 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);
-       } else {
-               return g_strdup_printf (_("%d found on this page"),
-                                       view->results_on_this_page);
+
        }
+//     ev_document_doc_mutex_unlock ();
+
+       ev_view_set_find_status (view, message);
+//     g_free (message);
 }
 
+#define MARGIN 5
+
 static void
-update_find_results (EvView *view)
+ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect)
 {
-       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;
-               } 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;
-               }
-               ++i;
+       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);
        }
 
-       /* 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;
-       }
+       adjustment = view->hadjustment;
 
-       if (counts_changed ||
-           view->find_results->len == 0) {
-               char *message;
+       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);
+       }
+}
 
-               message = ev_view_get_find_status_message (view);
-               ev_view_set_find_status (view, message);
-               g_free (message);
+static void
+jump_to_find_result (EvView *view)
+{
+       EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+       EvRectangle rect;
+       GdkRectangle view_rect;
+       int n_results;
+
+       ev_document_doc_mutex_lock ();
+       n_results = ev_document_find_get_n_results (find, view->current_page);
+       ev_document_doc_mutex_unlock ();
+
+       if (n_results > view->find_result) {
+               ev_document_doc_mutex_lock ();
+               ev_document_find_get_result
+                       (find, view->current_page, view->find_result, &rect);
+               ev_document_doc_mutex_unlock ();
+
+               doc_rect_to_view_rect (view, &rect, &view_rect);
+               ensure_rectangle_is_visible (view, &view_rect);
        }
 }
 
 static void
-found_results_callback (EvDocument         *document,
-                        const EvFindResult *results,
-                        int                 n_results,
-                        double              percent_complete,
-                        void               *data)
+jump_to_find_page (EvView *view)
 {
-  EvView *view = EV_VIEW (data);
-  
-  g_array_set_size (view->find_results, 0);
+       int n_pages, i;
 
-  if (n_results > 0)
-          g_array_append_vals (view->find_results,
-                               results, n_results);
+       n_pages = ev_page_cache_get_n_pages (view->page_cache);
 
-#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
+       for (i = 0; i < n_pages; i++) {
+               int has_results;
+               int page;
+
+               page = i + view->find_page;
+               if (page >= n_pages) {
+                       page = page - n_pages;
+               }
 
-  view->find_percent_complete = percent_complete;
-  update_find_results (view);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (view));
+               //              ev_document_doc_mutex_lock ();
+               has_results = ev_document_find_page_has_results
+                               (EV_DOCUMENT_FIND (view->document), page);
+               if (has_results == -1) {
+                       view->find_page = page;
+                       break;
+               } else if (has_results == 1) {
+                       ev_page_cache_set_current_page (view->page_cache, page);
+                       jump_to_find_result (view);
+                       break;
+               }
+       }
 }
 
 static void
-document_changed_callback (EvDocument *document,
-                          EvView     *view)
+find_changed_cb (EvDocument *document, int page, EvView *view)
 {
-       gtk_widget_queue_draw (GTK_WIDGET (view));
-       ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+       jump_to_find_page (view);
+       jump_to_find_result (view);
+       update_find_status_message (view);
+
+       if (view->current_page == page)
+               gtk_widget_queue_draw (GTK_WIDGET (view));
 }
+/*** Public API ***/
 
-/*** Public API ***/       
-     
 GtkWidget*
 ev_view_new (void)
 {
-       return g_object_new (EV_TYPE_VIEW, NULL);
+       GtkWidget *view;
+
+       view = g_object_new (EV_TYPE_VIEW, NULL);
+
+       return view;
+}
+
+static void
+job_finished_cb (EvPixbufCache *pixbuf_cache,
+                EvView        *view)
+{
+       gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+
+static void
+page_changed_cb (EvPageCache *page_cache,
+                int          new_page,
+                EvView      *view)
+{
+       int old_page = view->current_page;
+       int old_width, old_height;
+       int new_width, new_height;
+       int max_height, n_rows;
+
+       if (old_page == new_page)
+               return;
+
+       ev_page_cache_get_size (page_cache,
+                               old_page,
+                               view->scale,
+                               &old_width, &old_height);
+
+       view->current_page = new_page;
+       view->has_selection = FALSE;
+
+       ev_page_cache_get_size (page_cache,
+                               new_page,
+                               view->scale,
+                               &new_width, &new_height);
+
+       compute_border (view, new_width, new_height, &(view->border));
+
+       if (new_width != old_width || new_height != old_height)
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       else
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+       
+       if (view->continuous) {
+               
+               n_rows = view->dual_page ? new_page / 2 : new_page;
+               
+               get_bounding_box_size (view, NULL, &max_height);
+
+               gtk_adjustment_clamp_page(view->vadjustment,
+                                         (max_height + view->spacing) * n_rows, 
+                                         (max_height + view->spacing) * n_rows +
+                                          view->vadjustment->page_size);
+       } else {
+               gtk_adjustment_set_value (view->vadjustment,
+                                         view->vadjustment->lower);
+       }
+
+       if (EV_IS_DOCUMENT_FIND (view->document)) {
+               view->find_page = new_page;
+               view->find_result = 0;
+               update_find_status_message (view);
+       }
+
+       view_update_range_and_current_page (view);
 }
 
 void
@@ -1075,303 +1941,386 @@ ev_view_set_document (EvView     *view,
        if (document != view->document) {
                if (view->document) {
                         g_signal_handlers_disconnect_by_func (view->document,
-                                                              found_results_callback,
+                                                              find_changed_cb,
                                                               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->page_cache = NULL;
+
                 }
 
                view->document = document;
+               view->find_page = 0;
+               view->find_result = 0;
 
                if (view->document) {
                        g_object_ref (view->document);
-                       if (EV_IS_DOCUMENT_FIND (view->document))
+                       if (EV_IS_DOCUMENT_FIND (view->document)) {
                                g_signal_connect (view->document,
-                                                 "found",
-                                                 G_CALLBACK (found_results_callback),
+                                                 "find_changed",
+                                                 G_CALLBACK (find_changed_cb),
                                                  view);
-                       g_signal_connect (view->document,
-                                         "changed",
-                                         G_CALLBACK (document_changed_callback),
-                                         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);
                 }
 
-               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);
        }
 }
 
+#define EPSILON 0.0000001
 static void
-set_document_page (EvView *view, int page)
+ev_view_zoom (EvView   *view,
+             double    factor,
+             gboolean  relative)
 {
-       if (view->document) {
-               int old_page = ev_document_get_page (view->document);
+       double scale;
 
-               if (old_page != page) {
-                       ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
-                       ev_document_set_page (view->document, page);
-               }
+       if (relative)
+               scale = view->scale * factor;
+       else
+               scale = factor;
 
-               if (old_page != ev_document_get_page (view->document)) {
-                       g_signal_emit (view, page_changed_signal, 0);
+       scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 
-                       view->find_percent_complete = 0.0;
-                       update_find_results (view);     
-               }
-       }
+       if (ABS (view->scale - scale) < EPSILON)
+               return;
+       view->scale = scale;
+       gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
-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);
-                       set_document_page (view, page);
-                       break;
-               case EV_LINK_TYPE_EXTERNAL_URI:
-                       uri = ev_link_get_uri (link);
-                       gnome_vfs_url_show (uri);
-                       break;
-       }
-}
 
 void
-ev_view_go_to_link (EvView *view, EvLink *link)
+ev_view_set_continuous (EvView   *view,
+                       gboolean  continuous)
 {
-       EvLinkType type;
+       g_return_if_fail (EV_IS_VIEW (view));
 
-       go_to_link (view, link);
+       continuous = continuous != FALSE;
 
-       type = ev_link_get_link_type (link);
-       if (type == EV_LINK_TYPE_PAGE) {
-               ev_history_add_link (view->history, link);
+       if (view->continuous != continuous) {
+               view->continuous = continuous;
+               gtk_widget_queue_resize (GTK_WIDGET (view));
        }
-}
-
-static void
-go_to_index (EvView *view, int index)
-{
-       EvLink *link;
-       
-       link = ev_history_get_link_nth (view->history, index);
-       g_return_if_fail (link != NULL);
 
-       go_to_link (view, link);
+       g_object_notify (G_OBJECT (view), "continuous");
 }
 
-gboolean
-ev_view_can_go_back (EvView *view)
+void
+ev_view_set_dual_page (EvView   *view,
+                      gboolean  dual_page)
 {
-       int index, n;
+       g_return_if_fail (EV_IS_VIEW (view));
 
-       if (view->history == NULL) {
-               return FALSE;
-       }
+       dual_page = dual_page != FALSE;
 
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
+       if (view->dual_page == dual_page)
+               return;
 
-       if (n > 0) {
-               return index != MAX (0, index - 1);
-       } else {
-               return FALSE;
-       }
+       view->dual_page = dual_page;
+       /* FIXME: if we're keeping the pixbuf cache around, we should extend the
+        * preload_cache_size to be 2 if dual_page is set.
+        */
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+
+       g_object_notify (G_OBJECT (view), "dual-page");
 }
 
 void
-ev_view_go_back        (EvView *view)
+ev_view_set_full_screen (EvView   *view,
+                        gboolean  full_screen)
 {
-       int index, n;
-
-       g_return_if_fail (EV_IS_HISTORY (view->history));
-
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
-
-       if (n > 0) {
-               index = MAX (0, index - 1);
-               ev_history_set_current_index (view->history, index);
-       }
-}
+       g_return_if_fail (EV_IS_VIEW (view));
 
-gboolean
-ev_view_can_go_forward (EvView *view)
-{
-       int index, n;
+       full_screen = full_screen != FALSE;
 
-       if (view->history == NULL) {
-               return FALSE;
+       if (view->full_screen != full_screen) {
+               view->full_screen = full_screen;
+               gtk_widget_queue_resize (GTK_WIDGET (view));
        }
 
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
-
-       if (n > 0) {
-               return  index != MIN (n - 1, index + 1);
-       } else {
-               return FALSE;
-       }
+       g_object_notify (G_OBJECT (view), "full-screen");
 }
 
 void
-ev_view_go_forward (EvView *view)
+ev_view_set_presentation (EvView   *view,
+                         gboolean  presentation)
 {
-       int index, n;
-
-       g_return_if_fail (EV_IS_HISTORY (view->history));
+       g_return_if_fail (EV_IS_VIEW (view));
 
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
+       presentation = presentation != FALSE;
 
-       if (n > 0) {
-               index = MIN (n - 1, index + 1);
-               ev_history_set_current_index (view->history, index);
+       if (view->presentation != presentation) {
+               view->presentation = presentation;
+               gtk_widget_queue_resize (GTK_WIDGET (view));
        }
-}
 
+       g_object_notify (G_OBJECT (view), "presentation");
+}
 
 void
-ev_view_set_page (EvView *view,
-                 int     page)
+ev_view_set_sizing_mode (EvView       *view,
+                        EvSizingMode  sizing_mode)
 {
        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 (view->sizing_mode != sizing_mode) {
+               view->sizing_mode = sizing_mode;
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       }
 
-int
-ev_view_get_page (EvView *view)
-{
-       if (view->document)
-               return ev_document_get_page (view->document);
-       else
-               return 1;
+       g_object_notify (G_OBJECT (view), "sizing-mode");
 }
 
-#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
-
-static void
-ev_view_zoom (EvView   *view,
-             double    factor,
-             gboolean  relative)
+gboolean
+ev_view_can_zoom_in (EvView *view)
 {
-       double scale;
-
-       if (relative)
-               scale = view->scale * factor;
-       else
-               scale = factor;
-
-       view->scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
-
-       ev_document_set_scale (view->document, view->scale);
+       return view->scale * ZOOM_IN_FACTOR <= MAX_SCALE;
+}
 
-       gtk_widget_queue_resize (GTK_WIDGET (view));
+gboolean
+ev_view_can_zoom_out (EvView *view)
+{
+       return view->scale * ZOOM_OUT_FACTOR >= MIN_SCALE;
 }
 
 void
 ev_view_zoom_in (EvView *view)
 {
+       g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
+
        ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }
 
 void
 ev_view_zoom_out (EvView *view)
 {
+       g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
+
        ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
 
-void
-ev_view_normal_size (EvView *view)
+
+
+static double
+zoom_for_size_fit_width (int doc_width,
+                        int doc_height,
+                        int target_width,
+                        int target_height,
+                        int vsb_width)
 {
-       ev_view_zoom (view, 1.0, FALSE);
+       double scale;
+
+       scale = (double)target_width / doc_width;
+
+       if (doc_height * scale > target_height)
+               scale = (double) (target_width - vsb_width) / doc_width;
+
+       return scale;
 }
 
-void
-ev_view_best_fit (EvView *view)
+static double
+zoom_for_size_best_fit (int doc_width,
+                       int doc_height,
+                       int target_width,
+                       int target_height,
+                       int vsb_width,
+                       int hsb_width)
 {
-       double scale;
-       int width, height;
+       double w_scale;
+       double h_scale;
 
-       width = height = 0;
-       ev_document_get_page_size (view->document, &width, &height);
+       w_scale = (double)target_width / doc_width;
+       h_scale = (double)target_height / doc_height;
 
-       scale = 1.0;
-       if (width != 0 && height != 0) {
-               double scale_w, scale_h;
+       if (doc_height * w_scale > target_height)
+               w_scale = (double) (target_width - vsb_width) / doc_width;
+       if (doc_width * h_scale > target_width)
+               h_scale = (double) (target_height - hsb_width) / doc_height;
 
-               scale_w = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
-               scale_h = (double)GTK_WIDGET (view)->allocation.height * view->scale / height;
+       return MIN (w_scale, h_scale);
+}
 
-               scale = (scale_w < scale_h) ? scale_w : scale_h;
-       }
+static void
+ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
+                          int     width,
+                          int     height,
+                          int     vsb_width,
+                          int     hsb_height)
+{
+       int doc_width, doc_height;
+       GtkBorder border;
+       gdouble scale;
+
+       ev_page_cache_get_max_width_size (view->page_cache,
+                                         1.0,
+                                         &doc_width, NULL);
+       ev_page_cache_get_max_height_size (view->page_cache,
+                                          1.0,
+                                          NULL, &doc_height);
+       compute_border (view, doc_width, doc_height, &border);
+
+       doc_width = doc_width * 2;
+       width -= ((border.left + border.right)* 2 + 3 * view->spacing);
+       height -= (border.top + border.bottom + 2 * view->spacing);
+
+       /* FIXME: We really need to calculat the overall height here, not the
+        * page height.  We assume there's always a vertical scrollbar for
+        * now.  We need to fix this. */
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
+               scale = zoom_for_size_fit_width (doc_width, doc_height, width - vsb_width, height, 0);
+       else if (view->sizing_mode == EV_SIZING_BEST_FIT)
+               scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height);
+       else
+               g_assert_not_reached ();
 
        ev_view_zoom (view, scale, FALSE);
 }
 
-void
-ev_view_fit_width (EvView *view)
+static void
+ev_view_zoom_for_size_continuous (EvView *view,
+                                 int     width,
+                                 int     height,
+                                 int     vsb_width,
+                                 int     hsb_height)
 {
-       double scale = 1.0;
-       int width;
+       int doc_width, doc_height;
+       GtkBorder border;
+       gdouble scale;
+
+       ev_page_cache_get_max_width_size (view->page_cache,
+                                         1.0,
+                                         &doc_width, NULL);
+       ev_page_cache_get_max_height_size (view->page_cache,
+                                          1.0,
+                                          NULL, &doc_height);
+       compute_border (view, doc_width, doc_height, &border);
+
+       width -= (border.left + border.right + 2 * view->spacing);
+       height -= (border.top + border.bottom + 2 * view->spacing);
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
+               scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width);
+       else if (view->sizing_mode == EV_SIZING_BEST_FIT)
+               scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height);
+       else
+               g_assert_not_reached ();
 
-       width = 0;
-       ev_document_get_page_size (view->document, &width, NULL);
+       ev_view_zoom (view, scale, FALSE);
+}
 
-       scale = 1.0;
-       if (width != 0)
-               scale = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
+static void
+ev_view_zoom_for_size_dual_page (EvView *view,
+                                int     width,
+                                int     height,
+                                int     vsb_width,
+                                int     hsb_height)
+{
+       GtkBorder border;
+       gint doc_width, doc_height;
+       gdouble scale;
+       gint other_page;
+
+       other_page = view->current_page ^ 1;
+
+       /* Find the largest of the two. */
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               1.0,
+                               &doc_width, &doc_height);
+
+       if (other_page < ev_page_cache_get_n_pages (view->page_cache)) {
+               gint width_2, height_2;
+               ev_page_cache_get_size (view->page_cache,
+                                       other_page,
+                                       1.0,
+                                       &width_2, &height_2);
+               if (width_2 > doc_width)
+                       doc_width = width_2;
+               if (height_2 > doc_height)
+                       doc_height = height_2;
+       }
+       compute_border (view, doc_width, doc_height, &border);
+
+       doc_width = doc_width * 2;
+       width -= ((border.left + border.right)* 2 + 3 * view->spacing);
+       height -= (border.top + border.bottom + 2 * view->spacing);
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
+               scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width);
+       else if (view->sizing_mode == EV_SIZING_BEST_FIT)
+               scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height);
+       else
+               g_assert_not_reached ();
 
        ev_view_zoom (view, scale, FALSE);
 }
 
 static void
-history_index_changed_cb (EvHistory  *history,
-                         GParamSpec *pspec,
-                         EvView     *view)
+ev_view_zoom_for_size_single_page (EvView *view,
+                                  int     width,
+                                  int     height,
+                                  int     vsb_width,
+                                  int     hsb_height)
 {
-       int index;
+       int doc_width, doc_height;
+       GtkBorder border;
+       gdouble scale;
+
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               1.0,
+                               &doc_width,
+                               &doc_height);
+       /* Get an approximate border */
+       compute_border (view, width, height, &border);
+
+       width -= (border.left + border.right + 2 * view->spacing);
+       height -= (border.top + border.bottom + 2 * view->spacing);
+
+       if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
+               scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width);
+       else if (view->sizing_mode == EV_SIZING_BEST_FIT)
+               scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height);
+       else
+               g_assert_not_reached ();
+
+       ev_view_zoom (view, scale, FALSE);
+}
+
 
-       index = ev_history_get_current_index (history);
-       go_to_index (view, index);
+void
+ev_view_zoom_normal (EvView *view)
+{
+       ev_view_zoom (view, 1.0, FALSE);
 }
 
 void
-ev_view_set_history (EvView     *view,
-                    EvHistory  *history)
+ev_view_set_zoom_for_size (EvView *view,
+                          int     width,
+                          int     height,
+                          int     vsb_width,
+                          int     hsb_height)
 {
-       if (view->history) {
-               g_object_unref (view->history);
-       }
+       g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
+                         view->sizing_mode == EV_SIZING_BEST_FIT);
+       g_return_if_fail (width >= 0);
+       g_return_if_fail (height >= 0);
 
-       view->history = g_object_ref (history);
-       ev_history_add_page (view->history, ev_view_get_page (view));
+       if (view->document == NULL)
+               return;
 
-       g_signal_connect (view->history, "notify::index",
-                         G_CALLBACK (history_index_changed_cb),
-                         view);
+       if (view->continuous && view->dual_page)
+               ev_view_zoom_for_size_continuous_and_dual_page (view, width, height, vsb_width, hsb_height);
+       else if (view->continuous)
+               ev_view_zoom_for_size_continuous (view, width, height, vsb_width, hsb_height);
+       else if (view->dual_page)
+               ev_view_zoom_for_size_dual_page (view, width, height, vsb_width, hsb_height);
+       else
+               ev_view_zoom_for_size_single_page (view, width, height, vsb_width, hsb_height);
 }
 
 const char *
@@ -1390,4 +2339,109 @@ ev_view_get_find_status (EvView *view)
        return view->find_status;
 }
 
+gboolean
+ev_view_can_find_next (EvView *view)
+{
+       int n_results = 0;
+
+       if (EV_IS_DOCUMENT_FIND (view->document)) {
+               EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+               ev_document_doc_mutex_lock ();
+               n_results = ev_document_find_get_n_results (find, view->current_page);
+               ev_document_doc_mutex_unlock ();
+       }
+
+       return n_results > 0;
+}
+
+void
+ev_view_find_next (EvView *view)
+{
+       EvPageCache *page_cache;
+       int n_results, n_pages;
+       EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+       page_cache = ev_document_get_page_cache (view->document);
+       ev_document_doc_mutex_lock ();
+       n_results = ev_document_find_get_n_results (find, view->current_page);
+       ev_document_doc_mutex_unlock ();
+
+       n_pages = ev_page_cache_get_n_pages (page_cache);
+
+       view->find_result++;
+
+       if (view->find_result >= n_results) {
+               view->find_result = 0;
+               view->find_page++;
+
+               if (view->find_page >= n_pages) {
+                       view->find_page = 0;
+               }
+
+               jump_to_find_page (view);
+       } else {
+               jump_to_find_result (view);
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+       }
+}
+
+void
+ev_view_find_previous (EvView *view)
+{
+       int n_results, n_pages;
+       EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+       EvPageCache *page_cache;
 
+       page_cache = ev_document_get_page_cache (view->document);
+
+       ev_document_doc_mutex_lock ();
+       n_results = ev_document_find_get_n_results (find, view->current_page);
+       ev_document_doc_mutex_unlock ();
+
+       n_pages = ev_page_cache_get_n_pages (page_cache);
+
+       view->find_result--;
+
+       if (view->find_result < 0) {
+               view->find_result = 0;
+               view->find_page--;
+
+               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);
+}
+
+
+GType
+ev_sizing_mode_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" },
+      { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" },
+      { EV_SIZING_FREE, "EV_SIZING_FREE", "free" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("EvSizingMode", values);
+  }
+  return etype;
+}