X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-view.c;h=8a5ac5f85ebf21e5f428f33f84e205143a141475;hb=1600e0323e398d2e235121e9e25df70853095e4c;hp=497da18710ef7c7a3986d4ec3de70a97e9610e4e;hpb=af6e8468fa9a8b26d4ac431b1a92e556a61c9ce7;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 497da187..8a5ac5f8 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -34,7 +34,6 @@ #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-transition-animation.h" #include "ev-view-marshal.h" @@ -63,7 +62,6 @@ enum { enum { SIGNAL_BINDING_ACTIVATED, - SIGNAL_ZOOM_INVALID, SIGNAL_HANDLE_LINK, SIGNAL_EXTERNAL_LINK, SIGNAL_POPUP_MENU, @@ -86,14 +84,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); @@ -136,7 +129,7 @@ static void find_page_at_location (EvView 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 +210,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); @@ -244,42 +241,33 @@ static void ev_view_init (EvView static double zoom_for_size_fit_width (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_width); + int target_height); static double zoom_for_size_fit_height (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_height); + int target_height); static double zoom_for_size_best_fit (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_width, - int hsb_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, @@ -492,43 +480,62 @@ ev_view_get_height_to_page (EvView *view, *dual_height = (gint)(dh * view->scale + 0.5); } -static void -scroll_to_current_page (EvView *view, GtkOrientation orientation) +static gint +ev_view_get_scrollbar_size (EvView *view, + GtkOrientation orientation) { - GdkPoint view_point; - - if (view->document == NULL) { - return; - } + GtkWidget *widget = GTK_WIDGET (view); + GtkWidget *sb; + GtkWidget *swindow = gtk_widget_get_parent (GTK_WIDGET (view)); + GtkRequisition req; + gint spacing; - doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point); + 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)); @@ -536,6 +543,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) @@ -590,7 +625,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, @@ -605,8 +640,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; @@ -619,13 +652,14 @@ 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; @@ -648,17 +682,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 == get_dual_even_left (view)) { view->start_page = view->current_page; 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) @@ -672,14 +722,6 @@ 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; @@ -698,6 +740,9 @@ view_update_range_and_current_page (EvView *view) 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 @@ -763,6 +808,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_pixbuf_cache_get_text_mapping (view->pixbuf_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, @@ -793,7 +911,6 @@ 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 */ @@ -813,6 +930,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; @@ -826,6 +944,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; @@ -904,6 +1023,42 @@ 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, @@ -959,10 +1114,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; @@ -1005,11 +1157,8 @@ get_page_extents (EvView *view, /* First, we get the bounding box of the two pages */ 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) @@ -1090,7 +1239,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, @@ -1121,13 +1270,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 @@ -1198,7 +1344,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; @@ -1389,20 +1535,16 @@ 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 @@ -1423,17 +1565,14 @@ 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 @@ -1455,17 +1594,14 @@ 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 @@ -1478,16 +1614,14 @@ goto_fit_dest (EvView *view, EvLinkDest *dest) page = ev_link_dest_get_page (dest); 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 @@ -1502,8 +1636,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); @@ -1511,13 +1645,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 @@ -1538,7 +1668,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); @@ -1556,15 +1686,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 @@ -2611,7 +2740,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; @@ -2628,6 +2758,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 ***/ @@ -2636,25 +2784,28 @@ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition) { - int max_width; gint n_pages; - GtkBorder border; - - ev_view_get_max_page_size (view, &max_width, NULL); - compute_border (view, max_width, max_width, &border); n_pages = ev_document_get_n_pages (view->document) + 1; - - requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); get_page_y_offset (view, n_pages, &requisition->height); - 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;*/ + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; + + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; + + 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 (); } } @@ -2662,24 +2813,28 @@ static void ev_view_size_request_continuous (EvView *view, GtkRequisition *requisition) { - int max_width; - int n_pages; - GtkBorder border; + gint n_pages; - ev_view_get_max_page_size (view, &max_width, NULL); n_pages = ev_document_get_n_pages (view->document); - compute_border (view, max_width, max_width, &border); - - requisition->width = max_width + (view->spacing * 2) + border.left + border.right; get_page_y_offset (view, n_pages, &requisition->height); - 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;*/ + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; + + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; + + 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 (); } } @@ -2690,19 +2845,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); + 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; @@ -2710,17 +2868,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 @@ -2730,23 +2880,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 @@ -2789,7 +2935,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); } @@ -2801,6 +2949,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)) { @@ -2890,6 +3040,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 @@ -2901,8 +3053,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)) { @@ -3070,7 +3221,7 @@ ev_view_expose_event (GtkWidget *widget, 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; @@ -3102,8 +3253,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) { @@ -3117,6 +3269,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; @@ -3292,7 +3450,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); @@ -3866,8 +4024,9 @@ ev_view_goto_entry_activate (GtkEntry *entry, ev_view_goto_window_hide (view); - if (page >= 0 && page < ev_document_get_n_pages (view->document)) - 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 @@ -4281,7 +4440,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, @@ -4309,10 +4468,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); @@ -4394,6 +4550,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; @@ -4474,7 +4635,7 @@ ev_view_set_property (GObject *object, 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); + ev_view_set_zoom (view, g_value_get_double (value)); break; case PROP_ROTATION: ev_view_set_rotation (view, g_value_get_int (value)); @@ -4602,14 +4763,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, @@ -4693,6 +4846,7 @@ ev_view_class_init (EvViewClass *class) 360, 0, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_HAS_SELECTION, g_param_spec_boolean ("has-selection", @@ -4857,10 +5011,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); @@ -4945,14 +5103,13 @@ ev_view_new (void) static void setup_caches (EvView *view) { - view->page_cache = ev_page_cache_get (view->document); + gboolean inverted_colors; + view->height_to_page_cache = ev_view_get_height_to_page_cache (view); - g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view); view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), 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 @@ -4962,10 +5119,6 @@ clear_caches (EvView *view) g_object_unref (view->pixbuf_cache); view->pixbuf_cache = NULL; } - - if (view->page_cache) { - view->page_cache = NULL; - } } void @@ -5049,20 +5202,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; @@ -5073,10 +5228,173 @@ 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); + + ev_view_set_rotation (view, 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_inverted_colors_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + 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)); + } +} + +static void +ev_view_sizing_mode_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + EvSizingMode mode = ev_document_model_get_sizing_mode (model); + ev_view_set_sizing_mode (view, mode); + + if (mode != EV_SIZING_FREE) gtk_widget_queue_resize (GTK_WIDGET (view)); +} + +#define EPSILON 0.0000001 +static void +ev_view_scale_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + gdouble scale = ev_document_model_get_scale (model); + + if (ABS (view->scale - scale) < EPSILON) + return; + + if (view->loading_text) { + cairo_surface_destroy (view->loading_text); + view->loading_text = NULL; } + + ev_view_set_zoom (view, scale); + + view->pending_resize = TRUE; + if (view->sizing_mode == EV_SIZING_FREE) + gtk_widget_queue_resize (GTK_WIDGET (view)); +} + +static void +ev_view_continuous_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + gboolean continuous = ev_document_model_get_continuous (model); + + ev_view_set_continuous (view, continuous); + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + gtk_widget_queue_resize (GTK_WIDGET (view)); +} + +static void +ev_view_dual_page_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) +{ + gboolean dual_page = ev_document_model_get_dual_page (model); + + ev_view_set_dual_page (view, 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); + + ev_view_set_fullscreen (view, fullscreen); + gtk_widget_queue_resize (GTK_WIDGET (view)); +} + +void +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)); + + if (model == view->model) + return; + + 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); } static void @@ -5100,38 +5418,11 @@ ev_view_reload (EvView *view) /*** Zoom and sizing mode ***/ -#define EPSILON 0.0000001 void ev_view_set_zoom (EvView *view, - double factor, - gboolean relative) + double scale) { - 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; - - if (ABS (view->scale - scale) < EPSILON) - return; - - if (view->loading_text) { - cairo_surface_destroy (view->loading_text); - view->loading_text = NULL; - } - view->scale = scale; - view->pending_resize = TRUE; - - gtk_widget_queue_resize (GTK_WIDGET (view)); g_object_notify (G_OBJECT (view), "zoom"); } @@ -5142,18 +5433,6 @@ 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) { @@ -5168,13 +5447,7 @@ ev_view_set_continuous (EvView *view, { 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; - gtk_widget_queue_resize (GTK_WIDGET (view)); - } + view->continuous = continuous; g_object_notify (G_OBJECT (view), "continuous"); } @@ -5193,17 +5466,7 @@ ev_view_set_dual_page (EvView *view, { g_return_if_fail (EV_IS_VIEW (view)); - dual_page = dual_page != FALSE; - - if (view->dual_page == dual_page) - return; - - view->pending_scroll = SCROLL_TO_PAGE_POSITION; view->dual_page = dual_page; - /* FIXME: if we're keeping the pixbuf cache around, we should extend the - * preload_cache_size to be 2 if dual_page is set. - */ - gtk_widget_queue_resize (GTK_WIDGET (view)); g_object_notify (G_OBJECT (view), "dual-page"); } @@ -5214,14 +5477,8 @@ ev_view_set_fullscreen (EvView *view, { g_return_if_fail (EV_IS_VIEW (view)); - fullscreen = fullscreen != FALSE; - - if (view->fullscreen == fullscreen) - return; - view->fullscreen = fullscreen; - gtk_widget_queue_resize (GTK_WIDGET (view)); - + g_object_notify (G_OBJECT (view), "fullscreen"); } @@ -5253,10 +5510,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)); @@ -5332,13 +5589,7 @@ 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"); } @@ -5354,61 +5605,43 @@ ev_view_get_sizing_mode (EvView *view) 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); + 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); } void @@ -5416,14 +5649,6 @@ 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"); } @@ -5437,43 +5662,25 @@ static double zoom_for_size_fit_width (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_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 (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_height) + 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 (gdouble doc_width, gdouble doc_height, int target_width, - int target_height, - int vsb_width, - int hsb_width) + int target_height) { double w_scale; double h_scale; @@ -5481,11 +5688,6 @@ zoom_for_size_best_fit (gdouble 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); } @@ -5499,16 +5701,14 @@ ev_view_zoom_for_size_presentation (EvView *view, gdouble scale; get_doc_page_size (view, view->current_page, &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); + 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) { gdouble doc_width, doc_height; GtkBorder border; @@ -5529,25 +5729,23 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, 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) { gdouble doc_width, doc_height; GtkBorder border; @@ -5567,25 +5765,23 @@ ev_view_zoom_for_size_continuous (EvView *view, 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; gdouble doc_width, doc_height; @@ -5611,22 +5807,23 @@ ev_view_zoom_for_size_dual_page (EvView *view, 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) { gdouble doc_width, doc_height; GtkBorder border; @@ -5640,22 +5837,23 @@ ev_view_zoom_for_size_single_page (EvView *view, 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 || @@ -5669,13 +5867,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 ***/ @@ -5742,7 +5940,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; } } @@ -6406,7 +6604,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 && @@ -6423,7 +6621,7 @@ 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); + page = ev_document_model_get_page (view->model); n_pages = ev_document_get_n_pages (view->document); if (view->dual_page && !view->presentation) @@ -6432,14 +6630,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; @@ -6453,7 +6651,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 && @@ -6475,7 +6673,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; @@ -6483,10 +6681,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); + ev_document_model_set_page (view->model, 0); return TRUE; } else { return FALSE;