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=5acce4764440b8d1a4896ba50a7506d6ac698ecd;hpb=fe8a90e5ecdc21069bc6617f07b7ab12a5a4a012;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 5acce476..edc188ff 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -24,22 +24,26 @@ #include #include -#include +#include #include #include +#include "ev-mapping.h" #include "ev-document-forms.h" #include "ev-document-images.h" #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" +#include "ev-annotation-window.h" #include "ev-view.h" #include "ev-view-accessible.h" #include "ev-view-private.h" +#include "ev-view-type-builtins.h" #define EV_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass)) #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW)) @@ -47,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, @@ -82,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); @@ -110,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, @@ -126,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); @@ -147,6 +139,14 @@ static EvFormField *ev_view_get_form_field_at_location (EvView gdouble x, gdouble y); +/*** Annotations ***/ +static EvAnnotation *ev_view_get_annotation_at_location (EvView *view, + gdouble x, + gdouble y); +static void show_annotation_windows (EvView *view, + gint page); +static void hide_annotation_windows (EvView *view, + gint page); /*** GtkWidget implementation ***/ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition); @@ -205,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); @@ -229,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, @@ -311,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; + } + + 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); } - doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point); + 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)); @@ -355,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) @@ -409,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, @@ -424,8 +635,8 @@ 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; /* Presentation trumps all other modes */ if (view->presentation) { @@ -436,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); @@ -465,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) @@ -489,20 +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 (start != view->start_page || end != view->end_page) { + gint i; + + for (i = start; i < view->start_page && start != -1; i++) { + hide_annotation_windows (view, i); + } - 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); + 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 @@ -568,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, @@ -598,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) { @@ -618,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; @@ -631,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; @@ -709,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); } @@ -747,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; @@ -762,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; @@ -789,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) @@ -811,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; @@ -838,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, @@ -861,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, @@ -870,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; @@ -895,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 @@ -913,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; @@ -952,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, @@ -969,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; @@ -1004,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); @@ -1058,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; @@ -1091,6 +1461,41 @@ get_doc_point_from_offset (EvView *view, return TRUE; } +static gboolean +get_doc_point_from_location (EvView *view, + gdouble x, + gdouble y, + gint *page, + gint *x_new, + gint *y_new) +{ + gint x_offset = 0, y_offset = 0; + + x += view->scroll_x; + y += view->scroll_y; + find_page_at_location (view, x, y, page, &x_offset, &y_offset); + if (*page == -1) + return FALSE; + + return get_doc_point_from_offset (view, *page, x_offset, y_offset, x_new, y_new); +} + +static void +ev_view_get_area_from_mapping (EvView *view, + guint page, + GList *mapping_list, + gconstpointer data, + GdkRectangle *area) +{ + EvMapping *mapping; + + mapping = ev_mapping_list_find (mapping_list, data); + doc_rect_to_view_rect (view, page, &mapping->area, area); + area->x -= view->scroll_x; + area->y -= view->scroll_y; +} + + /*** Hyperref ***/ static EvLink * ev_view_get_link_at_location (EvView *view, @@ -1098,30 +1503,19 @@ ev_view_get_link_at_location (EvView *view, gdouble y) { gint page = -1; - gint x_offset = 0, y_offset = 0; gint x_new = 0, y_new = 0; GList *link_mapping; if (!EV_IS_DOCUMENT_LINKS (view->document)) return NULL; - - x += view->scroll_x; - y += view->scroll_y; - - find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - - if (page == -1) - return NULL; - - if (get_doc_point_from_offset (view, page, x_offset, - y_offset, &x_new, &y_new) == FALSE) + 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_link_mapping_find (link_mapping, x_new, y_new); + return ev_mapping_list_get_data (link_mapping, x_new, y_new); else return NULL; } @@ -1139,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; @@ -1172,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); @@ -1203,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); - - zoom = zoom_for_size_best_fit (doc_width, doc_height, ev_view_get_width (view), - ev_view_get_height (view), 0, 0); + ev_document_get_page_size (view->document, page, &doc_width, &doc_height); - 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 @@ -1250,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); @@ -1259,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 @@ -1275,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; @@ -1286,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); @@ -1304,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 @@ -1388,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); } } @@ -1400,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; @@ -1486,8 +1865,9 @@ tip_from_link (EvView *view, EvLink *link) static void ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) { - EvLink *link; - EvFormField *field; + EvLink *link; + EvFormField *field; + EvAnnotation *annot = NULL; if (view->cursor == EV_VIEW_CURSOR_HIDDEN) return; @@ -1503,10 +1883,9 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) ev_view_set_cursor (view, EV_VIEW_CURSOR_AUTOSCROLL); return; } - + link = ev_view_get_link_at_location (view, x, y); if (link) { - g_object_set (view, "has-tooltip", TRUE, NULL); ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK); } else if ((field = ev_view_get_form_field_at_location (view, x, y))) { if (field->is_read_only) { @@ -1519,6 +1898,8 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) } else { ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK); } + } else if ((annot = ev_view_get_annotation_at_location (view, x, y))) { + ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK); } else if (location_in_text (view, x + view->scroll_x, y + view->scroll_y)) { ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM); } else { @@ -1528,6 +1909,9 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) view->cursor == EV_VIEW_CURSOR_AUTOSCROLL) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } + + if (link || annot) + g_object_set (view, "has-tooltip", TRUE, NULL); } /*** Images ***/ @@ -1537,29 +1921,19 @@ ev_view_get_image_at_location (EvView *view, gdouble y) { gint page = -1; - gint x_offset = 0, y_offset = 0; gint x_new = 0, y_new = 0; GList *image_mapping; if (!EV_IS_DOCUMENT_IMAGES (view->document)) return NULL; - x += view->scroll_x; - y += view->scroll_y; - - find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - - if (page == -1) - return NULL; - - if (get_doc_point_from_offset (view, page, x_offset, - y_offset, &x_new, &y_new) == FALSE) + 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_image_mapping_find (image_mapping, x_new, y_new); + return ev_mapping_list_get_data (image_mapping, x_new, y_new); else return NULL; } @@ -1571,29 +1945,19 @@ ev_view_get_form_field_at_location (EvView *view, gdouble y) { gint page = -1; - gint x_offset = 0, y_offset = 0; gint x_new = 0, y_new = 0; GList *forms_mapping; if (!EV_IS_DOCUMENT_FORMS (view->document)) return NULL; - x += view->scroll_x; - y += view->scroll_y; - - find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - - if (page == -1) - return NULL; - - if (get_doc_point_from_offset (view, page, x_offset, - y_offset, &x_new, &y_new) == FALSE) + 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_form_field_mapping_find (forms_mapping, x_new, y_new); + return ev_mapping_list_get_data (forms_mapping, x_new, y_new); else return NULL; } @@ -1602,16 +1966,14 @@ static GdkRegion * ev_view_form_field_get_region (EvView *view, EvFormField *field) { - EvRectangle field_area; GdkRectangle view_area; GList *forms_mapping; - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); - ev_form_field_mapping_get_area (forms_mapping, field, &field_area); - doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area); - view_area.x -= view->scroll_x; - view_area.y -= view->scroll_y; + 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); return gdk_region_rectangle (&view_area); } @@ -1659,10 +2021,10 @@ 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 = ((EvFormFieldMapping *)(l->data))->field; + EvFormField *button = ((EvMapping *)(l->data))->data; GdkRegion *button_region; if (button->id == field->id) @@ -1767,10 +2129,10 @@ ev_view_form_field_text_create_widget (EvView *view, g_free (txt); } - g_signal_connect (G_OBJECT (text), "changed", + g_signal_connect (text, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); - g_signal_connect_after (G_OBJECT (text), "activate", + g_signal_connect_after (text, "activate", G_CALLBACK (ev_view_form_field_destroy), view); break; @@ -1785,7 +2147,7 @@ ev_view_form_field_text_create_widget (EvView *view, g_free (txt); } - g_signal_connect (G_OBJECT (buffer), "changed", + g_signal_connect (buffer, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); } @@ -1959,10 +2321,10 @@ ev_view_form_field_choice_create_widget (EvView *view, gtk_container_add (GTK_CONTAINER (choice), tree_view); gtk_widget_show (tree_view); - g_signal_connect (G_OBJECT (selection), "changed", + g_signal_connect (selection, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (selection), "changed", + g_signal_connect_after (selection, "changed", G_CALLBACK (ev_view_form_field_destroy), view); } else if (field_choice->is_editable) { /* ComboBoxEntry */ @@ -1975,10 +2337,10 @@ ev_view_form_field_choice_create_widget (EvView *view, g_free (text); } - g_signal_connect (G_OBJECT (choice), "changed", + g_signal_connect (choice, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (GTK_BIN (choice)->child), "activate", + g_signal_connect_after (GTK_BIN(choice)->child, "activate", G_CALLBACK (ev_view_form_field_destroy), view); } else { /* ComboBoxText */ @@ -1995,10 +2357,10 @@ ev_view_form_field_choice_create_widget (EvView *view, gtk_combo_box_set_active (GTK_COMBO_BOX (choice), selected_item); gtk_combo_box_popup (GTK_COMBO_BOX (choice)); - g_signal_connect (G_OBJECT (choice), "changed", + g_signal_connect (choice, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (G_OBJECT (choice), "changed", + g_signal_connect_after (choice, "changed", G_CALLBACK (ev_view_form_field_destroy), view); } @@ -2020,7 +2382,6 @@ ev_view_handle_form_field (EvView *view, { GtkWidget *field_widget = NULL; GList *form_field_mapping; - EvRectangle field_area; GdkRectangle view_area; if (field->is_read_only) @@ -2044,94 +2405,461 @@ 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); - ev_form_field_mapping_get_area (form_field_mapping, field, &field_area); - - doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area); - view_area.x -= view->scroll_x; - view_area.y -= view->scroll_y; + 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); gtk_layout_put (GTK_LAYOUT (view), field_widget, view_area.x, view_area.y); gtk_widget_show (field_widget); gtk_widget_grab_focus (field_widget); } -/*** GtkWidget implementation ***/ - -static void -ev_view_size_request_continuous_dual_page (EvView *view, - GtkRequisition *requisition) +/* Annotations */ +static EvViewWindowChild * +ev_view_get_window_child (EvView *view, + GtkWidget *window) { - 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); + GList *children = view->window_children; - n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1; + while (children) { + EvViewWindowChild *child; - requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + child = (EvViewWindowChild *)children->data; + children = children->next; - 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;*/ + if (child->window == window) + return child; } + + return NULL; } static void -ev_view_size_request_continuous (EvView *view, - GtkRequisition *requisition) +ev_view_window_child_move (EvView *view, + EvViewWindowChild *child, + gint x, + gint y) { - int max_width; - int n_pages; - GtkBorder border; - + child->x = x; + child->y = y; + gtk_window_move (GTK_WINDOW (child->window), + MAX (child->parent_x, x), + MAX (child->parent_y, y)); +} - 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); +static void +ev_view_window_child_move_with_parent (EvView *view, + GtkWidget *window) +{ + EvViewWindowChild *child; + gint root_x, root_y; - requisition->width = max_width + (view->spacing * 2) + border.left + border.right; - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + child = ev_view_get_window_child (view, window); + gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)), + &root_x, &root_y); + if (root_x != child->parent_x || root_y != child->parent_y) { + gint dest_x, dest_y; - 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;*/ + dest_x = child->x + (root_x - child->parent_x); + dest_y = child->y + (root_y - child->parent_y); + child->parent_x = root_x; + child->parent_y = root_y; + ev_view_window_child_move (view, child, dest_x, dest_y); } + + if (child->visible && !GTK_WIDGET_VISIBLE (window)) + gtk_widget_show (window); } static void -ev_view_size_request_dual_page (EvView *view, - GtkRequisition *requisition) -{ - GtkBorder border; +ev_view_window_child_put (EvView *view, + GtkWidget *window, + guint page, + gint x, + gint y, + gdouble orig_x, + gdouble orig_y) +{ + EvViewWindowChild *child; + gint root_x, root_y; + + gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)), + &root_x, &root_y); + + child = g_new0 (EvViewWindowChild, 1); + child->window = window; + child->page = page; + child->orig_x = orig_x; + child->orig_y = orig_y; + child->parent_x = root_x; + child->parent_y = root_y; + child->visible = ev_annotation_window_is_open (EV_ANNOTATION_WINDOW (window)); + ev_view_window_child_move (view, child, x + root_x, y + root_y); + + if (child->visible) + gtk_widget_show (window); + else + gtk_widget_hide (window); + + view->window_children = g_list_append (view->window_children, child); +} + +static EvViewWindowChild * +ev_view_find_window_child_for_annot (EvView *view, + guint page, + EvAnnotation *annot) +{ + GList *children = view->window_children; + + while (children) { + EvViewWindowChild *child; + EvAnnotation *wannot; + + child = (EvViewWindowChild *)children->data; + children = children->next; + + if (child->page != page) + continue; + + wannot = ev_annotation_window_get_annotation (EV_ANNOTATION_WINDOW (child->window)); + if (wannot == annot || strcmp (wannot->name, annot->name) == 0) + return child; + } + + return NULL; +} + +static void +ev_view_window_children_free (EvView *view) +{ + GList *l; + + if (!view->window_children) + return; + + for (l = view->window_children; l && l->data; l = g_list_next (l)) { + EvViewWindowChild *child; + + child = (EvViewWindowChild *)l->data; + gtk_widget_destroy (GTK_WIDGET (child->window)); + g_free (child); + } + g_list_free (view->window_children); + view->window_children = NULL; + view->window_child_focus = NULL; +} + +static void +annotation_window_grab_focus (GtkWidget *widget, + EvView *view) +{ + if (view->window_child_focus) + ev_annotation_window_ungrab_focus (EV_ANNOTATION_WINDOW (view->window_child_focus->window)); + view->window_child_focus = ev_view_get_window_child (view, widget); +} + +static void +annotation_window_closed (EvAnnotationWindow *window, + EvView *view) +{ + EvViewWindowChild *child; + + child = ev_view_get_window_child (view, GTK_WIDGET (window)); + child->visible = FALSE; +} + +static void +annotation_window_moved (EvAnnotationWindow *window, + gint x, + gint y, + EvView *view) +{ + EvViewWindowChild *child; + GdkRectangle page_area; + GtkBorder border; + GdkRectangle view_rect; + EvRectangle doc_rect; + gint width, height; + + child = ev_view_get_window_child (view, GTK_WIDGET (window)); + if (child->x == x && child->y == y) + return; + + child->moved = TRUE; + child->x = x; + child->y = y; + + /* Window has been moved by the user, + * we have to set a new origin in doc coords + */ + gtk_window_get_size (GTK_WINDOW (window), &width, &height); + view_rect.x = (x - child->parent_x) + view->scroll_x; + view_rect.y = (y - child->parent_y) + view->scroll_y; + view_rect.width = width; + view_rect.height = height; + + get_page_extents (view, child->page, &page_area, &border); + view_rect_to_doc_rect (view, &view_rect, &page_area, &doc_rect); + child->orig_x = doc_rect.x1; + child->orig_y = doc_rect.y1; +} + +static void +ev_view_annotation_save (EvView *view, + EvAnnotation *annot) +{ + if (!view->document) + return; + + if (!annot->changed) + return; + + ev_document_annotations_annotation_set_contents (EV_DOCUMENT_ANNOTATIONS (view->document), + annot, annot->contents); + annot->changed = FALSE; +} + +static void +show_annotation_windows (EvView *view, + gint page) +{ + GList *annots, *l; + GtkWindow *parent; + + parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); + + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); + + for (l = annots; l && l->data; l = g_list_next (l)) { + EvAnnotation *annot; + EvViewWindowChild *child; + GtkWidget *window; + EvRectangle *doc_rect; + GdkRectangle view_rect; + + annot = ((EvMapping *)(l->data))->data; + + if (!EV_IS_ANNOTATION_MARKUP (annot)) + continue; + + if (!ev_annotation_markup_has_popup (EV_ANNOTATION_MARKUP (annot))) + continue; + + window = g_object_get_data (G_OBJECT (annot), "popup"); + if (window) { + ev_view_window_child_move_with_parent (view, window); + continue; + } + + /* Look if we already have a popup for this annot */ + child = ev_view_find_window_child_for_annot (view, page, annot); + window = child ? child->window : NULL; + if (window) { + ev_annotation_window_set_annotation (EV_ANNOTATION_WINDOW (window), annot); + g_object_set_data (G_OBJECT (annot), "popup", window); + ev_view_window_child_move_with_parent (view, window); + } else { + window = ev_annotation_window_new (annot, parent); + g_signal_connect (window, "grab_focus", + G_CALLBACK (annotation_window_grab_focus), + view); + g_signal_connect (window, "closed", + G_CALLBACK (annotation_window_closed), + view); + g_signal_connect (window, "moved", + G_CALLBACK (annotation_window_moved), + view); + g_object_set_data (G_OBJECT (annot), "popup", window); + + doc_rect = (EvRectangle *)ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (window)); + doc_rect_to_view_rect (view, page, doc_rect, &view_rect); + view_rect.x -= view->scroll_x; + view_rect.y -= view->scroll_y; + + ev_view_window_child_put (view, window, page, + view_rect.x, view_rect.y, + doc_rect->x1, doc_rect->y1); + + g_object_weak_ref (G_OBJECT (annot), + (GWeakNotify)ev_view_annotation_save, + view); + } + } +} + +static void +hide_annotation_windows (EvView *view, + gint page) +{ + GList *annots, *l; + + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); + + for (l = annots; l && l->data; l = g_list_next (l)) { + EvAnnotation *annot; + GtkWidget *window; + + annot = ((EvMapping *)(l->data))->data; + + if (!EV_IS_ANNOTATION_MARKUP (annot)) + continue; + + window = g_object_get_data (G_OBJECT (annot), "popup"); + if (window) + gtk_widget_hide (window); + } +} + +static EvAnnotation * +ev_view_get_annotation_at_location (EvView *view, + gdouble x, + gdouble y) +{ + gint page = -1; + gint x_new = 0, y_new = 0; + GList *annotations_mapping; + + if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document)) + return NULL; + + if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) + return NULL; + + 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); + else + return NULL; +} + +static void +ev_view_handle_annotation (EvView *view, + EvAnnotation *annot, + gdouble x, + gdouble y, + guint32 timestamp) +{ + if (EV_IS_ANNOTATION_MARKUP (annot)) { + GtkWidget *window; + + window = g_object_get_data (G_OBJECT (annot), "popup"); + if (window) { + EvViewWindowChild *child; + + child = ev_view_get_window_child (view, window); + if (!child->visible) { + child->visible = TRUE; + ev_view_window_child_move (view, child, child->x, child->y); + gtk_widget_show (window); + } + } + } + + 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 ***/ + +static void +ev_view_size_request_continuous_dual_page (EvView *view, + GtkRequisition *requisition) +{ + gint n_pages; + + n_pages = ev_document_get_n_pages (view->document) + 1; + get_page_y_offset (view, n_pages, &requisition->height); + + 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 (); + } +} + +static void +ev_view_size_request_continuous (EvView *view, + GtkRequisition *requisition) +{ + gint n_pages; + + n_pages = ev_document_get_n_pages (view->document); + get_page_y_offset (view, n_pages, &requisition->height); + + 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 (); + } +} + +static void +ev_view_size_request_dual_page (EvView *view, + GtkRequisition *requisition) +{ + 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; @@ -2139,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 @@ -2159,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 @@ -2212,14 +2928,15 @@ ev_view_size_allocate (GtkWidget *widget, { EvView *view = EV_VIEW (widget); GList *children, *l; + gint root_x, root_y; GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); 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); } @@ -2231,11 +2948,12 @@ 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)) { EvFormField *field; - EvRectangle field_area; GdkRectangle view_area; GList *form_field_mapping; GtkAllocation child_allocation; @@ -2246,13 +2964,11 @@ 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); - ev_form_field_mapping_get_area (form_field_mapping, field, &field_area); - - doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area); - view_area.x -= view->scroll_x; - view_area.y -= view->scroll_y; + 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); gtk_widget_size_request (child, &child_requisition); if (child_requisition.width != view_area.width || @@ -2270,6 +2986,33 @@ ev_view_size_allocate (GtkWidget *widget, } } g_list_free (children); + + if (view->window_children) + gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)), + &root_x, &root_y); + + for (l = view->window_children; l && l->data; l = g_list_next (l)) { + EvViewWindowChild *child; + EvRectangle doc_rect; + GdkRectangle view_rect; + + child = (EvViewWindowChild *)l->data; + + doc_rect = *ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (child->window)); + if (child->moved) { + doc_rect.x1 = child->orig_x; + doc_rect.y1 = child->orig_y; + } + doc_rect_to_view_rect (view, child->page, &doc_rect, &view_rect); + view_rect.x -= view->scroll_x; + view_rect.y -= view->scroll_y; + + if (view_rect.x != child->orig_x || view_rect.y != child->orig_y) { + child->parent_x = root_x; + child->parent_y = root_y; + ev_view_window_child_move (view, child, view_rect.x + root_x, view_rect.y + root_y); + } + } } static void @@ -2296,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 @@ -2307,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)) { @@ -2340,7 +3084,9 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) state &= ~GDK_SHIFT_MASK; } - if (state == 0 && view->presentation) { + if (state == 0 && + (view->presentation || + (view->sizing_mode == EV_SIZING_BEST_FIT && !view->continuous))) { switch (event->direction) { case GDK_SCROLL_DOWN: case GDK_SCROLL_RIGHT: @@ -2420,19 +3166,21 @@ ev_view_expose_event (GtkWidget *widget, cairo_t *cr; gint i; - if (view->animation && ev_transition_animation_ready (view->animation)) { - GdkRectangle page_area; - GtkBorder border; + if (view->animation) { + if (ev_transition_animation_ready (view->animation)) { + GdkRectangle page_area; + GtkBorder border; - if (get_page_extents (view, view->current_page, &page_area, &border)) { - cr = gdk_cairo_create (view->layout.bin_window); + if (get_page_extents (view, view->current_page, &page_area, &border)) { + cr = gdk_cairo_create (view->layout.bin_window); - /* normalize to x=0, y=0 */ - cairo_translate (cr, page_area.x, page_area.y); - page_area.x = page_area.y = 0; + /* normalize to x=0, y=0 */ + cairo_translate (cr, page_area.x, page_area.y); + page_area.x = page_area.y = 0; - ev_transition_animation_paint (view->animation, cr, page_area); - cairo_destroy (cr); + ev_transition_animation_paint (view->animation, cr, page_area); + cairo_destroy (cr); + } } return TRUE; @@ -2471,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; @@ -2487,6 +3235,8 @@ ev_view_expose_event (GtkWidget *widget, if (page_ready && view->find_pages && view->highlight_find_results) highlight_find_results (view, i); + if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document)) + show_annotation_windows (view, i); } cairo_destroy (cr); @@ -2502,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) { @@ -2517,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; @@ -2538,33 +3295,65 @@ get_link_area (EvView *view, EvLink *link, GdkRectangle *area) { - EvRectangle ev_rect; - GList *link_mapping; - gint page; - gint x_offset = 0, y_offset = 0; + GList *link_mapping; + gint page; + gint x_offset = 0, y_offset = 0; x += view->scroll_x; y += view->scroll_y; find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); - ev_link_mapping_get_area (link_mapping, link, &ev_rect); + link_mapping = ev_page_cache_get_link_mapping (view->page_cache, page); + ev_view_get_area_from_mapping (view, page, + link_mapping, + link, area); +} + +static void +get_annot_area (EvView *view, + gint x, + gint y, + EvAnnotation *annot, + GdkRectangle *area) +{ + GList *annot_mapping; + gint page; + gint x_offset = 0, y_offset = 0; + + x += view->scroll_x; + y += view->scroll_y; + + find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - doc_rect_to_view_rect (view, page, &ev_rect, area); - area->y -= view->scroll_y ; + annot_mapping = ev_page_cache_get_annot_mapping (view->page_cache, page); + ev_view_get_area_from_mapping (view, page, + annot_mapping, + annot, area); } static gboolean -ev_view_query_tooltip (GtkWidget *widget, - gint x, - gint y, - gboolean keyboard_tip, - GtkTooltip *tooltip) +ev_view_query_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_tip, + GtkTooltip *tooltip) { - EvView *view = EV_VIEW (widget); - EvLink *link; - gchar *text; + EvView *view = EV_VIEW (widget); + EvLink *link; + EvAnnotation *annot; + gchar *text; + + annot = ev_view_get_annotation_at_location (view, x, y); + if (annot && annot->contents) { + GdkRectangle annot_area; + + get_annot_area (view, x, y, annot, &annot_area); + gtk_tooltip_set_text (tooltip, annot->contents); + gtk_tooltip_set_tip_area (tooltip, &annot_area); + + return TRUE; + } link = ev_view_get_link_at_location (view, x, y); if (!link) @@ -2587,26 +3376,28 @@ static void start_selection_for_event (EvView *view, GdkEventButton *event) { - EvSelectionStyle style; - clear_selection (view); - + view->selection_info.start.x = event->x + view->scroll_x; view->selection_info.start.y = event->y + view->scroll_y; switch (event->type) { case GDK_2BUTTON_PRESS: - style = EV_SELECTION_STYLE_WORD; + view->selection_info.style = EV_SELECTION_STYLE_WORD; break; case GDK_3BUTTON_PRESS: - style = EV_SELECTION_STYLE_LINE; + view->selection_info.style = EV_SELECTION_STYLE_LINE; break; default: - style = EV_SELECTION_STYLE_GLYPH; - break; + view->selection_info.style = EV_SELECTION_STYLE_GLYPH; + return; } - view->selection_info.style = style; + /* In case of WORD or LINE, compute selections now */ + compute_selections (view, + view->selection_info.style, + &(view->selection_info.start), + &(view->selection_info.start)); } static gboolean @@ -2621,6 +3412,17 @@ ev_view_button_press_event (GtkWidget *widget, if (!GTK_WIDGET_HAS_FOCUS (widget)) { gtk_widget_grab_focus (widget); } + + if (view->window_child_focus) { + EvAnnotationWindow *window; + EvAnnotation *annot; + + window = EV_ANNOTATION_WINDOW (view->window_child_focus->window); + annot = ev_annotation_window_get_annotation (window); + ev_annotation_window_ungrab_focus (window); + ev_view_annotation_save (view, annot); + view->window_child_focus = NULL; + } view->pressed_button = event->button; view->selection_info.in_drag = FALSE; @@ -2631,6 +3433,7 @@ ev_view_button_press_event (GtkWidget *widget, switch (event->button) { case 1: { EvImage *image; + EvAnnotation *annot; EvFormField *field; if (EV_IS_SELECTION (view->document) && view->selection_info.selections) { @@ -2645,6 +3448,8 @@ 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, 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); @@ -2737,7 +3542,7 @@ ev_view_drag_data_get (GtkWidget *widget, if (view->image_dnd_info.image) { GdkPixbuf *pixbuf; const gchar *tmp_uri; - gchar **uris[2]; + gchar *uris[2]; ev_document_doc_mutex_lock (); pixbuf = ev_document_images_get_image (EV_DOCUMENT_IMAGES (view->document), @@ -2856,12 +3661,14 @@ ev_view_scroll_drag_release (EvView *view) oldhadjustment = gtk_adjustment_get_value (view->hadjustment); oldvadjustment = gtk_adjustment_get_value (view->vadjustment); - if (((oldhadjustment + dhadj_value) > (view->hadjustment->upper - view->hadjustment->page_size)) || + /* When we reach the edges, we need either to absorb some momentum and bounce by + * multiplying it on -0.5 or stop scrolling by setting momentum to 0. */ + if (((oldhadjustment + dhadj_value) > (view->hadjustment->upper - view->hadjustment->page_size)) || ((oldhadjustment + dhadj_value) < 0)) - view->drag_info.momentum.x *= -0.5; /* 0.5 rather than 1 means the edges absorb some momentum */ + view->drag_info.momentum.x = 0; if (((oldvadjustment + dvadj_value) > (view->vadjustment->upper - view->vadjustment->page_size)) || ((oldvadjustment + dvadj_value) < 0)) - view->drag_info.momentum.y *= -0.5; + view->drag_info.momentum.y = 0; gtk_adjustment_set_value (view->hadjustment, MIN (oldhadjustment + dhadj_value, @@ -3073,14 +3880,6 @@ ev_view_button_release_event (GtkWidget *widget, view->selection_update_id = 0; } - if (!view->selection_info.in_selection && - view->selection_info.style != EV_SELECTION_STYLE_GLYPH) { - compute_selections (view, - view->selection_info.style, - &(view->selection_info.start), - &(view->selection_info.start)); - } - if (view->selection_info.selections) { clear_link_selected (view); ev_view_update_primary_selection (view); @@ -3224,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 @@ -3247,6 +4046,8 @@ ev_view_goto_window_create (EvView *view) } view->goto_window = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_screen (GTK_WINDOW (view->goto_window), + gtk_widget_get_screen (GTK_WIDGET (view))); if (GTK_WINDOW (toplevel)->group) gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, @@ -3332,7 +4133,26 @@ ev_view_key_press_event (GtkWidget *widget, if (!view->document) return FALSE; - + + if (!GTK_WIDGET_HAS_FOCUS (widget)) { + /* Forward key events to current focused window child */ + if (view->window_child_focus) { + GdkEventKey *new_event; + gboolean handled; + + new_event = (GdkEventKey *) gdk_event_copy ((GdkEvent *)event); + g_object_unref (new_event->window); + new_event->window = g_object_ref (view->window_child_focus->window->window); + gtk_widget_realize (view->window_child_focus->window); + handled = gtk_widget_event (view->window_child_focus->window, (GdkEvent *)new_event); + gdk_event_free ((GdkEvent *)new_event); + + return handled; + } + + return FALSE; + } + if (!view->presentation || view->presentation_state == EV_PRESENTATION_END) return gtk_bindings_activate_event (GTK_OBJECT (widget), event); @@ -3363,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; @@ -3619,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, @@ -3647,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); @@ -3732,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; @@ -3742,12 +4564,19 @@ 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; view->goto_entry = NULL; } + ev_view_window_children_free (view); + if (view->selection_scroll_id) { g_source_remove (view->selection_scroll_id); view->selection_scroll_id = 0; @@ -3794,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); } @@ -3860,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); @@ -3938,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, @@ -3972,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", @@ -4001,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", @@ -4063,6 +4798,8 @@ ev_view_init (EvView *view) { GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); + view->start_page = -1; + view->end_page = -1; view->spacing = 5; view->scale = 1.0; view->current_page = 0; @@ -4156,10 +4893,14 @@ ev_view_presentation_animation_start (EvView *view, if (!effect) return; - surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page); view->animation = ev_transition_animation_new (effect); + + surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page); ev_transition_animation_set_origin_surface (view->animation, surface); - + surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, new_page); + if (surface) + ev_transition_animation_set_dest_surface (view->animation, surface); + g_signal_connect (view->animation, "frame", G_CALLBACK (ev_view_transition_animation_frame), view); g_signal_connect (view->animation, "finished", @@ -4187,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); @@ -4241,6 +4986,14 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, gtk_layout_move (GTK_LAYOUT (view), child, child_x + dx, child_y + dy); } g_list_free (children); + + for (l = view->window_children; l && l->data; l = g_list_next (l)) { + EvViewWindowChild *child; + + child = (EvViewWindowChild *)l->data; + + ev_view_window_child_move (view, child, child->x + dx, child->y + dy); + } if (view->pending_resize) gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -4267,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 @@ -4285,6 +5039,7 @@ clear_caches (EvView *view) } if (view->page_cache) { + g_object_unref (view->page_cache); view->page_cache = NULL; } } @@ -4370,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; @@ -4394,159 +5151,191 @@ ev_view_set_document (EvView *view, setup_caches (view); } - gtk_widget_queue_resize (GTK_WIDGET (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_reload_page (EvView *view, - gint page, - GdkRegion *region) +ev_view_rotation_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - ev_pixbuf_cache_reload_page (view->pixbuf_cache, - region, - page, - view->rotation, - view->scale); -} - -void -ev_view_reload (EvView *view) -{ - ev_pixbuf_cache_clear (view->pixbuf_cache); - view_update_range_and_current_page (view); -} - -/*** Zoom and sizing mode ***/ + gint rotation = ev_document_model_get_rotation (model); -#define EPSILON 0.0000001 -void -ev_view_set_zoom (EvView *view, - double factor, - gboolean relative) -{ - 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 (ABS (view->scale - scale) < EPSILON) - return; + view->rotation = rotation; - if (view->loading_text) { - cairo_surface_destroy (view->loading_text); - view->loading_text = NULL; + 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)); } - view->scale = scale; - view->pending_resize = TRUE; - - gtk_widget_queue_resize (GTK_WIDGET (view)); - - g_object_notify (G_OBJECT (view), "zoom"); -} + ev_view_remove_all (view); -double -ev_view_get_zoom (EvView *view) -{ - return view->scale; + if (rotation != 0) + clear_selection (view); } -void -ev_view_set_screen_dpi (EvView *view, - gdouble dpi) +static void +ev_view_inverted_colors_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_if_fail (EV_IS_VIEW (view)); - g_return_if_fail (dpi > 0); + if (view->pixbuf_cache) { + gboolean inverted_colors; - view->dpi = dpi; - view->min_scale = MIN_SCALE * dpi / 72.0; - view->max_scale = MAX_SCALE * dpi / 72.0; + 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)); + } } -gboolean -ev_view_get_continuous (EvView *view) +static void +ev_view_sizing_mode_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + EvSizingMode mode = ev_document_model_get_sizing_mode (model); - return view->continuous; + view->sizing_mode = mode; + if (mode != EV_SIZING_FREE) + gtk_widget_queue_resize (GTK_WIDGET (view)); } -void -ev_view_set_continuous (EvView *view, - gboolean continuous) +#define EPSILON 0.0000001 +static void +ev_view_scale_changed_cb (EvDocumentModel *model, + GParamSpec *pspec, + EvView *view) { - g_return_if_fail (EV_IS_VIEW (view)); + gdouble scale = ev_document_model_get_scale (model); - continuous = continuous != FALSE; + if (ABS (view->scale - scale) < EPSILON) + return; - if (view->continuous != continuous) { - view->continuous = continuous; - view->pending_scroll = SCROLL_TO_PAGE_POSITION; - gtk_widget_queue_resize (GTK_WIDGET (view)); + if (view->loading_text) { + cairo_surface_destroy (view->loading_text); + view->loading_text = NULL; } - g_object_notify (G_OBJECT (view), "continuous"); + view->scale = scale; + + view->pending_resize = TRUE; + if (view->sizing_mode == EV_SIZING_FREE) + gtk_widget_queue_resize (GTK_WIDGET (view)); } -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)); - - dual_page = dual_page != FALSE; + gboolean dual_page = ev_document_model_get_dual_page (model); - 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 @@ -4569,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)); @@ -4644,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; @@ -4797,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); } @@ -4811,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 || @@ -5000,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 ***/ @@ -5056,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; @@ -5073,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; } } @@ -5168,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; @@ -5212,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. */ @@ -5256,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; @@ -5470,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; @@ -5742,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 && @@ -5759,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; @@ -5768,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; @@ -5789,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 && @@ -5811,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; @@ -5819,64 +6500,13 @@ 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; } } -/*** Enum description for usage in signal ***/ - -GType -ev_sizing_mode_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" }, - { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" }, - { EV_SIZING_FREE, "EV_SIZING_FREE", "free" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("EvSizingMode", values); - } - return etype; -} - -void -ev_view_update_view_size (EvView *view, GtkScrolledWindow * scrolled_window) -{ - int width, height; - GtkRequisition vsb_requisition; - GtkRequisition hsb_requisition; - int scrollbar_spacing; - - /* Calculate the width available for the content */ - width = GTK_WIDGET (scrolled_window)->allocation.width; - height = GTK_WIDGET (scrolled_window)->allocation.height; - - if (gtk_scrolled_window_get_shadow_type (scrolled_window) == GTK_SHADOW_IN - && view) { - width -= 2 * GTK_WIDGET(view)->style->xthickness; - height -= 2 * GTK_WIDGET(view)->style->ythickness; - } - - gtk_widget_size_request (scrolled_window->vscrollbar, &vsb_requisition); - gtk_widget_size_request (scrolled_window->hscrollbar, &hsb_requisition); - gtk_widget_style_get (GTK_WIDGET (scrolled_window), - "scrollbar_spacing", - &scrollbar_spacing, - NULL); - - if (EV_IS_VIEW(view)) { - ev_view_set_zoom_for_size (EV_VIEW (view), - MAX (1, width), - MAX (1, height), - vsb_requisition.width + scrollbar_spacing, - hsb_requisition.height + scrollbar_spacing); - } -}