]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-view.c
add -s option for thumbnail size.
[evince.git] / shell / ev-view.c
index f2f879b8bb7261f94c805022ee20e802095a38ee..372d4a362262e859d7a1d9117e33db2b6a5e8b7c 100644 (file)
@@ -29,6 +29,8 @@
 #include "ev-marshal.h"
 #include "ev-view.h"
 #include "ev-document-find.h"
+#include "ev-document-misc.h"
+#include "ev-debug.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))
@@ -58,14 +60,20 @@ static const GtkTargetEntry targets[] = {
 typedef enum {
        EV_VIEW_CURSOR_NORMAL,
        EV_VIEW_CURSOR_LINK,
-       EV_VIEW_CURSOR_WAIT
+       EV_VIEW_CURSOR_WAIT,
+       EV_VIEW_CURSOR_HIDDEN
 } EvViewCursor;
 
+#define ZOOM_IN_FACTOR  1.2
+#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
+
+#define MIN_SCALE 0.05409
+#define MAX_SCALE 18.4884
+
 struct _EvView {
        GtkWidget parent_instance;
 
        EvDocument *document;
-       EvHistory  *history;
        
        GdkWindow *bin_window;
 
@@ -77,18 +85,20 @@ struct _EvView {
 
        gboolean pressed_button;
        gboolean has_selection;
+       GdkPoint selection_start;
        GdkRectangle selection;
        EvViewCursor cursor;
 
        GtkAdjustment *hadjustment;
        GtkAdjustment *vadjustment;
 
-        GArray *find_results;
-       int results_on_this_page;
-       int next_page_with_result;
-       double find_percent_complete;
+       int find_page;
+       int find_result;
+       int spacing;
 
        double scale;
+       int width;
+       int height;
 };
 
 struct _EvViewClass {
@@ -184,17 +194,13 @@ ev_view_finalize (GObject *object)
 {
        EvView *view = EV_VIEW (object);
 
+       LOG ("Finalize");
+
        if (view->document)
                g_object_unref (view->document);
 
-       if (view->history)
-               g_object_unref (view->history);
-
        ev_view_set_scroll_adjustments (view, NULL, NULL);
 
-        g_array_free (view->find_results, TRUE);
-        view->find_results = NULL;
-        
        G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
 
@@ -208,26 +214,85 @@ ev_view_destroy (GtkObject *object)
        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;
+       GtkBorder border;
+
+       g_return_if_fail (EV_IS_DOCUMENT (document));
+
+       ev_document_get_page_size (document, -1, &width, &height);
+       ev_document_misc_get_page_border_size (width, height, &border);
+       
+       *x_offset = view->spacing;
+       *y_offset = view->spacing;
+       target_width = width + border.left + border.right + view->spacing * 2;
+       target_height = height + border.top + 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, GdkRectangle *doc_rect)
+{
+       int x_offset, y_offset;
+
+       ev_view_get_offsets (view, &x_offset, &y_offset); 
+       doc_rect->x = (view_rect->x - x_offset) / view->scale;
+       doc_rect->y = (view_rect->y - y_offset) / view->scale;
+       doc_rect->width = view_rect->width / view->scale;
+       doc_rect->height = view_rect->height / view->scale;
+}
+
+static void
+doc_rect_to_view_rect (EvView *view, GdkRectangle *doc_rect, GdkRectangle *view_rect)
+{
+       int x_offset, y_offset;
+
+       ev_view_get_offsets (view, &x_offset, &y_offset); 
+       view_rect->x = doc_rect->x * view->scale + x_offset;
+       view_rect->y = doc_rect->y * view->scale + y_offset;
+       view_rect->width = doc_rect->width * view->scale;
+       view_rect->height = doc_rect->height * view->scale;
+}
+
 static void
 ev_view_size_request (GtkWidget      *widget,
                      GtkRequisition *requisition)
 {
        EvView *view = EV_VIEW (widget);
+       GtkBorder border;
+       gint width, height;
 
-       if (GTK_WIDGET_REALIZED (widget)) {
-               if (view->document) {
-                       ev_document_get_page_size (view->document,
-                                                  &requisition->width,
-                                                  &requisition->height);
-               } else {
-                       requisition->width = 10;
-                       requisition->height = 10;
-               }
+       if (!GTK_WIDGET_REALIZED (widget))
+               return;
 
-               requisition->width += 2;
-               requisition->height += 2;
+       if (!view->document) {
+               requisition->width = 1;
+               requisition->height = 1;
+               return;
+       }
+
+       ev_document_get_page_size (view->document, -1,
+                                  &width, &height);
+       ev_document_misc_get_page_border_size (width, height, &border);
+
+       if (view->width >= 0) {
+               requisition->width = 0;
+       } else {
+               requisition->width = width + border.left + border.right +
+                                    view->spacing * 2;
+       }
+       
+       if (view->height >= 0) {
+               requisition->height = 0;
+       } else {
+               requisition->height = height + border.top + border.bottom +
+                                     view->spacing * 2;
        }
-  
 }
 
 static void
@@ -256,6 +321,7 @@ ev_view_realize (GtkWidget *widget)
 
        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);
@@ -274,6 +340,7 @@ 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;
@@ -284,7 +351,8 @@ 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,
@@ -335,7 +403,8 @@ ev_gdk_color_to_rgb (const GdkColor *color)
 }
 
 static void
-draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
+draw_rubberband (GtkWidget *widget, GdkWindow *window,
+                const GdkRectangle *rect, guchar alpha)
 {
        GdkGC *gc;
        GdkPixbuf *pixbuf;
@@ -343,7 +412,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);
@@ -369,58 +438,81 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, const GdkRectangle *rect)
        gdk_color_free (fill_color_gdk);
 }
 
+static void
+highlight_find_results (EvView *view)
+{
+       EvDocumentFind *find;
+       int i, results;
+
+       g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
+
+       find = EV_DOCUMENT_FIND (view->document);
+
+       results = ev_document_find_get_n_results (find);
+
+       for (i = 0; i < results; i++) {
+               GdkRectangle rectangle;
+               guchar alpha;
+
+               alpha = (i == view->find_result) ? 0x90 : 0x20;
+               ev_document_find_get_result (find, i, &rectangle);
+               draw_rubberband (GTK_WIDGET (view), view->bin_window,
+                                &rectangle, alpha);
+        }
+}
+
+
 static void
 expose_bin_window (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
        EvView *view = EV_VIEW (widget);
-        int i, current_page;
+       GtkBorder border;
+       gint width, height;
+       GdkRectangle area;
        int x_offset, y_offset;
-        const EvFindResult *results;
 
        if (view->document == NULL)
                return;
 
-       x_offset = MAX (0, (widget->allocation.width -
-                           widget->requisition.width) / 2);
-       y_offset = MAX (0, (widget->allocation.height -
-                           widget->requisition.height) / 2);
-       gdk_draw_rectangle (view->bin_window,
-                            widget->style->black_gc,
-                            FALSE,
-                            x_offset,
-                           y_offset,
-                            widget->requisition.width - 1,
-                           widget->requisition.height - 1);
-
+       ev_view_get_offsets (view, &x_offset, &y_offset); 
+       ev_document_get_page_size (view->document, -1,
+                                  &width, &height);
+       ev_document_misc_get_page_border_size (width, height, &border);
+       
+       /* Paint the frame */
+       area.x = x_offset;
+       area.y = y_offset;
+       area.width = width + border.left + border.right;
+       area.height = height + border.top + border.bottom;
+       ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border);
+
+       /* Render the document itself */
        ev_document_set_page_offset (view->document,
-                                    x_offset + 1,
-                                    y_offset + 1);
+                                    x_offset + border.left,
+                                    y_offset + border.top);
+
+       LOG ("Render area %d %d %d %d - Offset %d %d",
+            event->area.x, event->area.y,
+             event->area.width, event->area.height,
+            x_offset, y_offset);
 
        ev_document_render (view->document,
                            event->area.x, event->area.y,
                            event->area.width, event->area.height);
 
-        results = (EvFindResult*) view->find_results->data;
-       current_page = ev_document_get_page (view->document);
-        i = 0;
-        while (i < view->find_results->len) {
-#if 0
-                g_printerr ("highlighting result %d page %d at %d,%d %dx%d\n",
-                            i, results[i].page_num,
-                            results[i].highlight_area.x,
-                            results[i].highlight_area.y,
-                            results[i].highlight_area.width,
-                            results[i].highlight_area.height);
-#endif
-               if (results[i].page_num == current_page)
-                       draw_rubberband (widget, view->bin_window,
-                                        &results[i].highlight_area);
-                ++i;
-        }
+       if (EV_IS_DOCUMENT_FIND (view->document)) {
+               highlight_find_results (view);
+       }
 
        if (view->has_selection) {
-               draw_rubberband (widget, view->bin_window, &view->selection);
+               GdkRectangle rubberband;
+
+               doc_rect_to_view_rect (view, &view->selection, &rubberband);
+               if (rubberband.width > 0 && rubberband.height > 0) {
+                       draw_rubberband (widget, view->bin_window,
+                                        &rubberband, 0x40);
+               }
        }
 }
 
@@ -442,13 +534,23 @@ void
 ev_view_select_all (EvView *ev_view)
 {
        GtkWidget *widget = GTK_WIDGET (ev_view);
+       GdkRectangle selection;
+       int width, height;
+       int x_offset, y_offset;
+       GtkBorder border;
 
        g_return_if_fail (EV_IS_VIEW (ev_view));
 
+       ev_view_get_offsets (ev_view, &x_offset, &y_offset);
+       ev_document_get_page_size (ev_view->document, -1, &width, &height);
+       ev_document_misc_get_page_border_size (width, height, &border);
+
        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 + border.left;
+        selection.y = y_offset + border.top;
+       selection.width = width;
+       selection.height = height;
+       view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection);
 
        gtk_widget_queue_draw (widget);
 }
@@ -457,9 +559,11 @@ void
 ev_view_copy (EvView *ev_view)
 {
        GtkClipboard *clipboard;
+       GdkRectangle selection;
        char *text;
 
-       text = ev_document_get_text (ev_view->document, &ev_view->selection);
+       doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+       text = ev_document_get_text (ev_view->document, &selection);
        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                              GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text (clipboard, text, -1);
@@ -473,9 +577,11 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
                        gpointer          data)
 {
        EvView *ev_view = EV_VIEW (data);
+       GdkRectangle selection;
        char *text;
 
-       text = ev_document_get_text (ev_view->document, &ev_view->selection);
+       doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+       text = ev_document_get_text (ev_view->document, &selection);
        gtk_selection_data_set_text (selection_data, text, -1);
 }
 
@@ -529,10 +635,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;
        }
 
@@ -588,6 +692,18 @@ ev_view_set_find_status (EvView *view, const char *message)
        g_object_notify (G_OBJECT (view), "find-status");
 }
 
+static GdkCursor *
+ev_view_create_invisible_cursor(void)
+{
+       GdkBitmap *empty;
+       GdkColor black = { 0, 0, 0, 0 };
+       static unsigned char bits[] = { 0x00 };
+
+       empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
+
+       return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0);
+}
+
 static void
 ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
 {
@@ -613,6 +729,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) {
@@ -629,11 +749,16 @@ 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;
 
@@ -655,8 +780,6 @@ ev_view_motion_notify_event (GtkWidget      *widget,
                }
        }
 
-       gtk_widget_queue_draw (widget);
-
        return TRUE;
 }
 
@@ -909,142 +1032,208 @@ ev_view_init (EvView *view)
 {
        GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
 
+       view->spacing = 10;
        view->scale = 1.0;
        view->pressed_button = -1;
        view->cursor = EV_VIEW_CURSOR_NORMAL;
-       
-        view->find_results = g_array_new (FALSE,
-                                          FALSE,
-                                          sizeof (EvFindResult));
-       view->results_on_this_page = 0;
-       view->next_page_with_result = 0;
 }
 
-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;
+
+       if (ev_document_get_page (view->document) == view->find_page) {
+               int results;
+
+               results = ev_document_find_get_n_results
+                               (EV_DOCUMENT_FIND (view->document));
+
+               /* 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;
+               
+               percent = ev_document_find_get_progress
+                               (EV_DOCUMENT_FIND (view->document));
+
+               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_view_set_find_status (view, message);
+       g_free (message);
 }
 
 static void
-update_find_results (EvView *view)
+set_document_page (EvView *view, int new_page)
 {
-       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;
+       int page;
+       int pages;
+
+       pages = ev_document_get_n_pages (view->document);
+       page = CLAMP (new_page, 1, pages);
+
+       if (view->document) {
+               int old_page = ev_document_get_page (view->document);
+               int old_width, old_height;
+
+               ev_document_get_page_size (view->document,
+                                          -1, 
+                                          &old_width, &old_height);
+
+               if (old_page != page) {
+                       if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
+                               ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
+                       }
+                       ev_document_set_page (view->document, page);
+               }
+
+               if (old_page != ev_document_get_page (view->document)) {
+                       int width, height;
                        
-                       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;
+                       g_signal_emit (view, page_changed_signal, 0);
+
+                       view->has_selection = FALSE;
+                       ev_document_get_page_size (view->document,
+                                                  -1, 
+                                                  &width, &height);
+                       if (width != old_width || height != old_height)
+                               gtk_widget_queue_resize (GTK_WIDGET (view));
+
+                       gtk_adjustment_set_value (view->vadjustment,
+                                                 view->vadjustment->lower);
+               }
+
+               if (EV_IS_DOCUMENT_FIND (view->document)) {
+                       view->find_page = page;
+                       view->find_result = 0;
+                       update_find_status_message (view);
                }
-               ++i;
        }
+}
 
-       /* If earliest page is just the current page, there is no earliest page */
-       if (earliest_page_with_result == current_page)
-               earliest_page_with_result = 0;
-       
-       /* If no next page, then wrap and the wrapped page is the next page */
-       if (next_page_with_result == 0)
-               next_page_with_result = earliest_page_with_result;
-
-       counts_changed = FALSE;
-       if (on_this_page != view->results_on_this_page ||
-           next_page_with_result != view->next_page_with_result) {
-               view->results_on_this_page = on_this_page;
-               view->next_page_with_result = next_page_with_result;
-               counts_changed = TRUE;
+#define MARGIN 5
+
+static void
+ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect)
+{
+       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 (counts_changed ||
-           view->find_results->len == 0) {
-               char *message;
+       adjustment = view->hadjustment;
 
-               message = ev_view_get_find_status_message (view);
-               ev_view_set_find_status (view, message);
-               g_free (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);
        }
 }
 
 static void
-found_results_callback (EvDocument         *document,
-                        const EvFindResult *results,
-                        int                 n_results,
-                        double              percent_complete,
-                        void               *data)
+jump_to_find_result (EvView *view)
 {
-  EvView *view = EV_VIEW (data);
-  
-  g_array_set_size (view->find_results, 0);
-
-  if (n_results > 0)
-          g_array_append_vals (view->find_results,
-                               results, n_results);
-
-#if 0
-  {
-         int i;
-
-         g_printerr ("%d results %d%%: ", n_results,
-                     (int) (percent_complete * 100));
-         i = 0;
-         while (i < n_results) {
-                 g_printerr ("%d ", results[i].page_num);
-                 ++i;
-         }
-         g_printerr ("\n");
-  }
-#endif
-
-  view->find_percent_complete = percent_complete;
-  update_find_results (view);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (view));
+       EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+       GdkRectangle rect;
+       int n_results;
+
+       n_results = ev_document_find_get_n_results (find);
+
+       if (n_results > view->find_result) {
+               ev_document_find_get_result
+                       (find, view->find_result, &rect);
+               ensure_rectangle_is_visible (view, &rect);
+       }
 }
 
 static void
-document_changed_callback (EvDocument *document,
+jump_to_find_page (EvView *view)
+{
+       int n_pages, i;
+
+       n_pages = ev_document_get_n_pages (view->document);
+
+       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;
+               }
+
+               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) {
+                       set_document_page (view, page);
+                       jump_to_find_result (view);
+                       break;
+               }
+       }
+}
+
+static void
+find_changed_cb (EvDocument *document, int page, EvView *view)
+{
+       jump_to_find_page (view);
+       jump_to_find_result (view);
+       update_find_status_message (view);
+
+       if (ev_document_get_page (document) == page) {
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+       }
+}
+
+static void
+page_changed_callback (EvDocument *document,
                           EvView     *view)
 {
+       LOG ("Page changed callback");
+
        gtk_widget_queue_draw (GTK_WIDGET (view));
-       ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+
+       if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
+               ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+       }
+}
+
+static void
+scale_changed_callback (EvDocument *document,
+                       EvView     *view)
+{
+       LOG ("Scale changed callback");
+
+       gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
 /*** Public API ***/       
@@ -1064,27 +1253,30 @@ 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->document = document;
+               view->find_page = 1;
+               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,
+                                         "page_changed",
+                                         G_CALLBACK (page_changed_callback),
+                                         view);
                        g_signal_connect (view->document,
-                                         "changed",
-                                         G_CALLBACK (document_changed_callback),
+                                         "scale_changed",
+                                         G_CALLBACK (scale_changed_callback),
                                          view);
                 }
 
@@ -1097,38 +1289,6 @@ ev_view_set_document (EvView     *view,
        }
 }
 
-static void
-set_document_page (EvView *view, int page)
-{
-       if (view->document) {
-               int old_page = ev_document_get_page (view->document);
-               int old_width, old_height;
-
-               ev_document_get_page_size (view->document,
-                                          &old_width, &old_height);
-
-               if (old_page != page) {
-                       ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
-                       ev_document_set_page (view->document, page);
-               }
-
-               if (old_page != ev_document_get_page (view->document)) {
-                       int width, height;
-                       
-                       g_signal_emit (view, page_changed_signal, 0);
-
-                       view->has_selection = FALSE;
-                       ev_document_get_page_size (view->document,
-                                                  &width, &height);
-                       if (width != old_width || height != old_height)
-                               gtk_widget_queue_resize (GTK_WIDGET (view));
-
-                       view->find_percent_complete = 0.0;
-                       update_find_results (view);     
-               }
-       }
-}
-
 static void
 go_to_link (EvView *view, EvLink *link)
 {
@@ -1155,107 +1315,16 @@ go_to_link (EvView *view, EvLink *link)
 void
 ev_view_go_to_link (EvView *view, EvLink *link)
 {
-       EvLinkType type;
-
        go_to_link (view, link);
-
-       type = ev_link_get_link_type (link);
-       if (type == EV_LINK_TYPE_PAGE) {
-               ev_history_add_link (view->history, link);
-       }
-}
-
-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);
-}
-
-gboolean
-ev_view_can_go_back (EvView *view)
-{
-       int index, n;
-
-       if (view->history == NULL) {
-               return FALSE;
-       }
-
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
-
-       if (n > 0) {
-               return index != MAX (0, index - 1);
-       } else {
-               return FALSE;
-       }
-}
-
-void
-ev_view_go_back        (EvView *view)
-{
-       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);
-       }
-}
-
-gboolean
-ev_view_can_go_forward (EvView *view)
-{
-       int index, n;
-
-       if (view->history == NULL) {
-               return FALSE;
-       }
-
-       index = ev_history_get_current_index (view->history);
-       n = ev_history_get_n_links (view->history);
-
-       if (n > 0) {
-               return  index != MIN (n - 1, index + 1);
-       } else {
-               return FALSE;
-       }
 }
 
-void
-ev_view_go_forward (EvView *view)
-{
-       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 = MIN (n - 1, index + 1);
-               ev_history_set_current_index (view->history, index);
-       }
-}
-
-
 void
 ev_view_set_page (EvView *view,
                  int     page)
 {
        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);
 }
 
 int
@@ -1267,12 +1336,6 @@ ev_view_get_page (EvView *view)
                return 1;
 }
 
-#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,
@@ -1285,94 +1348,84 @@ ev_view_zoom (EvView   *view,
        else
                scale = factor;
 
-       view->scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
+       scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 
-       ev_document_set_scale (view->document, view->scale);
+       view->scale = scale;
 
-       gtk_widget_queue_resize (GTK_WIDGET (view));
+       ev_document_set_scale (view->document, view->scale);
 }
 
 void
 ev_view_zoom_in (EvView *view)
 {
+       view->width = view->height = -1;
        ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }
 
 void
 ev_view_zoom_out (EvView *view)
 {
+       view->width = view->height = -1;
        ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
 
-void
-ev_view_normal_size (EvView *view)
+static double
+size_to_zoom_factor (EvView *view, int width, int height)
 {
-       ev_view_zoom (view, 1.0, FALSE);
-}
+       int doc_width, doc_height;
+       double scale, scale_w, scale_h;
+       GtkBorder border;
+
+       doc_width = doc_height = 0;
+       scale = scale_w = scale_h = 1.0;
+       ev_document_get_page_size (view->document, -1, &doc_width, &doc_height);
+       /* FIXME: The border size isn't constant.  Ugh.  Still, if we have extra
+        * space, we just cut it from the border */
+       ev_document_misc_get_page_border_size (doc_width, doc_height, &border);
+
+       if (doc_width == 0 && doc_height == 0) {
+               return 0;
+       }
 
-void
-ev_view_best_fit (EvView *view)
-{
-       double scale;
-       int width, height;
+       if (width >= 0) {
+               int target_width;
 
-       width = height = 0;
-       ev_document_get_page_size (view->document, &width, &height);
+               target_width = width - (view->spacing * 2 + border.left + border.right);
+               scale = scale_w = (double)target_width * view->scale / doc_width;
+       }
 
-       scale = 1.0;
-       if (width != 0 && height != 0) {
-               double scale_w, scale_h;
+       if (height >= 0) {
+               int target_height;
 
-               scale_w = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
-               scale_h = (double)GTK_WIDGET (view)->allocation.height * view->scale / height;
+               target_height = height - (view->spacing * 2 + border.top + border.bottom);
+               scale = scale_h = (double)target_height * view->scale / doc_height;
+       }
 
+       if (width >= 0 && height >= 0) {
                scale = (scale_w < scale_h) ? scale_w : scale_h;
        }
 
-       ev_view_zoom (view, scale, FALSE);
+       return scale;
 }
 
 void
-ev_view_fit_width (EvView *view)
-{
-       double scale = 1.0;
-       int width;
-
-       width = 0;
-       ev_document_get_page_size (view->document, &width, NULL);
-
-       scale = 1.0;
-       if (width != 0)
-               scale = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
-
-       ev_view_zoom (view, scale, FALSE);
-}
-
-static void
-history_index_changed_cb (EvHistory  *history,
-                         GParamSpec *pspec,
-                         EvView     *view)
+ev_view_set_size (EvView     *view,
+                 int         width,
+                 int         height)
 {
-       int index;
+       double factor;
 
-       index = ev_history_get_current_index (history);
-       go_to_index (view, index);
-}
-
-void
-ev_view_set_history (EvView     *view,
-                    EvHistory  *history)
-{
-       if (view->history) {
-               g_object_unref (view->history);
+       if (!view->document) {
+               return;
        }
 
-       view->history = g_object_ref (history);
-       ev_history_add_page (view->history, ev_view_get_page (view));
-
-       g_signal_connect (view->history, "notify::index",
-                         G_CALLBACK (history_index_changed_cb),
-                         view);
+       if (view->width != width ||
+           view->height != height) {
+               view->width = width;
+               view->height = height;
+               factor = size_to_zoom_factor (view, width, height);
+               ev_view_zoom (view, factor, FALSE); 
+       }
 }
 
 const char *
@@ -1391,4 +1444,65 @@ ev_view_get_find_status (EvView *view)
        return view->find_status;
 }
 
+void
+ev_view_find_next (EvView *view)
+{
+       int n_results, n_pages;
+       EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+       n_results = ev_document_find_get_n_results (find);
+       n_pages = ev_document_get_n_pages (view->document);
+
+       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 = 1;
+               }
+
+               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);
+
+       n_results = ev_document_find_get_n_results (find);
+       n_pages = ev_document_get_n_pages (view->document);
 
+       view->find_result--;
+
+       if (view->find_result < 0) {
+               view->find_result = 0;
+               view->find_page--;
+
+               if (view->find_page < 1) {
+                       view->find_page = n_pages;
+               }
+
+               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_LINK);
+}