Remove pixbuf backend for now

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 8998a7f161fb1050df1086836526d6c00b244243..97e0c549618fa3d754957c318b10235b3e71590c 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -31,6 +31,9 @@
 #include "ev-document-find.h"
 #include "ev-document-misc.h"
 #include "ev-debug.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))
 
 #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))


@@ -70,12 +73,6 @@ typedef enum {
 #define MIN_SCALE 0.05409
 #define MAX_SCALE 18.4884
 
 #define MIN_SCALE 0.05409
 #define MAX_SCALE 18.4884
 

-/* FIXME: temporarily setting the epsilon very high until we figure out how to
- * constrain the size of the window to a pixel width, instead of to the zoom
- * level */
-#define ZOOM_EPSILON 1e-2
-
-

 struct _EvView {
        GtkWidget parent_instance;
 
 struct _EvView {
        GtkWidget parent_instance;
 


@@ -98,12 +95,19 @@ struct _EvView {
        GtkAdjustment *hadjustment;
        GtkAdjustment *vadjustment;
 
        GtkAdjustment *hadjustment;
        GtkAdjustment *vadjustment;
 

+       EvPageCache *page_cache;
+       EvPixbufCache *pixbuf_cache;
+
+       gint current_page;
+       EvJobRender *current_job;
+

        int find_page;
        int find_result;
        int spacing;
 
        double scale;
        int find_page;
        int find_result;
        int spacing;
 
        double scale;

-       EvSizingMode sizing_mode;
+       int width;
+       int height;

 };
 
 struct _EvViewClass {
 };
 
 struct _EvViewClass {


@@ -116,11 +120,8 @@ struct _EvViewClass {
                                           GtkScrollType   scroll,
                                           gboolean        horizontal);
        
                                           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,
 
 static void ev_view_set_scroll_adjustments (EvView         *view,
                                            GtkAdjustment  *hadjustment,


@@ -201,8 +202,6 @@ ev_view_finalize (GObject *object)
 
        LOG ("Finalize");
 
 
        LOG ("Finalize");
 

-       if (view->document)
-               g_object_unref (view->document);

 
        ev_view_set_scroll_adjustments (view, NULL, NULL);
 
 
        ev_view_set_scroll_adjustments (view, NULL, NULL);
 


@@ -214,11 +213,71 @@ ev_view_destroy (GtkObject *object)
 {
        EvView *view = EV_VIEW (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);
 }
 
        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;
+       GtkBorder border;
+
+       g_return_if_fail (EV_IS_DOCUMENT (document));
+
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &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;
+}
+
+
+/* Called by size_request to make sure we have appropriate jobs running.
+ */

 static void
 ev_view_size_request (GtkWidget      *widget,
                      GtkRequisition *requisition)
 static void
 ev_view_size_request (GtkWidget      *widget,
                      GtkRequisition *requisition)


@@ -227,35 +286,38 @@ ev_view_size_request (GtkWidget      *widget,
        GtkBorder border;
        gint width, height;
 
        GtkBorder border;
        gint width, height;
 

-       if (! GTK_WIDGET_REALIZED (widget))
+       if (!GTK_WIDGET_REALIZED (widget))

                return;
 
                return;
 

-       if (! view->document) {
+       if (!view->document) {

                requisition->width = 1;
                requisition->height = 1;
                return;
        }
 
                requisition->width = 1;
                requisition->height = 1;
                return;
        }
 

-       ev_document_get_page_size (view->document, -1,
-                                  &width, &height);
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &width, &height);
+
+       ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
+                                       view->current_page,
+                                       view->current_page,
+                                       view->scale);

        ev_document_misc_get_page_border_size (width, height, &border);
 
        ev_document_misc_get_page_border_size (width, height, &border);
 

-       switch (view->sizing_mode) {
-       case EV_SIZING_BEST_FIT:
-               requisition->width = MIN_SCALE * ((float) width) / view->scale;
-               requisition->height = MIN_SCALE * ((float) height) / view->scale;
-               break;
-       case EV_SIZING_FIT_WIDTH:
-               requisition->width = MIN_SCALE * ((float) width) / view->scale;
-               requisition->height = height + border.top + border.bottom;
-               requisition->height += view->spacing * 2;
-               break;
-       case EV_SIZING_FREE:
-               requisition->width = width + border.left + border.right;
-               requisition->height = height + border.top + border.bottom;
-               requisition->width += view->spacing * 2;
-               requisition->height += view->spacing * 2;
-               break;
+       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;

        }
 }
 
        }
 }
 


@@ -330,8 +392,6 @@ ev_view_realize (GtkWidget *widget)
        gdk_window_set_background (view->bin_window, &widget->style->mid[widget->state]);
 
        if (view->document) {
        gdk_window_set_background (view->bin_window, &widget->style->mid[widget->state]);
 
        if (view->document) {

-               ev_document_set_target (view->document, view->bin_window);
-

                /* We can't get page size without a target, so we have to
                 * queue a size request at realization. Could be fixed
                 * with EvDocument changes to allow setting a GdkScreen
                /* 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


@@ -346,9 +406,6 @@ ev_view_unrealize (GtkWidget *widget)
 {
        EvView *view = EV_VIEW (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;
        gdk_window_set_user_data (view->bin_window, NULL);
        gdk_window_destroy (view->bin_window);
        view->bin_window = NULL;


@@ -406,20 +463,26 @@ static void
 highlight_find_results (EvView *view)
 {
        EvDocumentFind *find;
 highlight_find_results (EvView *view)
 {
        EvDocumentFind *find;

-       int i, results;
+       int i, results = 0;

 
        g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
 
        find = EV_DOCUMENT_FIND (view->document);
 
 
        g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
 
        find = EV_DOCUMENT_FIND (view->document);
 

+#if 0
+       g_mutex_lock (EV_DOC_MUTEX);

        results = ev_document_find_get_n_results (find);
        results = ev_document_find_get_n_results (find);

-
+       g_mutex_unlock (EV_DOC_MUTEX);
+#endif
+       

        for (i = 0; i < results; i++) {
                GdkRectangle rectangle;
                guchar alpha;
 
                alpha = (i == view->find_result) ? 0x90 : 0x20;
        for (i = 0; i < results; i++) {
                GdkRectangle rectangle;
                guchar alpha;
 
                alpha = (i == view->find_result) ? 0x90 : 0x20;

+               g_mutex_lock (EV_DOC_MUTEX);

                ev_document_find_get_result (find, i, &rectangle);
                ev_document_find_get_result (find, i, &rectangle);

+               g_mutex_unlock (EV_DOC_MUTEX);

                draw_rubberband (GTK_WIDGET (view), view->bin_window,
                                 &rectangle, alpha);
         }
                draw_rubberband (GTK_WIDGET (view), view->bin_window,
                                 &rectangle, alpha);
         }


@@ -431,27 +494,24 @@ expose_bin_window (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
        EvView *view = EV_VIEW (widget);
                   GdkEventExpose *event)
 {
        EvView *view = EV_VIEW (widget);

-       int x_offset, y_offset;

        GtkBorder border;
        gint width, height;
        GdkRectangle area;
        GtkBorder border;
        gint width, height;
        GdkRectangle area;

-       int target_width, target_height;
-                       
+       int x_offset, y_offset;
+       GdkPixbuf *scaled_image;
+       GdkPixbuf *current_pixbuf;
+

        if (view->document == NULL)
                return;
 
        if (view->document == NULL)
                return;
 

-       ev_document_get_page_size (view->document, -1,
-                                  &width, &height);
+       ev_view_get_offsets (view, &x_offset, &y_offset); 
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &width, &height);
+

        ev_document_misc_get_page_border_size (width, height, &border);
        
        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);
-

        /* Paint the frame */
        area.x = x_offset;
        area.y = y_offset;
        /* Paint the frame */
        area.x = x_offset;
        area.y = y_offset;


@@ -460,24 +520,47 @@ expose_bin_window (GtkWidget      *widget,
        ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border);
 
        /* Render the document itself */
        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 + border.left,
-                                    y_offset + border.top);
-
-       LOG ("Render area %d %d %d %d", event->area.x, event->area.y,
-             event->area.width, event->area.height);
-
-       ev_document_render (view->document,
-                           event->area.x, event->area.y,
-                           event->area.width, event->area.height);
+       LOG ("Render area %d %d %d %d - Offset %d %d",
+            event->area.x, event->area.y,
+             event->area.width, event->area.height,
+            x_offset, y_offset);
+
+       current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, view->current_page);
+
+       if (current_pixbuf == NULL)
+               scaled_image = NULL;
+       else if (width == gdk_pixbuf_get_width (current_pixbuf) &&
+                height == gdk_pixbuf_get_height (current_pixbuf))
+               scaled_image = g_object_ref (current_pixbuf);
+       else
+               scaled_image = gdk_pixbuf_scale_simple (current_pixbuf,
+                                                       width, height,
+                                                       GDK_INTERP_NEAREST);
+       if (scaled_image) {
+               gdk_draw_pixbuf (view->bin_window,
+                                GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
+                                scaled_image,
+                                0, 0,
+                                area.x + border.left,
+                                area.y + border.top,
+                                width, height,
+                                GDK_RGB_DITHER_NORMAL,
+                                0, 0);
+               g_object_unref (scaled_image);
+       }

 
        if (EV_IS_DOCUMENT_FIND (view->document)) {
                highlight_find_results (view);
        }
 
        if (view->has_selection) {
 
        if (EV_IS_DOCUMENT_FIND (view->document)) {
                highlight_find_results (view);
        }
 
        if (view->has_selection) {

-               draw_rubberband (widget, view->bin_window,
-                                &view->selection, 0x40);
+               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);
+               }

        }
 }
 
        }
 }
 


@@ -499,13 +582,27 @@ void
 ev_view_select_all (EvView *ev_view)
 {
        GtkWidget *widget = GTK_WIDGET (ev_view);
 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));
 
 
        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_document_misc_get_page_border_size (width, height, &border);
+

        ev_view->has_selection = TRUE;
        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);
 }
 
        gtk_widget_queue_draw (widget);
 }


@@ -514,9 +611,14 @@ void
 ev_view_copy (EvView *ev_view)
 {
        GtkClipboard *clipboard;
 ev_view_copy (EvView *ev_view)
 {
        GtkClipboard *clipboard;

+       GdkRectangle selection;

        char *text;
 
        char *text;
 

-       text = ev_document_get_text (ev_view->document, &ev_view->selection);
+       doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+       g_mutex_lock (EV_DOC_MUTEX);
+       text = ev_document_get_text (ev_view->document, &selection);
+       g_mutex_unlock (EV_DOC_MUTEX);
+

        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                              GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text (clipboard, text, -1);
        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                              GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text (clipboard, text, -1);


@@ -530,9 +632,13 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
                        gpointer          data)
 {
        EvView *ev_view = EV_VIEW (data);
                        gpointer          data)
 {
        EvView *ev_view = EV_VIEW (data);

+       GdkRectangle selection;

        char *text;
 
        char *text;
 

-       text = ev_document_get_text (ev_view->document, &ev_view->selection);
+       doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+       g_mutex_lock (EV_DOC_MUTEX);
+       text = ev_document_get_text (ev_view->document, &selection);
+       g_mutex_unlock (EV_DOC_MUTEX);

        gtk_selection_data_set_text (selection_data, text, -1);
 }
 
        gtk_selection_data_set_text (selection_data, text, -1);
 }
 


@@ -598,14 +704,15 @@ static char *
 status_message_from_link (EvLink *link)
 {
        EvLinkType type;
 status_message_from_link (EvLink *link)
 {
        EvLinkType type;

-       char *msg;
+       char *msg = NULL;

        int page;
 
        type = ev_link_get_link_type (link);
        
        switch (type) {
                case EV_LINK_TYPE_TITLE:
        int page;
 
        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);
                        break;
                case EV_LINK_TYPE_PAGE:
                        page = ev_link_get_page (link);


@@ -615,7 +722,7 @@ status_message_from_link (EvLink *link)
                        msg = g_strdup (ev_link_get_uri (link));
                        break;
                default:
                        msg = g_strdup (ev_link_get_uri (link));
                        break;
                default:

-                       msg = NULL;
+                       break;

        }
 
        return msg;
        }
 
        return msg;


@@ -648,7 +755,7 @@ ev_view_create_invisible_cursor(void)
 {
        GdkBitmap *empty;
        GdkColor black = { 0, 0, 0, 0 };
 {
        GdkBitmap *empty;
        GdkColor black = { 0, 0, 0, 0 };

-       static unsigned char bits[] = { 0x00 };
+       static char bits[] = { 0x00 };

 
        empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
 
 
        empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
 


@@ -693,6 +800,56 @@ 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)
+{
+       GtkBorder border;
+       gint width, height;
+
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &width, &height);
+       ev_document_misc_get_page_border_size (width, height, &border);
+
+       x -= (border.left + view->spacing);
+       y -= (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)
 static gboolean
 ev_view_motion_notify_event (GtkWidget      *widget,
                             GdkEventMotion *event)


@@ -700,17 +857,20 @@ ev_view_motion_notify_event (GtkWidget      *widget,
        EvView *view = EV_VIEW (widget);
 
        if (view->pressed_button > 0) {
        EvView *view = EV_VIEW (widget);
 
        if (view->pressed_button > 0) {

+               GdkRectangle selection;
+

                view->has_selection = TRUE;
                view->has_selection = TRUE;

-               view->selection.x = MIN (view->selection_start.x, event->x);
-               view->selection.y = MIN (view->selection_start.y, event->y);
-               view->selection.width = ABS (view->selection_start.x - event->x) + 1;
-               view->selection.height = ABS (view->selection_start.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;
 
 
                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;
 
                 if (link) {
                        char *msg;
 


@@ -718,8 +878,6 @@ ev_view_motion_notify_event (GtkWidget      *widget,
                        ev_view_set_status (view, msg);
                        ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
                        g_free (msg);
                        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) {
                } else {
                        ev_view_set_status (view, NULL);
                        if (view->cursor == EV_VIEW_CURSOR_LINK) {


@@ -744,12 +902,9 @@ ev_view_button_release_event (GtkWidget      *widget,
        } else if (view->document) {
                EvLink *link;
 
        } 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);
                if (link) {
                        ev_view_go_to_link (view, link);

-                       g_object_unref (link);

                }
        }
 
                }
        }
 


@@ -829,9 +984,9 @@ ev_view_scroll_view (EvView *view,
                     gboolean horizontal)
 {
        if (scroll == GTK_SCROLL_PAGE_BACKWARD) {
                     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) {
        } 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 {
                GtkAdjustment *adjustment;
                double value;
        } else {
                GtkAdjustment *adjustment;
                double value;


@@ -930,13 +1085,6 @@ ev_view_class_init (EvViewClass *class)
                                                                     G_TYPE_NONE, 2,
                                                                     GTK_TYPE_ADJUSTMENT,
                                                                     GTK_TYPE_ADJUSTMENT);
                                                                     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),
 
        g_signal_new ("scroll_view",
                      G_TYPE_FROM_CLASS (object_class),


@@ -982,9 +1130,9 @@ ev_view_init (EvView *view)
 
        view->spacing = 10;
        view->scale = 1.0;
 
        view->spacing = 10;
        view->scale = 1.0;

+       view->current_page = 0;

        view->pressed_button = -1;
        view->cursor = EV_VIEW_CURSOR_NORMAL;
        view->pressed_button = -1;
        view->cursor = EV_VIEW_CURSOR_NORMAL;

-       view->sizing_mode = EV_SIZING_BEST_FIT;

 }
 
 static void
 }
 
 static void


@@ -992,20 +1140,28 @@ update_find_status_message (EvView *view)
 {
        char *message;
 
 {
        char *message;
 

+//     g_mutex_lock (EV_DOC_MUTEX);

        if (ev_document_get_page (view->document) == view->find_page) {
                int results;
 
        if (ev_document_get_page (view->document) == view->find_page) {
                int results;
 

+//             g_mutex_lock (EV_DOC_MUTEX);

                results = ev_document_find_get_n_results
                                (EV_DOCUMENT_FIND (view->document));
                results = ev_document_find_get_n_results
                                (EV_DOCUMENT_FIND (view->document));

-
-               message = g_strdup_printf (_("%d found on this page"),
+//             g_mutex_unlock (EV_DOC_MUTEX);
+               /* TRANS: Sometimes this could be better translated as
+                  "%d hit(s) on this page".  Therefore this string
+                  contains plural cases. */
+               message = g_strdup_printf (ngettext ("%d found on this page",
+                                                    "%d found on this page",
+                                                    results),

                                           results);
        } else {
                double percent;
                                           results);
        } else {
                double percent;

-               
+
+               g_mutex_lock (EV_DOC_MUTEX);

                percent = ev_document_find_get_progress
                                (EV_DOCUMENT_FIND (view->document));
                percent = ev_document_find_get_progress
                                (EV_DOCUMENT_FIND (view->document));

-
+               g_mutex_unlock (EV_DOC_MUTEX);

                if (percent >= (1.0 - 1e-10)) {
                        message = g_strdup (_("Not found"));
                } else {
                if (percent >= (1.0 - 1e-10)) {
                        message = g_strdup (_("Not found"));
                } else {


@@ -1014,57 +1170,10 @@ update_find_status_message (EvView *view)
                }
                
        }
                }
                
        }

+//     g_mutex_unlock (EV_DOC_MUTEX);

 
        ev_view_set_find_status (view, message);
 
        ev_view_set_find_status (view, message);

-       g_free (message);
-}
-
-static void
-set_document_page (EvView *view, int new_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;
-                       
-                       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);
-               }
-       }
+//     g_free (message);

 }
 
 #define MARGIN 5
 }
 
 #define MARGIN 5


@@ -1108,11 +1217,16 @@ jump_to_find_result (EvView *view)
        GdkRectangle rect;
        int n_results;
 
        GdkRectangle rect;
        int n_results;
 

+       g_mutex_lock (EV_DOC_MUTEX);

        n_results = ev_document_find_get_n_results (find);
        n_results = ev_document_find_get_n_results (find);

+       g_mutex_unlock (EV_DOC_MUTEX);

 
        if (n_results > view->find_result) {
 
        if (n_results > view->find_result) {

+               g_mutex_lock (EV_DOC_MUTEX);

                ev_document_find_get_result
                        (find, view->find_result, &rect);
                ev_document_find_get_result
                        (find, view->find_result, &rect);

+               g_mutex_unlock (EV_DOC_MUTEX);
+

                ensure_rectangle_is_visible (view, &rect);
        }
 }
                ensure_rectangle_is_visible (view, &rect);
        }
 }


@@ -1122,7 +1236,7 @@ jump_to_find_page (EvView *view)
 {
        int n_pages, i;
 
 {
        int n_pages, i;
 

-       n_pages = ev_document_get_n_pages (view->document);
+       n_pages = ev_page_cache_get_n_pages (view->page_cache);

 
        for (i = 0; i <= n_pages; i++) {
                int has_results;
 
        for (i = 0; i <= n_pages; i++) {
                int has_results;


@@ -1133,13 +1247,14 @@ jump_to_find_page (EvView *view)
                        page = page - n_pages;
                }
 
                        page = page - n_pages;
                }
 

+               g_mutex_lock (EV_DOC_MUTEX);

                has_results = ev_document_find_page_has_results
                                (EV_DOCUMENT_FIND (view->document), page);
                if (has_results == -1) {
                        view->find_page = page;
                        break;
                } else if (has_results == 1) {
                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);
+                       ev_page_cache_set_current_page (view->page_cache, page);

                        jump_to_find_result (view);
                        break;
                }
                        jump_to_find_result (view);
                        break;
                }


@@ -1153,28 +1268,75 @@ find_changed_cb (EvDocument *document, int page, EvView *view)
        jump_to_find_result (view);
        update_find_status_message (view);
 
        jump_to_find_result (view);
        update_find_status_message (view);
 

+#if 0
+       /* FIXME: */

        if (ev_document_get_page (document) == page) {
                gtk_widget_queue_draw (GTK_WIDGET (view));
        }
        if (ev_document_get_page (document) == page) {
                gtk_widget_queue_draw (GTK_WIDGET (view));
        }

+#endif
+}
+/*** Public API ***/       
+     
+GtkWidget*
+ev_view_new (void)
+{
+       return g_object_new (EV_TYPE_VIEW, NULL);

 }
 
 static void
 }
 
 static void

-document_changed_callback (EvDocument *document,
-                          EvView     *view)
+job_finished_cb (EvPixbufCache *pixbuf_cache,
+                EvView        *view)

 {
        gtk_widget_queue_draw (GTK_WIDGET (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;
+
+       if (old_page == new_page)
+               return;
+
+       ev_page_cache_get_size (page_cache,
+                               old_page,
+                               view->scale,
+                               &old_width, &old_height);
+       ev_page_cache_get_size (page_cache,
+                               new_page,
+                               view->scale,
+                               &new_width, &new_height);

 
        if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
 
        if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {

-               ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+               //ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);

        }
        }

-}

 
 

-/*** Public API ***/       
-     
-GtkWidget*
-ev_view_new (void)
-{
-       return g_object_new (EV_TYPE_VIEW, NULL);
+       view->current_page = new_page;
+       view->has_selection = FALSE;
+
+       ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
+                                       view->current_page,
+                                       view->current_page,
+                                       view->scale);
+
+       if (new_width != old_width || new_height != old_height)
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       else
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+       
+       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);
+       }

 }
 
 void
 }
 
 void


@@ -1189,6 +1351,8 @@ ev_view_set_document (EvView     *view,
                                                               find_changed_cb,
                                                               view);
                        g_object_unref (view->document);
                                                               find_changed_cb,
                                                               view);
                        g_object_unref (view->document);

+                       view->page_cache = NULL;
+                       

                 }
 
                view->document = document;
                 }
 
                view->document = document;


@@ -1203,32 +1367,16 @@ ev_view_set_document (EvView     *view,
                                                  G_CALLBACK (find_changed_cb),
                                                  view);
                        }
                                                  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));
                
                gtk_widget_queue_resize (GTK_WIDGET (view));

-               
-               g_signal_emit (view, page_changed_signal, 0);

        }
 }
 
        }
 }
 

-void
-ev_view_set_mode (EvView       *view,
-                 EvSizingMode  sizing_mode)
-{
-       if (view->sizing_mode == sizing_mode)
-               return;
-
-       view->sizing_mode = sizing_mode;
-       gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-

 static void
 go_to_link (EvView *view, EvLink *link)
 {
 static void
 go_to_link (EvView *view, EvLink *link)
 {


@@ -1243,7 +1391,7 @@ go_to_link (EvView *view, EvLink *link)
                        break;
                case EV_LINK_TYPE_PAGE:
                        page = ev_link_get_page (link);
                        break;
                case EV_LINK_TYPE_PAGE:
                        page = ev_link_get_page (link);

-                       set_document_page (view, page);
+                       ev_page_cache_set_current_page (view->page_cache, page);

                        break;
                case EV_LINK_TYPE_EXTERNAL_URI:
                        uri = ev_link_get_uri (link);
                        break;
                case EV_LINK_TYPE_EXTERNAL_URI:
                        uri = ev_link_get_uri (link);


@@ -1258,24 +1406,6 @@ ev_view_go_to_link (EvView *view, EvLink *link)
        go_to_link (view, link);
 }
 
        go_to_link (view, link);
 }
 

-void
-ev_view_set_page (EvView *view,
-                 int     page)
-{
-       g_return_if_fail (EV_IS_VIEW (view));
-
-       set_document_page (view, page);
-}
-
-int
-ev_view_get_page (EvView *view)
-{
-       if (view->document)
-               return ev_document_get_page (view->document);
-       else
-               return 1;
-}
-

 static void
 ev_view_zoom (EvView   *view,
              double    factor,
 static void
 ev_view_zoom (EvView   *view,
              double    factor,


@@ -1290,100 +1420,85 @@ ev_view_zoom (EvView   *view,
 
        scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 
 
        scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
 

-       if (ABS (scale - view->scale) < ZOOM_EPSILON)
-               return;
-

        view->scale = scale;
        view->scale = scale;

-
-       ev_document_set_scale (view->document, view->scale);
-

        gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
 void
 ev_view_zoom_in (EvView *view)
 {
        gtk_widget_queue_resize (GTK_WIDGET (view));
 }
 
 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)
 {
        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);
 }
 
        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);
-}
-
-/* Unfortunately this is not idempotent (!) (numerical stability
- * issues because width and height are rounded) */
-void
-ev_view_best_fit (EvView *view, int allocation_width, int allocation_height)
-{
-       int target_width, target_height;
-       int width, height;
+       int doc_width, doc_height;
+       double scale, scale_w, scale_h;

        GtkBorder border;
 
        GtkBorder border;
 

-       if (!GTK_WIDGET_REALIZED (view) || view->document == NULL)
-               return;
+       doc_width = doc_height = 0;
+       scale = scale_w = scale_h = 1.0;
+       ev_page_cache_get_size (view->page_cache,
+                               view->current_page,
+                               view->scale,
+                               &doc_width,
+                               &doc_height);

 
 

-       width = height = 0;
-       /* This is the bad part. You could make it stable by doing
-        * ev_document_set_scale 1.0. But at least with pdf this means
-        * redrawing the whole page */
-       ev_document_get_page_size (view->document, -1, &width, &height);

        /* FIXME: The border size isn't constant.  Ugh.  Still, if we have extra
         * space, we just cut it from the border */
        /* 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 (width, height, &border);
+       ev_document_misc_get_page_border_size (doc_width, doc_height, &border);
+
+       if (doc_width == 0 && doc_height == 0) {
+               return 0;
+       }

 
 

-       target_width = allocation_width - (view->spacing * 2 + border.left + border.right);
-       target_height = allocation_height - (view->spacing * 2 + border.top + border.bottom);
+       if (width >= 0) {
+               int target_width;

 
 

-       LOG ("Best fit %d %d", allocation_width, allocation_height);
+               target_width = width - (view->spacing * 2 + border.left + border.right);
+               scale = scale_w = (double)target_width * view->scale / doc_width;
+       }

 
 

-       if (width != 0 && height != 0) {
-               double scale;
-               double scale_w, scale_h;
+       if (height >= 0) {
+               int target_height;

 
 

-               scale_w = (double)target_width * view->scale / width;
-               scale_h = (double)target_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;
                scale = (scale_w < scale_h) ? scale_w : scale_h;

-
-               ev_view_zoom (view, scale, FALSE);

        }
 
        }
 

+       return scale;

 }
 
 void
 }
 
 void

-ev_view_fit_width (EvView *view, int allocation_width, int allocation_height,
-                  int vsb_width)
+ev_view_set_size (EvView     *view,
+                 int         width,
+                 int         height)

 {
 {

-       int target_width, target_height;
-       int width, height;
-       GtkBorder border;
+       double factor;

 
 

-       if (view->document == NULL)
+       if (!view->document)

                return;
 
                return;
 

-       width = height = 0;
-       ev_document_get_page_size (view->document, -1, &width, &height);
-       ev_document_misc_get_page_border_size (width, height, &border);
-
-       target_width = allocation_width - (view->spacing * 2 + border.left + border.right);
-       target_height = allocation_height - (view->spacing * 2 + border.top + border.bottom);
-
-       if (width) {
-               double scale;
-               scale = (double)target_width * view->scale / width;
-
-               if (height * scale / view->scale > target_height)
-                       scale = ((double)(target_width - vsb_width) * view->scale / width);
-
-               ev_view_zoom (view, scale, FALSE);
+       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);
+               gtk_widget_queue_resize (GTK_WIDGET (view));

        }
 }
 
        }
 }
 


@@ -1406,11 +1521,16 @@ ev_view_get_find_status (EvView *view)
 void
 ev_view_find_next (EvView *view)
 {
 void
 ev_view_find_next (EvView *view)
 {

+       EvPageCache *page_cache;

        int n_results, n_pages;
        EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
 
        int n_results, n_pages;
        EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
 

+       page_cache = ev_document_get_page_cache (view->document);
+       g_mutex_lock (EV_DOC_MUTEX);

        n_results = ev_document_find_get_n_results (find);
        n_results = ev_document_find_get_n_results (find);

-       n_pages = ev_document_get_n_pages (view->document);
+       g_mutex_unlock (EV_DOC_MUTEX);
+
+       n_pages = ev_page_cache_get_n_pages (page_cache);

 
        view->find_result++;
 
 
        view->find_result++;
 


@@ -1434,9 +1554,15 @@ ev_view_find_previous (EvView *view)
 {
        int n_results, n_pages;
        EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
 {
        int n_results, n_pages;
        EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);

+       EvPageCache *page_cache;
+
+       page_cache = ev_document_get_page_cache (view->document);

 
 

+       g_mutex_lock (EV_DOC_MUTEX);

        n_results = ev_document_find_get_n_results (find);
        n_results = ev_document_find_get_n_results (find);

-       n_pages = ev_document_get_n_pages (view->document);
+       g_mutex_unlock (EV_DOC_MUTEX);
+
+       n_pages = ev_page_cache_get_n_pages (page_cache);

 
        view->find_result--;
 
 
        view->find_result--;