X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=edc188ff612bc3e93eaf909303356a79bff3fd3e;hb=b11b81833a76cc4e8025d827e755e6ca02523222;hp=e1c84037e2209902e708ce14e4bee609cfc4e6be;hpb=acaf58f453421e81abcad501788f7c2620993d20;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index e1c84037..edc188ff 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -34,8 +34,8 @@ #include "ev-document-links.h" #include "ev-document-misc.h" #include "ev-document-transition.h" -#include "ev-page-cache.h" #include "ev-pixbuf-cache.h" +#include "ev-page-cache.h" #include "ev-transition-animation.h" #include "ev-view-marshal.h" #include "ev-document-annotations.h" @@ -51,19 +51,12 @@ enum { PROP_0, - PROP_CONTINUOUS, - PROP_DUAL_PAGE, - PROP_FULLSCREEN, PROP_PRESENTATION, - PROP_SIZING_MODE, - PROP_ZOOM, - PROP_ROTATION, - PROP_HAS_SELECTION, + PROP_HAS_SELECTION }; enum { SIGNAL_BINDING_ACTIVATED, - SIGNAL_ZOOM_INVALID, SIGNAL_HANDLE_LINK, SIGNAL_EXTERNAL_LINK, SIGNAL_POPUP_MENU, @@ -86,14 +79,9 @@ typedef enum { #define ZOOM_IN_FACTOR 1.2 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR) -#define MIN_SCALE 0.05409 -#define MAX_SCALE 4.0 - #define SCROLL_TIME 150 /*** Scrolling ***/ -static void scroll_to_current_page (EvView *view, - GtkOrientation orientation); static void ev_view_set_scroll_adjustments (GtkLayout *layout, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); @@ -114,10 +102,9 @@ static void compute_border (EvView int width, int height, GtkBorder *border); -static void get_page_y_offset (EvView *view, - int page, - double zoom, - int *y_offset); +static void get_page_y_offset (EvView *view, + int page, + int *y_offset); static gboolean get_page_extents (EvView *view, gint page, GdkRectangle *page_area, @@ -130,13 +117,14 @@ static void doc_rect_to_view_rect (EvView int page, EvRectangle *doc_rect, GdkRectangle *view_rect); +static gboolean get_dual_even_left (EvView *view); static void find_page_at_location (EvView *view, gdouble x, gdouble y, gint *page, gint *x_offset, gint *y_offset); -static gboolean doc_point_to_view_point (EvView *view, +static void doc_point_to_view_point (EvView *view, int page, EvPoint *doc_point, GdkPoint *view_point); @@ -217,11 +205,15 @@ static void ev_view_reload_page (EvView GdkRegion *region); /*** Callbacks ***/ +static void ev_view_change_page (EvView *view, + gint new_page, + gboolean start_transition); static void job_finished_cb (EvPixbufCache *pixbuf_cache, GdkRegion *region, EvView *view); -static void page_changed_cb (EvPageCache *page_cache, - int new_page, +static void ev_view_page_changed_cb (EvDocumentModel *model, + gint old_page, + gint new_page, EvView *view); static void on_adjustment_value_changed (GtkAdjustment *adjustment, EvView *view); @@ -241,45 +233,36 @@ static void ev_view_class_init (EvViewClass static void ev_view_init (EvView *view); /*** Zoom and sizing ***/ -static double zoom_for_size_fit_width (int doc_width, - int doc_height, - int target_width, - int target_height, - int vsb_width); -static double zoom_for_size_fit_height (int doc_width, - int doc_height, - int target_width, - int target_height, - int vsb_height); -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); +static double zoom_for_size_fit_width (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height); +static double zoom_for_size_fit_height (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height); +static double zoom_for_size_best_fit (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height); +static void ev_view_zoom_for_size (EvView *view, + int width, + int height); static void ev_view_zoom_for_size_presentation (EvView *view, int width, int height); static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, int width, - int height, - int vsb_width, - int hsb_height); + int height); static void ev_view_zoom_for_size_continuous (EvView *view, int width, - int height, - int vsb_width, - int hsb_height); + int height); static void ev_view_zoom_for_size_dual_page (EvView *view, int width, - int height, - int vsb_width, - int hsb_height); + int height); static void ev_view_zoom_for_size_single_page (EvView *view, int width, - int height, - int vsb_width, - int hsb_height); + int height); /*** Cursors ***/ static GdkCursor* ev_view_create_invisible_cursor (void); static void ev_view_set_cursor (EvView *view, @@ -323,43 +306,231 @@ static void ev_view_presentation_transition_stop (EvView G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT) +/* HeightToPage cache */ +#define EV_HEIGHT_TO_PAGE_CACHE_KEY "ev-height-to-page-cache" + static void -scroll_to_current_page (EvView *view, GtkOrientation orientation) +build_height_to_page (EvHeightToPageCache *cache, + EvDocument *document, + gint rotation) { - GdkPoint view_point; + gboolean swap, uniform, dual_even_left; + int i; + double uniform_height, page_height, next_page_height; + double saved_height; + gdouble u_width, u_height; + gint n_pages; - if (view->document == NULL) { - return; + swap = (rotation == 90 || rotation == 270); + + uniform = ev_document_is_page_size_uniform (document); + n_pages = ev_document_get_n_pages (document); + dual_even_left = (n_pages > 2); + + g_free (cache->height_to_page); + g_free (cache->dual_height_to_page); + + cache->rotation = rotation; + cache->height_to_page = g_new0 (gdouble, n_pages + 1); + cache->dual_height_to_page = g_new0 (gdouble, n_pages + 2); + + if (uniform) + ev_document_get_page_size (document, 0, &u_width, &u_height); + + saved_height = 0; + for (i = 0; i <= n_pages; i++) { + if (uniform) { + uniform_height = swap ? u_width : u_height; + cache->height_to_page[i] = i * uniform_height; + } else { + if (i < n_pages) { + gdouble w, h; + + ev_document_get_page_size (document, i, &w, &h); + page_height = swap ? w : h; + } else { + page_height = 0; + } + cache->height_to_page[i] = saved_height; + saved_height += page_height; + } + } + + if (dual_even_left && !uniform) { + gdouble w, h; + + ev_document_get_page_size (document, 0, &w, &h); + saved_height = swap ? w : h; + } else { + saved_height = 0; } - doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point); + for (i = dual_even_left; i < n_pages + 2; i += 2) { + if (uniform) { + uniform_height = swap ? u_width : u_height; + cache->dual_height_to_page[i] = ((i + dual_even_left) / 2) * uniform_height; + if (i + 1 < n_pages + 2) + cache->dual_height_to_page[i + 1] = ((i + dual_even_left) / 2) * uniform_height; + } else { + if (i + 1 < n_pages) { + gdouble w, h; + + ev_document_get_page_size (document, i + 1, &w, &h); + next_page_height = swap ? w : h; + } else { + next_page_height = 0; + } + + if (i < n_pages) { + gdouble w, h; + + ev_document_get_page_size (document, i, &w, &h); + page_height = swap ? w : h; + } else { + page_height = 0; + } + + if (i + 1 < n_pages + 2) { + cache->dual_height_to_page[i] = saved_height; + cache->dual_height_to_page[i + 1] = saved_height; + saved_height += MAX(page_height, next_page_height); + } else { + cache->dual_height_to_page[i] = saved_height; + } + } + } +} + +static void +ev_height_to_page_cache_get_height (EvHeightToPageCache *cache, + EvDocument *document, + gint page, + gint rotation, + gdouble *height, + gdouble *dual_height) +{ + if (cache->rotation != rotation) + build_height_to_page (cache, document, rotation); + + *height = cache->height_to_page[page]; + *dual_height = cache->dual_height_to_page[page]; +} + +static void +ev_height_to_page_cache_free (EvHeightToPageCache *cache) +{ + if (cache->height_to_page) { + g_free (cache->height_to_page); + cache->height_to_page = NULL; + } + + if (cache->dual_height_to_page) { + g_free (cache->dual_height_to_page); + cache->dual_height_to_page = NULL; + } + g_free (cache); +} + +static EvHeightToPageCache * +ev_view_get_height_to_page_cache (EvView *view) +{ + EvHeightToPageCache *cache; + + if (!view->document) + return NULL; + + cache = g_object_get_data (G_OBJECT (view->document), EV_HEIGHT_TO_PAGE_CACHE_KEY); + if (!cache) { + cache = g_new0 (EvHeightToPageCache, 1); + build_height_to_page (cache, view->document, view->rotation); + g_object_set_data_full (G_OBJECT (view->document), + EV_HEIGHT_TO_PAGE_CACHE_KEY, + cache, + (GDestroyNotify)ev_height_to_page_cache_free); + } + + return cache; +} + +static void +ev_view_get_height_to_page (EvView *view, + gint page, + gint *height, + gint *dual_height) +{ + gdouble h, dh; + + if (!view->height_to_page_cache) + return; + + ev_height_to_page_cache_get_height (view->height_to_page_cache, + view->document, + page, + view->rotation, + &h, &dh); + if (height) + *height = (gint)(h * view->scale + 0.5); + + if (dual_height) + *dual_height = (gint)(dh * view->scale + 0.5); +} + +static gint +ev_view_get_scrollbar_size (EvView *view, + GtkOrientation orientation) +{ + GtkWidget *widget = GTK_WIDGET (view); + GtkWidget *sb; + GtkWidget *swindow = gtk_widget_get_parent (GTK_WIDGET (view)); + GtkRequisition req; + gint spacing; + + if (!GTK_IS_SCROLLED_WINDOW (swindow)) + return 0; if (orientation == GTK_ORIENTATION_VERTICAL) { - view->pending_point.y = 0; + if (widget->allocation.height >= widget->requisition.height) + sb = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (swindow)); + else + return 0; } else { - view->pending_point.x = 0; + if (widget->allocation.width >= widget->requisition.width) + sb = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (swindow)); + else + return 0; } + gtk_widget_style_get (swindow, "scrollbar_spacing", &spacing, NULL); + gtk_widget_size_request (sb, &req); + + return (orientation == GTK_ORIENTATION_VERTICAL ? req.width : req.height) + spacing; +} + +static void +scroll_to_point (EvView *view, + gdouble x, + gdouble y, + GtkOrientation orientation) +{ if (orientation == GTK_ORIENTATION_VERTICAL) { if (view->continuous) { gtk_adjustment_clamp_page (view->vadjustment, - view_point.y - view->spacing / 2, - view_point.y + view->vadjustment->page_size); + y - view->spacing / 2, + y + view->vadjustment->page_size); } else { gtk_adjustment_set_value (view->vadjustment, - CLAMP (view_point.y, + CLAMP (y, view->vadjustment->lower, view->vadjustment->upper - view->vadjustment->page_size)); } } else { if (view->dual_page) { - gtk_adjustment_clamp_page (view->hadjustment, - view_point.x, - view_point.x + view->hadjustment->page_size); + gtk_adjustment_clamp_page (view->hadjustment, x, + x + view->hadjustment->page_size); } else { gtk_adjustment_set_value (view->hadjustment, - CLAMP (view_point.x, + CLAMP (x, view->hadjustment->lower, view->hadjustment->upper - view->hadjustment->page_size)); @@ -367,6 +538,34 @@ scroll_to_current_page (EvView *view, GtkOrientation orientation) } } +static void +ev_view_scroll_to_page_position (EvView *view, GtkOrientation orientation) +{ + gdouble x, y; + + if (!view->document) + return; + + if ((orientation == GTK_ORIENTATION_VERTICAL && view->pending_point.y == 0) || + (orientation == GTK_ORIENTATION_HORIZONTAL && view->pending_point.x == 0)) { + GdkRectangle page_area; + GtkBorder border; + + get_page_extents (view, view->current_page, &page_area, &border); + x = page_area.x; + y = page_area.y; + } else { + GdkPoint view_point; + + doc_point_to_view_point (view, view->current_page, + &view->pending_point, &view_point); + x = view_point.x; + y = view_point.y; + } + + scroll_to_point (view, x, y, orientation); +} + static void view_set_adjustment_values (EvView *view, GtkOrientation orientation) @@ -421,7 +620,7 @@ view_set_adjustment_values (EvView *view, gtk_adjustment_set_value (adjustment, (int)new_value); break; case SCROLL_TO_PAGE_POSITION: - scroll_to_current_page (view, orientation); + ev_view_scroll_to_page_position (view, orientation); break; case SCROLL_TO_CENTER: new_value = CLAMP (adjustment->upper * factor - adjustment->page_size * 0.5 + 0.5, @@ -436,8 +635,6 @@ view_set_adjustment_values (EvView *view, static void view_update_range_and_current_page (EvView *view) { - gint current_page; - gint best_current_page = -1; gint start = view->start_page; gint end = view->end_page; @@ -450,17 +647,18 @@ view_update_range_and_current_page (EvView *view) GtkBorder border; gboolean found = FALSE; gint area_max = -1, area; - int i; + gint best_current_page = -1; + int i, j = 0; if (!(view->vadjustment && view->hadjustment)) return; current_area.x = view->hadjustment->value; - current_area.width = view->hadjustment->upper; + current_area.width = view->hadjustment->page_size; current_area.y = view->vadjustment->value; current_area.height = view->vadjustment->page_size; - for (i = 0; i < ev_page_cache_get_n_pages (view->page_cache); i++) { + for (i = 0; i < ev_document_get_n_pages (view->document); i++) { get_page_extents (view, i, &page_area, &border); @@ -479,17 +677,33 @@ view_update_range_and_current_page (EvView *view) } view->end_page = i; + j = 0; } else if (found && view->current_page <= view->end_page) { + if (view->dual_page && j < 1) { + /* In dual mode we stop searching + * after two consecutive non-visible pages. + */ + j++; + continue; + } break; } } + if (view->pending_scroll == SCROLL_TO_KEEP_POSITION) { + best_current_page = MAX (best_current_page, view->start_page); + + if (view->current_page != best_current_page) { + view->current_page = best_current_page; + ev_document_model_set_page (view->model, best_current_page); + } + } } else if (view->dual_page) { - if (view->current_page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) { + if (view->current_page % 2 == get_dual_even_left (view)) { view->start_page = view->current_page; - if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) + if (view->current_page + 1 < ev_document_get_n_pages (view->document)) view->end_page = view->start_page + 1; - else + else view->end_page = view->start_page; } else { if (view->current_page < 1) @@ -503,32 +717,30 @@ view_update_range_and_current_page (EvView *view) view->end_page = view->current_page; } - best_current_page = MAX (best_current_page, view->start_page); - current_page = ev_page_cache_get_current_page (view->page_cache); - - if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) { - view->current_page = best_current_page; - ev_page_cache_set_current_page (view->page_cache, best_current_page); - } - if (start != view->start_page || end != view->end_page) { gint i; - for (i = start; i < view->start_page; i++) { + for (i = start; i < view->start_page && start != -1; i++) { hide_annotation_windows (view, i); } - for (i = end; i > view->end_page; i--) { + for (i = end; i > view->end_page && end != -1; i--) { hide_annotation_windows (view, i); } } + ev_page_cache_set_page_range (view->page_cache, + view->start_page, + view->end_page); ev_pixbuf_cache_set_page_range (view->pixbuf_cache, view->start_page, view->end_page, view->rotation, view->scale, view->selection_info.selections); + + if (ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page)) + gtk_widget_queue_draw (GTK_WIDGET (view)); } static void @@ -594,6 +806,79 @@ add_scroll_binding_keypad (GtkBindingSet *binding_set, G_TYPE_BOOLEAN, horizontal); } +static gdouble +compute_scroll_increment (EvView *view, + GtkScrollType scroll) +{ + GtkWidget *widget = GTK_WIDGET (view); + GtkAdjustment *adjustment = view->vadjustment; + GdkRegion *text_region, *region; + gint page; + GdkRectangle rect; + EvRectangle doc_rect; + GdkRectangle page_area; + GtkBorder border; + GdkRectangle *recs; + gint n_recs; + gdouble fraction = 1.0; + + if (scroll != GTK_SCROLL_PAGE_BACKWARD && scroll != GTK_SCROLL_PAGE_FORWARD) + return adjustment->page_size; + + page = scroll == GTK_SCROLL_PAGE_BACKWARD ? view->start_page : view->end_page; + + text_region = ev_page_cache_get_text_mapping (view->page_cache, page); + if (!text_region || gdk_region_empty (text_region)) + return adjustment->page_size; + + get_page_extents (view, page, &page_area, &border); + rect.x = page_area.x + view->scroll_x; + rect.y = view->scroll_y + (scroll == GTK_SCROLL_PAGE_BACKWARD ? 5 : widget->allocation.height - 5); + rect.width = page_area.width; + rect.height = 1; + view_rect_to_doc_rect (view, &rect, &page_area, &doc_rect); + + /* Convert the doc rectangle into a GdkRectangle */ + rect.x = doc_rect.x1; + rect.y = doc_rect.y1; + rect.width = doc_rect.x2 - doc_rect.x1; + rect.height = MAX (1, doc_rect.y2 - doc_rect.y1); + region = gdk_region_rectangle (&rect); + + gdk_region_intersect (region, text_region); + gdk_region_get_rectangles (region, &recs, &n_recs); + gdk_region_destroy (region); + if (n_recs > 0) { + EvRenderContext *rc; + EvPage *ev_page; + + ev_page = ev_document_get_page (view->document, page); + rc = ev_render_context_new (ev_page, view->rotation, view->scale); + g_object_unref (ev_page); + /* Get the selection region to know the height of the line */ + doc_rect.x1 = doc_rect.x2 = recs[0].x + 0.5; + doc_rect.y1 = doc_rect.y2 = recs[0].y + 0.5; + + ev_document_doc_mutex_lock (); + region = ev_selection_get_selection_region (EV_SELECTION (view->document), + rc, EV_SELECTION_STYLE_LINE, + &doc_rect); + ev_document_doc_mutex_unlock (); + + g_object_unref (rc); + g_free (recs); + gdk_region_get_rectangles (region, &recs, &n_recs); + gdk_region_destroy (region); + if (n_recs > 0) { + fraction = 1 - (recs[0].height / adjustment->page_size); + } + g_free (recs); + } + + return adjustment->page_size * fraction; + +} + void ev_view_scroll (EvView *view, GtkScrollType scroll, @@ -624,13 +909,12 @@ ev_view_scroll (EvView *view, /* Assign values for increment and vertical adjustment */ adjustment = horizontal ? view->hadjustment : 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) + if (view->current_page == ev_document_get_n_pages (view->document) - 1) last_page = TRUE; switch (scroll) { @@ -644,6 +928,7 @@ ev_view_scroll (EvView *view, ev_view_previous_page (view); /* Jump to the top */ } else { + increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_BACKWARD); value = MAX (value - increment, adjustment->lower); } break; @@ -657,6 +942,7 @@ ev_view_scroll (EvView *view, ev_view_next_page (view); /* Jump to the bottom */ } else { + increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_FORWARD); value = MIN (value + increment, adjustment->upper - adjustment->page_size); } break; @@ -735,25 +1021,78 @@ compute_border (EvView *view, int width, int height, GtkBorder *border) } } +void +_get_page_size_for_scale_and_rotation (EvDocument *document, + gint page, + gdouble scale, + gint rotation, + gint *page_width, + gint *page_height) +{ + gdouble w, h; + gint width, height; + + ev_document_get_page_size (document, page, &w, &h); + + width = (gint)(w * scale + 0.5); + height = (gint)(h * scale + 0.5); + + if (page_width) + *page_width = (rotation == 0 || rotation == 180) ? width : height; + if (page_height) + *page_height = (rotation == 0 || rotation == 180) ? height : width; +} + +static void +ev_view_get_page_size (EvView *view, + gint page, + gint *page_width, + gint *page_height) +{ + _get_page_size_for_scale_and_rotation (view->document, + page, + view->scale, + view->rotation, + page_width, + page_height); +} + +static void +ev_view_get_max_page_size (EvView *view, + gint *max_width, + gint *max_height) +{ + double w, h; + gint width, height; + + ev_document_get_max_page_size (view->document, &w, &h); + + width = (gint)(w * view->scale + 0.5); + height = (gint)(h * view->scale + 0.5); + + if (max_width) + *max_width = (view->rotation == 0 || view->rotation == 180) ? width : height; + if (max_height) + *max_height = (view->rotation == 0 || view->rotation == 180) ? height : width; +} + static void -get_page_y_offset (EvView *view, int page, double zoom, int *y_offset) +get_page_y_offset (EvView *view, int page, int *y_offset) { int max_width, offset; GtkBorder border; g_return_if_fail (y_offset != NULL); - ev_page_cache_get_max_width (view->page_cache, view->rotation, zoom, &max_width); - + ev_view_get_max_page_size (view, &max_width, NULL); compute_border (view, max_width, max_width, &border); if (view->dual_page) { - ev_page_cache_get_height_to_page (view->page_cache, page, - view->rotation, zoom, NULL, &offset); - offset += ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 + 1) * view->spacing + ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 ) * (border.top + border.bottom); + ev_view_get_height_to_page (view, page, NULL, &offset); + offset += ((page + get_dual_even_left (view)) / 2 + 1) * view->spacing + + ((page + get_dual_even_left (view)) / 2 ) * (border.top + border.bottom); } else { - ev_page_cache_get_height_to_page (view->page_cache, page, - view->rotation, zoom, &offset, NULL); + ev_view_get_height_to_page (view, page, &offset, NULL); offset += (page + 1) * view->spacing + page * (border.top + border.bottom); } @@ -773,10 +1112,7 @@ get_page_extents (EvView *view, widget = GTK_WIDGET (view); /* Get the size of the page */ - ev_page_cache_get_size (view->page_cache, page, - view->rotation, - view->scale, - &width, &height); + ev_view_get_page_size (view, page, &width, &height); compute_border (view, width, height, border); page_area->width = width + border->left + border->right; page_area->height = height + border->top + border->bottom; @@ -788,21 +1124,20 @@ get_page_extents (EvView *view, gint max_width; gint x, y; - ev_page_cache_get_max_width (view->page_cache, view->rotation, - view->scale, &max_width); + ev_view_get_max_page_size (view, &max_width, NULL); max_width = max_width + border->left + border->right; /* Get the location of the bounding box */ if (view->dual_page) { - x = view->spacing + ((page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? 0 : 1) * (max_width + view->spacing); + x = view->spacing + ((page % 2 == get_dual_even_left (view)) ? 0 : 1) * (max_width + view->spacing); x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2; - if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) + if (page % 2 == get_dual_even_left (view)) x = x + (max_width - width - border->left - border->right); } else { x = view->spacing; x = x + MAX (0, widget->allocation.width - (width + view->spacing * 2)) / 2; } - get_page_y_offset (view, page, view->scale, &y); + get_page_y_offset (view, page, &y); page_area->x = x; page_area->y = y; @@ -815,16 +1150,13 @@ get_page_extents (EvView *view, GtkBorder overall_border; gint other_page; - other_page = (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? page + 1: page - 1; + other_page = (page % 2 == get_dual_even_left (view)) ? page + 1: page - 1; /* First, we get the bounding box of the two pages */ - if (other_page < ev_page_cache_get_n_pages (view->page_cache) + if (other_page < ev_document_get_n_pages (view->document) && (0 <= other_page)) { - ev_page_cache_get_size (view->page_cache, - other_page, - view->rotation, - view->scale, - &width_2, &height_2); + ev_view_get_page_size (view, other_page, + &width_2, &height_2); if (width_2 > width) max_width = width_2; if (height_2 > height) @@ -837,7 +1169,7 @@ get_page_extents (EvView *view, y = view->spacing; /* Adjust for being the left or right page */ - if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) + if (page % 2 == get_dual_even_left (view)) x = x + max_width - width; else x = x + (max_width + overall_border.left + overall_border.right) + view->spacing; @@ -864,6 +1196,24 @@ get_page_extents (EvView *view, return TRUE; } +static void +get_doc_page_size (EvView *view, + gint page, + gdouble *width, + gdouble *height) +{ + double w, h; + + ev_document_get_page_size (view->document, page, &w, &h); + if (view->rotation == 0 || view->rotation == 180) { + if (width) *width = w; + if (height) *height = h; + } else { + if (width) *width = h; + if (height) *height = w; + } +} + static void view_point_to_doc_point (EvView *view, GdkPoint *view_point, @@ -887,7 +1237,7 @@ view_rect_to_doc_rect (EvView *view, doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale; } -static gboolean +static void doc_point_to_view_point (EvView *view, int page, EvPoint *doc_point, @@ -896,12 +1246,9 @@ doc_point_to_view_point (EvView *view, GdkRectangle page_area; GtkBorder border; double x, y, view_x, view_y; - int width, height; + gdouble width, height; - ev_page_cache_get_size (view->page_cache, page, - view->rotation, - 1.0, - &width, &height); + get_doc_page_size (view, page, &width, &height); if (view->rotation == 0) { x = doc_point->x; @@ -921,13 +1268,10 @@ doc_point_to_view_point (EvView *view, get_page_extents (view, page, &page_area, &border); - view_x = x * view->scale; - view_y = y * view->scale; + view_x = CLAMP (x * view->scale, 0, page_area.width); + view_y = CLAMP (y * view->scale, 0, page_area.height); view_point->x = view_x + page_area.x; view_point->y = view_y + page_area.y; - - return (view_x > 0 && view_x <= page_area.width && - view_y > 0 && view_y <= page_area.height); } static void @@ -939,12 +1283,9 @@ doc_rect_to_view_rect (EvView *view, GdkRectangle page_area; GtkBorder border; double x, y, w, h; - int width, height; + gdouble width, height; - ev_page_cache_get_size (view->page_cache, page, - view->rotation, - 1.0, - &width, &height); + get_doc_page_size (view, page, &width, &height); if (view->rotation == 0) { x = doc_rect->x1; @@ -978,6 +1319,12 @@ doc_rect_to_view_rect (EvView *view, view_rect->height = h * view->scale; } +static gboolean +get_dual_even_left (EvView *view) +{ + return (ev_document_get_n_pages (view->document) > 2); +} + static void find_page_at_location (EvView *view, gdouble x, @@ -995,7 +1342,7 @@ find_page_at_location (EvView *view, g_assert (x_offset); g_assert (y_offset); - for (i = view->start_page; i <= view->end_page; i++) { + for (i = view->start_page; i >= 0 && i <= view->end_page; i++) { GdkRectangle page_area; GtkBorder border; @@ -1030,7 +1377,7 @@ location_in_text (EvView *view, if (page == -1) return FALSE; - region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page); + region = ev_page_cache_get_text_mapping (view->page_cache, page); if (region) return gdk_region_point_in (region, x_offset / view->scale, y_offset / view->scale); @@ -1084,13 +1431,10 @@ get_doc_point_from_offset (EvView *view, gint *x_new, gint *y_new) { - int width, height; + gdouble width, height; double x, y; - ev_page_cache_get_size (view->page_cache, page, - view->rotation, - 1.0, - &width, &height); + get_doc_page_size (view, page, &width, &height); x_offset = x_offset / view->scale; y_offset = y_offset / view->scale; @@ -1168,7 +1512,7 @@ ev_view_get_link_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); + link_mapping = ev_page_cache_get_link_mapping (view->page_cache, page); if (link_mapping) return ev_mapping_list_get_data (link_mapping, x_new, y_new); @@ -1189,32 +1533,29 @@ goto_fitr_dest (EvView *view, EvLinkDest *dest) zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - left, ev_link_dest_get_bottom (dest) - top, ev_view_get_width (view), - ev_view_get_height (view), 0, 0); + ev_view_get_height (view)); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); - ev_view_set_zoom (view, zoom, FALSE); + ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); + ev_document_model_set_scale (view->model, zoom); doc_point.x = change_left ? left : 0; doc_point.y = change_top ? top : 0; - - view->current_page = ev_link_dest_get_page (dest); - if (change_left || change_top) - view->pending_point = doc_point; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; + view->pending_point = doc_point; - gtk_widget_queue_resize (GTK_WIDGET (view)); + ev_view_change_page (view, ev_link_dest_get_page (dest), TRUE); } static void goto_fitv_dest (EvView *view, EvLinkDest *dest) { EvPoint doc_point; - int doc_width, doc_height, page; + gdouble doc_width, doc_height; + gint page; double zoom, left; gboolean change_left; page = ev_link_dest_get_page (dest); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); + ev_document_get_page_size (view->document, page, &doc_width, &doc_height); left = ev_link_dest_get_left (dest, &change_left); doc_point.x = change_left ? left : 0; @@ -1222,29 +1563,27 @@ goto_fitv_dest (EvView *view, EvLinkDest *dest) zoom = zoom_for_size_fit_height (doc_width - doc_point.x , doc_height, ev_view_get_width (view), - ev_view_get_height (view), 0); + ev_view_get_height (view)); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); - ev_view_set_zoom (view, zoom, FALSE); + ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); + ev_document_model_set_scale (view->model, zoom); - view->current_page = page; - if (change_left) - view->pending_point = doc_point; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; + view->pending_point = doc_point; - gtk_widget_queue_resize (GTK_WIDGET (view)); + ev_view_change_page (view, page, TRUE); } static void goto_fith_dest (EvView *view, EvLinkDest *dest) { EvPoint doc_point; - int doc_width, doc_height, page; + gdouble doc_width, doc_height; + gint page; gdouble zoom, top; gboolean change_top; page = ev_link_dest_get_page (dest); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); + ev_document_get_page_size (view->document, page, &doc_width, &doc_height); top = ev_link_dest_get_top (dest, &change_top); @@ -1253,39 +1592,34 @@ goto_fith_dest (EvView *view, EvLinkDest *dest) zoom = zoom_for_size_fit_width (doc_width, top, ev_view_get_width (view), - ev_view_get_height (view), 0); + ev_view_get_height (view)); - ev_view_set_sizing_mode (view, EV_SIZING_FIT_WIDTH); - ev_view_set_zoom (view, zoom, FALSE); + ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_WIDTH); + ev_document_model_set_scale (view->model, zoom); - view->current_page = page; - if (change_top) - view->pending_point = doc_point; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; + view->pending_point = doc_point; - gtk_widget_queue_resize (GTK_WIDGET (view)); + ev_view_change_page (view, page, TRUE); } static void goto_fit_dest (EvView *view, EvLinkDest *dest) { double zoom; - int doc_width, doc_height; + gdouble doc_width, doc_height; int page; page = ev_link_dest_get_page (dest); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); + ev_document_get_page_size (view->document, page, &doc_width, &doc_height); - zoom = zoom_for_size_best_fit (doc_width, doc_height, ev_view_get_width (view), - ev_view_get_height (view), 0, 0); - - ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); - ev_view_set_zoom (view, zoom, FALSE); + zoom = zoom_for_size_best_fit (doc_width, doc_height, + ev_view_get_width (view), + ev_view_get_height (view)); - view->current_page = page; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; + ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT); + ev_document_model_set_scale (view->model, zoom); - gtk_widget_queue_resize (GTK_WIDGET (view)); + ev_view_change_page (view, page, TRUE); } static void @@ -1300,8 +1634,8 @@ goto_xyz_dest (EvView *view, EvLinkDest *dest) page = ev_link_dest_get_page (dest); if (change_zoom && zoom > 1) { - ev_view_set_sizing_mode (view, EV_SIZING_FREE); - ev_view_set_zoom (view, zoom, FALSE); + ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); + ev_document_model_set_scale (view->model, zoom); } left = ev_link_dest_get_left (dest, &change_left); @@ -1309,13 +1643,9 @@ goto_xyz_dest (EvView *view, EvLinkDest *dest) doc_point.x = change_left ? left : 0; doc_point.y = change_top ? top : 0; + view->pending_point = doc_point; - view->current_page = page; - if (change_left || change_top) - view->pending_point = doc_point; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; - - gtk_widget_queue_resize (GTK_WIDGET (view)); + ev_view_change_page (view, page, TRUE); } static void @@ -1325,7 +1655,7 @@ goto_dest (EvView *view, EvLinkDest *dest) int page, n_pages, current_page; page = ev_link_dest_get_page (dest); - n_pages = ev_page_cache_get_n_pages (view->page_cache); + n_pages = ev_document_get_n_pages (view->document); if (page < 0 || page >= n_pages) return; @@ -1336,7 +1666,7 @@ goto_dest (EvView *view, EvLinkDest *dest) switch (type) { case EV_LINK_DEST_TYPE_PAGE: - ev_page_cache_set_current_page (view->page_cache, page); + ev_document_model_set_page (view->model, page); break; case EV_LINK_DEST_TYPE_FIT: goto_fit_dest (view, dest); @@ -1354,15 +1684,14 @@ goto_dest (EvView *view, EvLinkDest *dest) goto_xyz_dest (view, dest); break; case EV_LINK_DEST_TYPE_PAGE_LABEL: - ev_page_cache_set_page_label (view->page_cache, ev_link_dest_get_page_label (dest)); + ev_document_model_set_page_by_label (view->model, ev_link_dest_get_page_label (dest)); break; default: g_assert_not_reached (); } if (current_page != view->current_page) - ev_page_cache_set_current_page (view->page_cache, - view->current_page); + ev_document_model_set_page (view->model, view->current_page); } static void @@ -1438,8 +1767,8 @@ ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest) dest2 = ev_document_links_find_link_dest (EV_DOCUMENT_LINKS (view->document), named_dest); if (dest2) { - msg = ev_page_cache_get_page_label (view->page_cache, - ev_link_dest_get_page (dest2)); + msg = ev_document_get_page_label (view->document, + ev_link_dest_get_page (dest2)); g_object_unref (dest2); } } @@ -1450,8 +1779,8 @@ ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest) } break; default: - msg = ev_page_cache_get_page_label (view->page_cache, - ev_link_dest_get_page (dest)); + msg = ev_document_get_page_label (view->document, + ev_link_dest_get_page (dest)); } return msg; @@ -1601,7 +1930,7 @@ ev_view_get_image_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page); + image_mapping = ev_page_cache_get_image_mapping (view->page_cache, page); if (image_mapping) return ev_mapping_list_get_data (image_mapping, x_new, y_new); @@ -1625,7 +1954,7 @@ ev_view_get_form_field_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, page); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, page); if (forms_mapping) return ev_mapping_list_get_data (forms_mapping, x_new, y_new); @@ -1640,8 +1969,8 @@ ev_view_form_field_get_region (EvView *view, GdkRectangle view_area; GList *forms_mapping; - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, forms_mapping, field, &view_area); @@ -1692,8 +2021,8 @@ ev_view_form_field_button_create_widget (EvView *view, /* For radio buttons and checkbox buttons that are in a set * we need to update also the region for the current selected item */ - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); for (l = forms_mapping; l; l = g_list_next (l)) { EvFormField *button = ((EvMapping *)(l->data))->data; GdkRegion *button_region; @@ -2076,7 +2405,8 @@ ev_view_handle_form_field (EvView *view, g_object_ref (field), (GDestroyNotify)g_object_unref); - form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page->index); + form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, form_field_mapping, field, &view_area); @@ -2300,7 +2630,7 @@ show_annotation_windows (EvView *view, parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); - annots = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); for (l = annots; l && l->data; l = g_list_next (l)) { EvAnnotation *annot; @@ -2365,7 +2695,7 @@ hide_annotation_windows (EvView *view, { GList *annots, *l; - annots = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); for (l = annots; l && l->data; l = g_list_next (l)) { EvAnnotation *annot; @@ -2397,7 +2727,7 @@ ev_view_get_annotation_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - annotations_mapping = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annotations_mapping = ev_page_cache_get_annot_mapping (view->page_cache, page); if (annotations_mapping) return ev_mapping_list_get_data (annotations_mapping, x_new, y_new); @@ -2409,7 +2739,8 @@ static void ev_view_handle_annotation (EvView *view, EvAnnotation *annot, gdouble x, - gdouble y) + gdouble y, + guint32 timestamp) { if (EV_IS_ANNOTATION_MARKUP (annot)) { GtkWidget *window; @@ -2426,6 +2757,24 @@ ev_view_handle_annotation (EvView *view, } } } + + if (EV_IS_ANNOTATION_ATTACHMENT (annot)) { + EvAttachment *attachment = EV_ANNOTATION_ATTACHMENT (annot)->attachment; + + if (attachment) { + GError *error = NULL; + + ev_attachment_open (attachment, + gtk_widget_get_screen (GTK_WIDGET (view)), + timestamp, + &error); + + if (error) { + g_warning ("%s", error->message); + g_error_free (error); + } + } + } } /*** GtkWidget implementation ***/ @@ -2434,26 +2783,28 @@ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition) { - int max_width; gint n_pages; - GtkBorder border; - ev_page_cache_get_max_width (view->page_cache, view->rotation, - view->scale, &max_width); - compute_border (view, max_width, max_width, &border); + n_pages = ev_document_get_n_pages (view->document) + 1; + get_page_y_offset (view, n_pages, &requisition->height); - n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1; + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; - requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; - 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;*/ + ev_view_get_max_page_size (view, &max_width, NULL); + compute_border (view, max_width, max_width, &border); + requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); + } + break; + default: + g_assert_not_reached (); } } @@ -2461,26 +2812,28 @@ static void ev_view_size_request_continuous (EvView *view, GtkRequisition *requisition) { - int max_width; - int n_pages; - GtkBorder border; + gint n_pages; + n_pages = ev_document_get_n_pages (view->document); + get_page_y_offset (view, n_pages, &requisition->height); - ev_page_cache_get_max_width (view->page_cache, view->rotation, - view->scale, &max_width); - n_pages = ev_page_cache_get_n_pages (view->page_cache); - compute_border (view, max_width, max_width, &border); + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; - requisition->width = max_width + (view->spacing * 2) + border.left + border.right; - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; - 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;*/ + ev_view_get_max_page_size (view, &max_width, NULL); + compute_border (view, max_width, max_width, &border); + requisition->width = max_width + (view->spacing * 2) + border.left + border.right; + } + break; + default: + g_assert_not_reached (); } } @@ -2491,19 +2844,22 @@ ev_view_size_request_dual_page (EvView *view, GtkBorder border; gint width, height; + if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + requisition->height = 1; + + return; + } + /* Find the largest of the two. */ - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->rotation, - view->scale, - &width, &height); - if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) { + ev_view_get_page_size (view, + view->current_page, + &width, &height); + if (view->current_page + 1 < ev_document_get_n_pages (view->document)) { gint width_2, height_2; - ev_page_cache_get_size (view->page_cache, - view->current_page + 1, - view->rotation, - view->scale, - &width_2, &height_2); + ev_view_get_page_size (view, + view->current_page + 1, + &width_2, &height_2); if (width_2 > width) { width = width_2; height = height_2; @@ -2511,17 +2867,9 @@ ev_view_size_request_dual_page (EvView *view, } 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; - } + requisition->width = view->sizing_mode == EV_SIZING_FIT_WIDTH ? 1 : + ((width + border.left + border.right) * 2) + (view->spacing * 3); + requisition->height = (height + border.top + border.bottom) + (view->spacing * 2); } static void @@ -2531,23 +2879,19 @@ ev_view_size_request_single_page (EvView *view, GtkBorder border; gint width, height; - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->rotation, - 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) { + if (view->sizing_mode == EV_SIZING_BEST_FIT) { requisition->width = 1; requisition->height = 1; + + return; } + + ev_view_get_page_size (view, view->current_page, &width, &height); + compute_border (view, width, height, &border); + + requisition->width = view->sizing_mode == EV_SIZING_FIT_WIDTH ? 1 : + width + border.left + border.right + (2 * view->spacing); + requisition->height = height + border.top + border.bottom + (2 * view->spacing); } static void @@ -2590,7 +2934,9 @@ ev_view_size_allocate (GtkWidget *widget, if (view->sizing_mode == EV_SIZING_FIT_WIDTH || view->sizing_mode == EV_SIZING_BEST_FIT) { - g_signal_emit (view, signals[SIGNAL_ZOOM_INVALID], 0); + ev_view_zoom_for_size (view, + allocation->width, + allocation->height); ev_view_size_request (widget, &widget->requisition); } @@ -2602,6 +2948,8 @@ ev_view_size_allocate (GtkWidget *widget, view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->pending_resize = FALSE; + view->pending_point.x = 0; + view->pending_point.y = 0; children = gtk_container_get_children (GTK_CONTAINER (widget)); for (l = children; l && l->data; l = g_list_next (l)) { @@ -2616,8 +2964,8 @@ ev_view_size_allocate (GtkWidget *widget, if (!field) continue; - form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, form_field_mapping, field, &view_area); @@ -2691,6 +3039,8 @@ ev_view_realize (GtkWidget *widget) gdk_window_set_background (view->layout.bin_window, &widget->style->black); else gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]); + + on_adjustment_value_changed (NULL, view); } static gboolean @@ -2702,8 +3052,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) state = event->state & gtk_accelerator_get_default_mod_mask (); if (state == GDK_CONTROL_MASK && view->presentation == FALSE) { - ev_view_set_sizing_mode (view, EV_SIZING_FREE); - + ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_LEFT) { if (ev_view_can_zoom_in (view)) { @@ -2870,8 +3219,8 @@ ev_view_expose_event (GtkWidget *widget, return FALSE; cr = gdk_cairo_create (view->layout.bin_window); - - for (i = view->start_page; i <= view->end_page; i++) { + + for (i = view->start_page; i >= 0 && i <= view->end_page; i++) { GdkRectangle page_area; GtkBorder border; gboolean page_ready = TRUE; @@ -2903,8 +3252,9 @@ ev_view_do_popup_menu (EvView *view, gdouble x, gdouble y) { - EvLink *link; - EvImage *image; + EvLink *link; + EvImage *image; + EvAnnotation *annot; image = ev_view_get_image_at_location (view, x, y); if (image) { @@ -2918,6 +3268,12 @@ ev_view_do_popup_menu (EvView *view, return TRUE; } + annot = ev_view_get_annotation_at_location (view, x, y); + if (annot) { + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, annot); + return TRUE; + } + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL); return TRUE; @@ -2948,7 +3304,7 @@ get_link_area (EvView *view, find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); + link_mapping = ev_page_cache_get_link_mapping (view->page_cache, page); ev_view_get_area_from_mapping (view, page, link_mapping, link, area); @@ -2961,7 +3317,7 @@ get_annot_area (EvView *view, EvAnnotation *annot, GdkRectangle *area) { - GList *annots_mapping; + GList *annot_mapping; gint page; gint x_offset = 0, y_offset = 0; @@ -2970,9 +3326,9 @@ get_annot_area (EvView *view, find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - annots_mapping = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annot_mapping = ev_page_cache_get_annot_mapping (view->page_cache, page); ev_view_get_area_from_mapping (view, page, - annots_mapping, + annot_mapping, annot, area); } @@ -3093,7 +3449,7 @@ ev_view_button_press_event (GtkWidget *widget, gtk_widget_queue_draw (widget); } else if ((annot = ev_view_get_annotation_at_location (view, event->x, event->y))) { - ev_view_handle_annotation (view, annot, event->x, event->y); + ev_view_handle_annotation (view, annot, event->x, event->y, event->time); } else if ((field = ev_view_get_form_field_at_location (view, event->x, event->y))) { ev_view_remove_all (view); ev_view_handle_form_field (view, field, event->x, event->y); @@ -3667,9 +4023,9 @@ ev_view_goto_entry_activate (GtkEntry *entry, ev_view_goto_window_hide (view); - if (page >= 0 && - page < ev_page_cache_get_n_pages (view->page_cache)) - ev_page_cache_set_current_page (view->page_cache, page); + if (page >= 0 && page < ev_document_get_n_pages (view->document)) { + ev_document_model_set_page (view->model, page); + } } static void @@ -3827,7 +4183,7 @@ ev_view_key_press_event (GtkWidget *widget, } if (current == view->presentation_state) { - if (ev_page_cache_get_n_pages (view->page_cache) > 1 && + if (ev_document_get_n_pages (view->document) > 1 && key_is_numeric (event->keyval)) { gint x, y; @@ -4083,7 +4439,7 @@ draw_one_page (EvView *view, if (!view->presentation) { gint current_page; - current_page = ev_page_cache_get_current_page (view->page_cache); + current_page = ev_document_model_get_page (view->model); ev_document_misc_paint_one_page (view->layout.bin_window, GTK_WIDGET (view), page_area, border, @@ -4111,10 +4467,7 @@ draw_one_page (EvView *view, return; } - ev_page_cache_get_size (view->page_cache, - page, view->rotation, - view->scale, - &width, &height); + ev_view_get_page_size (view, page, &width, &height); page_width = cairo_image_surface_get_width (page_surface); page_height = cairo_image_surface_get_height (page_surface); @@ -4196,6 +4549,11 @@ ev_view_destroy (GtkObject *object) { EvView *view = EV_VIEW (object); + if (view->model) { + g_object_unref (view->model); + view->model = NULL; + } + if (view->document) { g_object_unref (view->document); view->document = NULL; @@ -4206,6 +4564,11 @@ ev_view_destroy (GtkObject *object) view->pixbuf_cache = NULL; } + if (view->page_cache) { + g_object_unref (view->page_cache); + view->page_cache = NULL; + } + if (view->goto_window) { gtk_widget_destroy (view->goto_window); view->goto_window = NULL; @@ -4260,27 +4623,9 @@ ev_view_set_property (GObject *object, EvView *view = EV_VIEW (object); switch (prop_id) { - 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_FULLSCREEN: - ev_view_set_fullscreen (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; - case PROP_ZOOM: - ev_view_set_zoom (view, g_value_get_double (value), FALSE); - break; - case PROP_ROTATION: - ev_view_set_rotation (view, g_value_get_int (value)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } @@ -4326,27 +4671,9 @@ ev_view_get_property (GObject *object, EvView *view = EV_VIEW (object); switch (prop_id) { - 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_FULLSCREEN: - g_value_set_boolean (value, view->fullscreen); - 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; - case PROP_ZOOM: - g_value_set_double (value, view->scale); - break; - case PROP_ROTATION: - g_value_set_int (value, view->rotation); - break; case PROP_HAS_SELECTION: g_value_set_boolean (value, view->selection_info.selections != NULL); @@ -4404,14 +4731,6 @@ ev_view_class_init (EvViewClass *class) G_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, G_TYPE_BOOLEAN); - - signals[SIGNAL_ZOOM_INVALID] = g_signal_new ("zoom-invalid", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EvViewClass, zoom_invalid), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0, G_TYPE_NONE); signals[SIGNAL_HANDLE_LINK] = g_signal_new ("handle-link", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, @@ -4438,28 +4757,6 @@ ev_view_class_init (EvViewClass *class) G_TYPE_OBJECT); - 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_FULLSCREEN, - g_param_spec_boolean ("fullscreen", - "Full Screen", - "Draw page in a fullscreen fashion", - FALSE, - G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_PRESENTATION, g_param_spec_boolean ("presentation", @@ -4467,34 +4764,6 @@ ev_view_class_init (EvViewClass *class) "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)); - - g_object_class_install_property (object_class, - PROP_ZOOM, - g_param_spec_double ("zoom", - "Zoom factor", - "Zoom factor", - 0, - G_MAXDOUBLE, - 1.0, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_ROTATION, - g_param_spec_double ("rotation", - "Rotation", - "Rotation", - 0, - 360, - 0, - G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_HAS_SELECTION, g_param_spec_boolean ("has-selection", @@ -4659,10 +4928,14 @@ job_finished_cb (EvPixbufCache *pixbuf_cache, } static void -page_changed_cb (EvPageCache *page_cache, - int new_page, - EvView *view) +ev_view_page_changed_cb (EvDocumentModel *model, + gint old_page, + gint new_page, + EvView *view) { + if (!view->document) + return; + if (view->current_page != new_page) { if (view->presentation) ev_view_presentation_animation_start (view, new_page); @@ -4747,13 +5020,14 @@ ev_view_new (void) static void setup_caches (EvView *view) { - view->page_cache = ev_page_cache_get (view->document); - g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view); + gboolean inverted_colors; + + view->height_to_page_cache = ev_view_get_height_to_page_cache (view); view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document); + view->page_cache = ev_page_cache_new (view->document); + inverted_colors = ev_document_model_get_inverted_colors (view->model); + ev_pixbuf_cache_set_inverted_colors (view->pixbuf_cache, inverted_colors); g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view); - page_changed_cb (view->page_cache, - ev_page_cache_get_current_page (view->page_cache), - view); } static void @@ -4765,6 +5039,7 @@ clear_caches (EvView *view) } if (view->page_cache) { + g_object_unref (view->page_cache); view->page_cache = NULL; } } @@ -4850,20 +5125,22 @@ ev_view_autoscroll_stop (EvView *view) ev_view_handle_cursor_over_xy (view, x, y); } -void -ev_view_set_document (EvView *view, - EvDocument *document) +static void +ev_view_document_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_if_fail (EV_IS_VIEW (view)); + EvDocument *document = ev_document_model_get_document (model); view->loading = FALSE; - + if (document != view->document) { + gint current_page; + clear_caches (view); if (view->document) { g_object_unref (view->document); - view->page_cache = NULL; } view->document = document; @@ -4874,52 +5151,71 @@ ev_view_set_document (EvView *view, setup_caches (view); } - view_update_range_and_current_page (view); + current_page = ev_document_model_get_page (model); + if (view->current_page != current_page) { + ev_view_change_page (view, current_page, TRUE); + } else { + view->pending_scroll = SCROLL_TO_KEEP_POSITION; + gtk_widget_queue_resize (GTK_WIDGET (view)); + } + } +} + +static void +ev_view_rotation_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + gint rotation = ev_document_model_get_rotation (model); + + view->rotation = rotation; + if (view->pixbuf_cache) { + ev_pixbuf_cache_clear (view->pixbuf_cache); + if (!ev_document_is_page_size_uniform (view->document)) + view->pending_scroll = SCROLL_TO_PAGE_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); } + + ev_view_remove_all (view); + + if (rotation != 0) + clear_selection (view); } static void -ev_view_reload_page (EvView *view, - gint page, - GdkRegion *region) +ev_view_inverted_colors_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - ev_pixbuf_cache_reload_page (view->pixbuf_cache, - region, - page, - view->rotation, - view->scale); + if (view->pixbuf_cache) { + gboolean inverted_colors; + + inverted_colors = ev_document_model_get_inverted_colors (model); + ev_pixbuf_cache_set_inverted_colors (view->pixbuf_cache, inverted_colors); + gtk_widget_queue_draw (GTK_WIDGET (view)); + } } -void -ev_view_reload (EvView *view) +static void +ev_view_sizing_mode_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - ev_pixbuf_cache_clear (view->pixbuf_cache); - view_update_range_and_current_page (view); -} + EvSizingMode mode = ev_document_model_get_sizing_mode (model); -/*** Zoom and sizing mode ***/ + view->sizing_mode = mode; + if (mode != EV_SIZING_FREE) + gtk_widget_queue_resize (GTK_WIDGET (view)); +} #define EPSILON 0.0000001 -void -ev_view_set_zoom (EvView *view, - double factor, - gboolean relative) +static void +ev_view_scale_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - double scale; - - if (relative) - scale = view->scale * factor; - else - scale = factor; - - scale = CLAMP (scale, - view->sizing_mode == EV_SIZING_FREE ? view->min_scale : 0, - view->max_scale); - - if (scale == view->scale) - return; + gdouble scale = ev_document_model_get_scale (model); if (ABS (view->scale - scale) < EPSILON) return; @@ -4930,108 +5226,116 @@ ev_view_set_zoom (EvView *view, } view->scale = scale; - view->pending_resize = TRUE; - - gtk_widget_queue_resize (GTK_WIDGET (view)); - - g_object_notify (G_OBJECT (view), "zoom"); -} - -double -ev_view_get_zoom (EvView *view) -{ - return view->scale; -} - -void -ev_view_set_screen_dpi (EvView *view, - gdouble dpi) -{ - g_return_if_fail (EV_IS_VIEW (view)); - g_return_if_fail (dpi > 0); - view->dpi = dpi; - view->min_scale = MIN_SCALE * dpi / 72.0; - view->max_scale = MAX_SCALE * dpi / 72.0; -} - -gboolean -ev_view_get_continuous (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - - return view->continuous; -} - -void -ev_view_set_continuous (EvView *view, - gboolean continuous) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - continuous = continuous != FALSE; - - if (view->continuous != continuous) { - view->continuous = continuous; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; + view->pending_resize = TRUE; + if (view->sizing_mode == EV_SIZING_FREE) gtk_widget_queue_resize (GTK_WIDGET (view)); - } - - g_object_notify (G_OBJECT (view), "continuous"); } -gboolean -ev_view_get_dual_page (EvView *view) +static void +ev_view_continuous_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + gboolean continuous = ev_document_model_get_continuous (model); - return view->dual_page; + view->continuous = continuous; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + gtk_widget_queue_resize (GTK_WIDGET (view)); } -void -ev_view_set_dual_page (EvView *view, - gboolean dual_page) +static void +ev_view_dual_page_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_if_fail (EV_IS_VIEW (view)); + gboolean dual_page = ev_document_model_get_dual_page (model); - dual_page = dual_page != FALSE; - - if (view->dual_page == dual_page) - return; - - view->pending_scroll = SCROLL_TO_PAGE_POSITION; view->dual_page = dual_page; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; /* 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)); +} + +static void +ev_view_fullscreen_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + gboolean fullscreen = ev_document_model_get_fullscreen (model); - g_object_notify (G_OBJECT (view), "dual-page"); + view->fullscreen = fullscreen; + gtk_widget_queue_resize (GTK_WIDGET (view)); } void -ev_view_set_fullscreen (EvView *view, - gboolean fullscreen) +ev_view_set_model (EvView *view, + EvDocumentModel *model) { g_return_if_fail (EV_IS_VIEW (view)); + g_return_if_fail (EV_IS_DOCUMENT_MODEL (model)); - fullscreen = fullscreen != FALSE; - - if (view->fullscreen == fullscreen) + if (model == view->model) return; - - view->fullscreen = fullscreen; - gtk_widget_queue_resize (GTK_WIDGET (view)); - - g_object_notify (G_OBJECT (view), "fullscreen"); + + if (view->model) { + g_signal_handlers_disconnect_by_func (view->model, + ev_view_document_changed_cb, + view); + g_signal_handlers_disconnect_by_func (view->model, + ev_view_page_changed_cb, + view); + g_object_unref (view->model); + } + view->model = g_object_ref (model); + g_signal_connect (view->model, "notify::document", + G_CALLBACK (ev_view_document_changed_cb), + view); + g_signal_connect (view->model, "notify::rotation", + G_CALLBACK (ev_view_rotation_changed_cb), + view); + g_signal_connect (view->model, "notify::inverted-colors", + G_CALLBACK (ev_view_inverted_colors_changed_cb), + view); + g_signal_connect (view->model, "notify::sizing-mode", + G_CALLBACK (ev_view_sizing_mode_changed_cb), + view); + g_signal_connect (view->model, "notify::scale", + G_CALLBACK (ev_view_scale_changed_cb), + view); + g_signal_connect (view->model, "notify::continuous", + G_CALLBACK (ev_view_continuous_changed_cb), + view); + g_signal_connect (view->model, "notify::dual-page", + G_CALLBACK (ev_view_dual_page_changed_cb), + view); + g_signal_connect (view->model, "notify::fullscreen", + G_CALLBACK (ev_view_fullscreen_changed_cb), + view); + g_signal_connect (view->model, "page-changed", + G_CALLBACK (ev_view_page_changed_cb), + view); } -gboolean -ev_view_get_fullscreen (EvView *view) +static void +ev_view_reload_page (EvView *view, + gint page, + GdkRegion *region) { - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + ev_pixbuf_cache_reload_page (view->pixbuf_cache, + region, + page, + view->rotation, + view->scale); +} - return view->fullscreen; +void +ev_view_reload (EvView *view) +{ + ev_pixbuf_cache_clear (view->pixbuf_cache); + view_update_range_and_current_page (view); } void @@ -5054,10 +5358,10 @@ ev_view_set_presentation (EvView *view, if (presentation) { view->sizing_mode_saved = view->sizing_mode; view->scale_saved = view->scale; - ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); + ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT); } else { - ev_view_set_sizing_mode (view, view->sizing_mode_saved); - ev_view_set_zoom (view, view->scale_saved, FALSE); + ev_document_model_set_sizing_mode (view->model, view->sizing_mode_saved); + ev_document_model_set_scale (view->model, view->scale_saved); } gtk_widget_queue_resize (GTK_WIDGET (view)); @@ -5129,152 +5433,73 @@ ev_view_presentation_transition_start (EvView *view) } } -void -ev_view_set_sizing_mode (EvView *view, - EvSizingMode sizing_mode) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - if (view->sizing_mode == sizing_mode) - return; - - view->sizing_mode = sizing_mode; - gtk_widget_queue_resize (GTK_WIDGET (view)); - - g_object_notify (G_OBJECT (view), "sizing-mode"); -} - -EvSizingMode -ev_view_get_sizing_mode (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), EV_SIZING_FREE); - - return view->sizing_mode; -} +/*** Zoom and sizing mode ***/ gboolean ev_view_can_zoom_in (EvView *view) { - return view->scale * ZOOM_IN_FACTOR <= view->max_scale; + return view->scale * ZOOM_IN_FACTOR <= ev_document_model_get_max_scale (view->model); } gboolean ev_view_can_zoom_out (EvView *view) { - return view->scale * ZOOM_OUT_FACTOR >= view->min_scale; + return view->scale * ZOOM_OUT_FACTOR >= ev_document_model_get_min_scale (view->model); } void ev_view_zoom_in (EvView *view) { + gdouble scale; + g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); if (view->presentation) return; - + view->pending_scroll = SCROLL_TO_CENTER; - ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE); + scale = ev_document_model_get_scale (view->model) * ZOOM_IN_FACTOR; + ev_document_model_set_scale (view->model, scale); } void ev_view_zoom_out (EvView *view) { + gdouble scale; + g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); if (view->presentation) return; - - view->pending_scroll = SCROLL_TO_CENTER; - ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE); -} -void -ev_view_rotate_right (EvView *view) -{ - int rotation = view->rotation + 90; - - if (rotation >= 360) { - rotation -= 360; - } - - ev_view_set_rotation (view, rotation); -} - -void -ev_view_rotate_left (EvView *view) -{ - int rotation = view->rotation - 90; - - if (rotation < 0) { - rotation += 360; - } - - ev_view_set_rotation (view, rotation); -} - -void -ev_view_set_rotation (EvView *view, int rotation) -{ - view->rotation = rotation; - - if (view->pixbuf_cache) { - ev_pixbuf_cache_clear (view->pixbuf_cache); - gtk_widget_queue_resize (GTK_WIDGET (view)); - } - - if (rotation != 0) - clear_selection (view); - - g_object_notify (G_OBJECT (view), "rotation"); -} - -int -ev_view_get_rotation (EvView *view) -{ - return view->rotation; + view->pending_scroll = SCROLL_TO_CENTER; + scale = ev_document_model_get_scale (view->model) * ZOOM_OUT_FACTOR; + ev_document_model_set_scale (view->model, scale); } static double -zoom_for_size_fit_width (int doc_width, - int doc_height, - int target_width, - int target_height, - int vsb_width) +zoom_for_size_fit_width (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height) { - double scale; - - scale = (double)target_width / doc_width; - - if (doc_height * scale > target_height) - scale = (double) (target_width - vsb_width) / doc_width; - - return scale; + return (double)target_width / doc_width; } static double -zoom_for_size_fit_height (int doc_width, - int doc_height, - int target_width, - int target_height, - int vsb_height) +zoom_for_size_fit_height (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height) { - double scale; - - scale = (double)target_height / doc_height; - - if (doc_width * scale > target_width) - scale = (double) (target_height - vsb_height) / doc_height; - - return scale; + return (double)target_height / doc_height; } 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) +zoom_for_size_best_fit (gdouble doc_width, + gdouble doc_height, + int target_width, + int target_height) { double w_scale; double h_scale; @@ -5282,11 +5507,6 @@ zoom_for_size_best_fit (int doc_width, w_scale = (double)target_width / doc_width; h_scale = (double)target_height / doc_height; - 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; - return MIN (w_scale, h_scale); } @@ -5296,182 +5516,163 @@ ev_view_zoom_for_size_presentation (EvView *view, int width, int height) { - int doc_width, doc_height; + gdouble doc_width, doc_height; gdouble scale; - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->rotation, - 1.0, - &doc_width, - &doc_height); - scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, 0, 0); - ev_view_set_zoom (view, scale, FALSE); + get_doc_page_size (view, view->current_page, &doc_width, &doc_height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); + ev_document_model_set_scale (view->model, scale); } static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, - int width, - int height, - int vsb_width, - int hsb_height) + int width, + int height) { - int doc_width, doc_height; + gdouble doc_width, doc_height; GtkBorder border; gdouble scale; - ev_page_cache_get_max_width (view->page_cache, - view->rotation, - 1.0, - &doc_width); - ev_page_cache_get_max_height (view->page_cache, - view->rotation, - 1.0, - &doc_height); + ev_document_get_max_page_size (view->document, &doc_width, &doc_height); + if (view->rotation == 90 || view->rotation == 270) { + gdouble tmp; + + tmp = doc_width; + doc_width = doc_height; + doc_height = tmp; + } + compute_border (view, doc_width, doc_height, &border); - doc_width = doc_width * 2; + doc_width *= 2; width -= (2 * (border.left + border.right) + 3 * view->spacing); height -= (border.top + border.bottom + 2 * view->spacing - 1); - /* FIXME: We really need to calculate 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); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + gint sb_size; + + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); else g_assert_not_reached (); - ev_view_set_zoom (view, scale, FALSE); + ev_document_model_set_scale (view->model, scale); } static void ev_view_zoom_for_size_continuous (EvView *view, int width, - int height, - int vsb_width, - int hsb_height) + int height) { - int doc_width, doc_height; + gdouble doc_width, doc_height; GtkBorder border; gdouble scale; - ev_page_cache_get_max_width (view->page_cache, - view->rotation, - 1.0, - &doc_width); - ev_page_cache_get_max_height (view->page_cache, - view->rotation, - 1.0, - &doc_height); + ev_document_get_max_page_size (view->document, &doc_width, &doc_height); + if (view->rotation == 90 || view->rotation == 270) { + gdouble tmp; + + tmp = doc_width; + doc_width = doc_height; + doc_height = tmp; + } + compute_border (view, doc_width, doc_height, &border); width -= (border.left + border.right + 2 * view->spacing); height -= (border.top + border.bottom + 2 * view->spacing - 1); - /* FIXME: We really need to calculate 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); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + gint sb_size; + + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); else g_assert_not_reached (); - ev_view_set_zoom (view, scale, FALSE); + ev_document_model_set_scale (view->model, scale); } static void ev_view_zoom_for_size_dual_page (EvView *view, int width, - int height, - int vsb_width, - int hsb_height) + int height) { GtkBorder border; - gint doc_width, doc_height; + gdouble 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, - view->rotation, - 1.0, - &doc_width, &doc_height); + get_doc_page_size (view, view->current_page, &doc_width, &doc_height); + if (other_page < ev_document_get_n_pages (view->document)) { + gdouble width_2, height_2; - 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, - view->rotation, - 1.0, - &width_2, &height_2); + get_doc_page_size (view, other_page, &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); + compute_border (view, width, 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); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + gint sb_size; + + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); else g_assert_not_reached (); - ev_view_set_zoom (view, scale, FALSE); + ev_document_model_set_scale (view->model, scale); } static void ev_view_zoom_for_size_single_page (EvView *view, int width, - int height, - int vsb_width, - int hsb_height) + int height) { - int doc_width, doc_height; + gdouble doc_width, doc_height; GtkBorder border; gdouble scale; - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->rotation, - 1.0, - &doc_width, - &doc_height); + get_doc_page_size (view, view->current_page, &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); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + gint sb_size; + + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); else g_assert_not_reached (); - ev_view_set_zoom (view, scale, FALSE); + ev_document_model_set_scale (view->model, scale); } -void -ev_view_set_zoom_for_size (EvView *view, - int width, - int height, - int vsb_width, - int hsb_height) +static void +ev_view_zoom_for_size (EvView *view, + int width, + int height) { g_return_if_fail (EV_IS_VIEW (view)); g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH || @@ -5485,13 +5686,13 @@ ev_view_set_zoom_for_size (EvView *view, if (view->presentation) ev_view_zoom_for_size_presentation (view, width, height); else if (view->continuous && view->dual_page) - ev_view_zoom_for_size_continuous_and_dual_page (view, width, height, vsb_width, hsb_height); + ev_view_zoom_for_size_continuous_and_dual_page (view, width, height); else if (view->continuous) - ev_view_zoom_for_size_continuous (view, width, height, vsb_width, hsb_height); + ev_view_zoom_for_size_continuous (view, width, height); else if (view->dual_page) - ev_view_zoom_for_size_dual_page (view, width, height, vsb_width, hsb_height); + ev_view_zoom_for_size_dual_page (view, width, height); else - ev_view_zoom_for_size_single_page (view, width, height, vsb_width, hsb_height); + ev_view_zoom_for_size_single_page (view, width, height); } /*** Find ***/ @@ -5541,7 +5742,7 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) { int n_pages, i; - n_pages = ev_page_cache_get_n_pages (view->page_cache); + n_pages = ev_document_get_n_pages (view->document); for (i = 0; i < n_pages; i++) { int page; @@ -5558,7 +5759,7 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) page = page + n_pages; if (ev_view_find_get_n_results (view, page) > 0) { - ev_page_cache_set_current_page (view->page_cache, page); + ev_document_model_set_page (view->model, page); break; } } @@ -5653,7 +5854,7 @@ compute_new_selection_rect (EvView *view, view_rect.width = MAX (start->x, stop->x) - view_rect.x; view_rect.width = MAX (start->y, stop->y) - view_rect.y; - n_pages = ev_page_cache_get_n_pages (view->page_cache); + n_pages = ev_document_get_n_pages (view->document); for (i = 0; i < n_pages; i++) { GdkRectangle page_area; @@ -5697,12 +5898,12 @@ compute_new_selection_text (EvView *view, int n_pages, i, first, last; GList *list = NULL; EvViewSelection *selection; - gint width, height; + gdouble width, height; int start_page, end_page; g_assert (view->selection_mode == EV_VIEW_SELECTION_TEXT); - n_pages = ev_page_cache_get_n_pages (view->page_cache); + n_pages = ev_document_get_n_pages (view->document); /* First figure out the range of pages the selection * affects. */ @@ -5741,9 +5942,7 @@ compute_new_selection_text (EvView *view, GtkBorder border; GdkPoint *point; - ev_page_cache_get_size (view->page_cache, i, - view->rotation, - 1.0, &width, &height); + get_doc_page_size (view, i, &width, &height); selection = g_new0 (EvViewSelection, 1); selection->page = i; @@ -5955,15 +6154,12 @@ ev_view_select_all (EvView *view) clear_selection (view); - n_pages = ev_page_cache_get_n_pages (view->page_cache); + n_pages = ev_document_get_n_pages (view->document); for (i = 0; i < n_pages; i++) { - int width, height; + gdouble width, height; EvViewSelection *selection; - ev_page_cache_get_size (view->page_cache, - i, - view->rotation, - 1.0, &width, &height); + get_doc_page_size (view, i, &width, &height); selection = g_new0 (EvViewSelection, 1); selection->page = i; @@ -6227,7 +6423,7 @@ ev_view_next_page (EvView *view) g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - if (!view->page_cache) + if (!view->document) return FALSE; if (view->presentation && @@ -6244,8 +6440,8 @@ ev_view_next_page (EvView *view) ev_view_presentation_transition_stop (view); ev_view_reset_presentation_state (view); - page = ev_page_cache_get_current_page (view->page_cache); - n_pages = ev_page_cache_get_n_pages (view->page_cache); + page = ev_document_model_get_page (view->model); + n_pages = ev_document_get_n_pages (view->document); if (view->dual_page && !view->presentation) page = page + 2; @@ -6253,14 +6449,14 @@ ev_view_next_page (EvView *view) page = page + 1; if (page < n_pages) { - ev_page_cache_set_current_page (view->page_cache, page); + ev_document_model_set_page (view->model, page); return TRUE; } else if (view->presentation && page == n_pages) { view->presentation_state = EV_PRESENTATION_END; gtk_widget_queue_draw (GTK_WIDGET (view)); return TRUE; } else if (view->dual_page && page == n_pages) { - ev_page_cache_set_current_page (view->page_cache, page - 1); + ev_document_model_set_page (view->model, page - 1); return TRUE; } else { return FALSE; @@ -6274,7 +6470,7 @@ ev_view_previous_page (EvView *view) g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - if (!view->page_cache) + if (!view->document) return FALSE; if (view->presentation && @@ -6296,7 +6492,7 @@ ev_view_previous_page (EvView *view) ev_view_reset_presentation_state (view); - page = ev_page_cache_get_current_page (view->page_cache); + page = ev_document_model_get_page (view->model); if (view->dual_page && !view->presentation) page = page - 2; @@ -6304,10 +6500,10 @@ ev_view_previous_page (EvView *view) page = page - 1; if (page >= 0) { - ev_page_cache_set_current_page (view->page_cache, page); + ev_document_model_set_page (view->model, page); return TRUE; - } else if (ev_view_get_dual_page (view) && page == -1) { - ev_page_cache_set_current_page (view->page_cache, 0); + } else if (view->dual_page && page == -1) { + ev_document_model_set_page (view->model, 0); return TRUE; } else { return FALSE;