X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-view.c;h=3eed46a803bfe54a2ab76bfe2052c0387c25f9a9;hb=6c93a5962ad7052cff3065ddbd8d53b6932d1f1b;hp=be6f29503b65f549ede8a0478ce11aae230c8d6c;hpb=0fc3e8a303bdbee7e6a3431b9c5443648571fb25;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index be6f2950..3eed46a8 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -33,6 +33,7 @@ #include "ev-view-private.h" #include "ev-utils.h" #include "ev-selection.h" +#include "ev-document-links.h" #include "ev-document-find.h" #include "ev-document-misc.h" #include "ev-debug.h" @@ -64,6 +65,7 @@ enum { SIGNAL_BINDING_ACTIVATED, SIGNAL_ZOOM_INVALID, SIGNAL_EXTERNAL_LINK, + SIGNAL_POPUP_MENU, N_SIGNALS, }; @@ -112,10 +114,8 @@ static void ev_view_set_scroll_adjustments (EvView GtkAdjustment *vadjustment); static void add_scroll_binding_keypad (GtkBindingSet *binding_set, guint keyval, - GtkScrollType scroll, - gboolean horizontal); -static void ev_view_binding_activated (EvView *view, - GtkScrollType scroll, + GdkModifierType modifiers, + EvScrollType scroll, gboolean horizontal); static void ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect); @@ -147,11 +147,14 @@ static void find_page_at_location (EvView gint *page, gint *x_offset, gint *y_offset); - +static gboolean doc_point_to_view_point (EvView *view, + int page, + EvPoint *doc_point, + GdkPoint *view_point); /*** Hyperrefs ***/ -static EvLink* get_link_at_location (EvView *view, - gdouble x, - gdouble y); +static EvLink * ev_view_get_link_at_location (EvView *view, + gdouble x, + gdouble y); static char* tip_from_link (EvView *view, EvLink *link); static void handle_link_over_xy (EvView *view, @@ -175,6 +178,7 @@ static gboolean ev_view_scroll_event (GtkWidget GdkEventScroll *event); static gboolean ev_view_expose_event (GtkWidget *widget, GdkEventExpose *event); +static gboolean ev_view_popup_menu (GtkWidget *widget); static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event); static gboolean ev_view_motion_notify_event (GtkWidget *widget, @@ -202,6 +206,10 @@ static void draw_one_page (EvView gint page, GdkRectangle *page_area, GtkBorder *border, + GdkRectangle *expose_area, + gboolean *page_ready); +static void draw_loading_text (EvView *view, + GdkRectangle *page_area, GdkRectangle *expose_area); /*** Callbacks ***/ @@ -278,13 +286,15 @@ static void ev_view_set_cursor (EvView /*** Status messages ***/ static void ev_view_set_status (EvView *view, const char *message); -static void update_find_status_message (EvView *view); +static void update_find_status_message (EvView *view, + gboolean this_page); static void ev_view_set_find_status (EvView *view, const char *message); /*** Find ***/ static void jump_to_find_result (EvView *view); static void jump_to_find_page (EvView *view, - EvViewFindDirection direction); + EvViewFindDirection direction, + gint shift); /*** Selection ***/ static void compute_selections (EvView *view, @@ -307,32 +317,40 @@ G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET) static void scroll_to_current_page (EvView *view, GtkOrientation orientation) { - GdkRectangle page_area; - GtkBorder border; + GdkPoint view_point; if (view->document == NULL) { return; } - get_page_extents (view, view->current_page, &page_area, &border); + doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point); + + if (orientation == GTK_ORIENTATION_VERTICAL) { + view->pending_point.y = 0; + } else { + view->pending_point.x = 0; + } if (orientation == GTK_ORIENTATION_VERTICAL) { if (view->continuous) { gtk_adjustment_clamp_page (view->vadjustment, - page_area.y - view->spacing, - page_area.y + view->vadjustment->page_size); + view_point.y - view->spacing / 2, + view_point.y + view->vadjustment->page_size); } else { gtk_adjustment_set_value (view->vadjustment, - view->vadjustment->lower); + CLAMP (view_point.y, + view->vadjustment->lower, + view->vadjustment->upper - + view->vadjustment->page_size)); } } else { if (view->dual_page) { gtk_adjustment_clamp_page (view->hadjustment, - page_area.x, - page_area.x + view->hadjustment->page_size); + view_point.x, + view_point.x + view->hadjustment->page_size); } else { gtk_adjustment_set_value (view->hadjustment, - CLAMP (view->hadjustment->value, + CLAMP (view_point.x, view->hadjustment->lower, view->hadjustment->upper - view->hadjustment->page_size)); @@ -368,9 +386,10 @@ view_set_adjustment_values (EvView *view, factor = 1.0; switch (view->pending_scroll) { case SCROLL_TO_KEEP_POSITION: + case SCROLL_TO_FIND_LOCATION: factor = (adjustment->value) / adjustment->upper; break; - case SCROLL_TO_CURRENT_PAGE: + case SCROLL_TO_PAGE_POSITION: break; case SCROLL_TO_CENTER: factor = (adjustment->value + adjustment->page_size * 0.5) / adjustment->upper; @@ -388,10 +407,11 @@ view_set_adjustment_values (EvView *view, */ switch (view->pending_scroll) { case SCROLL_TO_KEEP_POSITION: + case SCROLL_TO_FIND_LOCATION: new_value = CLAMP (adjustment->upper * factor + 0.5, 0, adjustment->upper - adjustment->page_size); gtk_adjustment_set_value (adjustment, (int)new_value); break; - case SCROLL_TO_CURRENT_PAGE: + case SCROLL_TO_PAGE_POSITION: scroll_to_current_page (view, orientation); break; case SCROLL_TO_CENTER: @@ -407,9 +427,9 @@ view_set_adjustment_values (EvView *view, static void view_update_range_and_current_page (EvView *view) { - if (view->pending_scroll != SCROLL_TO_KEEP_POSITION) - return; - + gint current_page; + gint best_current_page = -1; + /* Presentation trumps all other modes */ if (view->presentation) { view->start_page = view->current_page; @@ -417,8 +437,8 @@ view_update_range_and_current_page (EvView *view) } else if (view->continuous) { GdkRectangle current_area, unused, page_area; GtkBorder border; - gint current_page; gboolean found = FALSE; + gint area_max = -1, area; int i; if (!(view->vadjustment && view->hadjustment)) @@ -434,39 +454,50 @@ view_update_range_and_current_page (EvView *view) get_page_extents (view, i, &page_area, &border); if (gdk_rectangle_intersect (¤t_area, &page_area, &unused)) { - if (! found) { + area = unused.width * unused.height; + + if (!found) { + area_max = area; view->start_page = i; found = TRUE; - + best_current_page = i; + } + if (area > area_max) { + best_current_page = (area == area_max) ? MIN (i, best_current_page) : i; + area_max = area; } + view->end_page = i; } else if (found) { break; } } - current_page = ev_page_cache_get_current_page (view->page_cache); - - if (current_page < view->start_page || current_page > view->end_page) { - view->current_page = view->start_page; - ev_page_cache_set_current_page (view->page_cache, view->start_page); - } - } else { - if (view->dual_page) { - if (view->current_page % 2 == 0) { + } else if (view->dual_page) { + if (view->current_page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) { + view->start_page = view->current_page; + if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) + view->end_page = view->start_page + 1; + else + view->end_page = view->start_page; + } else { + if (view->current_page < 1) view->start_page = view->current_page; - if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) - view->end_page = view->start_page + 1; - else - view->end_page = view->start_page; - } else { + else view->start_page = view->current_page - 1; - view->end_page = view->current_page; - } - } else { - view->start_page = view->current_page; view->end_page = view->current_page; } + } else { + view->start_page = view->current_page; + view->end_page = view->current_page; + } + + best_current_page = MAX (best_current_page, view->start_page); + current_page = ev_page_cache_get_current_page (view->page_cache); + + if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) { + view->current_page = best_current_page; + ev_page_cache_set_current_page (view->page_cache, best_current_page); } ev_pixbuf_cache_set_page_range (view->pixbuf_cache, @@ -522,32 +553,52 @@ ev_view_set_scroll_adjustments (EvView *view, static void add_scroll_binding_keypad (GtkBindingSet *binding_set, guint keyval, - GtkScrollType scroll, + GdkModifierType modifiers, + EvScrollType scroll, gboolean horizontal) { guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; - gtk_binding_entry_add_signal (binding_set, keyval, 0, + gtk_binding_entry_add_signal (binding_set, keyval, modifiers, "binding_activated", 2, - GTK_TYPE_SCROLL_TYPE, scroll, + EV_TYPE_SCROLL_TYPE, scroll, G_TYPE_BOOLEAN, horizontal); - gtk_binding_entry_add_signal (binding_set, keypad_keyval, 0, + gtk_binding_entry_add_signal (binding_set, keypad_keyval, modifiers, "binding_activated", 2, - GTK_TYPE_SCROLL_TYPE, scroll, + EV_TYPE_SCROLL_TYPE, scroll, G_TYPE_BOOLEAN, horizontal); } void ev_view_scroll (EvView *view, - EvScrollType scroll) + EvScrollType scroll, + gboolean horizontal) { GtkAdjustment *adjustment; double value, increment; gboolean first_page = FALSE; gboolean last_page = FALSE; + view->jump_to_find_result = FALSE; + + if (view->presentation || view->sizing_mode == EV_SIZING_BEST_FIT) { + switch (scroll) { + case EV_SCROLL_PAGE_BACKWARD: + case EV_SCROLL_STEP_BACKWARD: + ev_view_previous_page (view); + break; + case EV_SCROLL_PAGE_FORWARD: + case EV_SCROLL_STEP_FORWARD: + ev_view_next_page (view); + break; + default: + break; + } + return; + } + /* Assign values for increment and vertical adjustment */ - adjustment = view->vadjustment; + adjustment = horizontal ? view->hadjustment : view->vadjustment; increment = adjustment->page_size * 0.75; value = adjustment->value; @@ -565,7 +616,7 @@ ev_view_scroll (EvView *view, /* At the top of a page, assign the upper bound limit of previous page */ } else if (value == (adjustment->lower)) { value = adjustment->upper - adjustment->page_size; - ev_page_cache_set_current_page (view->page_cache, view->current_page - 1); + ev_view_previous_page (view); /* Jump to the top */ } else { value = MAX (value - increment, adjustment->lower); @@ -578,62 +629,30 @@ ev_view_scroll (EvView *view, /* At the bottom of a page, assign the lower bound limit of next page */ } else if (value == (adjustment->upper - adjustment->page_size)) { value = 0; - ev_page_cache_set_current_page (view->page_cache, view->current_page + 1); + ev_view_next_page (view); /* Jump to the bottom */ } else { value = MIN (value + increment, adjustment->upper - adjustment->page_size); } break; - default: - break; - } - - gtk_adjustment_set_value (adjustment, value); -} - -static void -ev_view_binding_activated (EvView *view, - GtkScrollType scroll, - gboolean horizontal) -{ - GtkAdjustment *adjustment; - double value; - - if (view->presentation) { - switch (scroll) { - case GTK_SCROLL_STEP_BACKWARD: - ev_view_previous_page (view); - break; - case GTK_SCROLL_STEP_FORWARD: - ev_view_next_page (view); - break; - default: - break; - } - return; - } - - if (horizontal) { - adjustment = view->hadjustment; - } else { - adjustment = view->vadjustment; - } - - value = adjustment->value; - - switch (scroll) { - case GTK_SCROLL_STEP_BACKWARD: + case EV_SCROLL_STEP_BACKWARD: value -= adjustment->step_increment; break; - case GTK_SCROLL_STEP_FORWARD: + case EV_SCROLL_STEP_FORWARD: value += adjustment->step_increment; break; - default: + case EV_SCROLL_STEP_DOWN: + value -= adjustment->step_increment / 10; + break; + case EV_SCROLL_STEP_UP: + value += adjustment->step_increment / 10; + break; + default: break; } value = CLAMP (value, adjustment->lower, - adjustment->upper - adjustment->page_size); + adjustment->upper - adjustment->page_size); gtk_adjustment_set_value (adjustment, value); } @@ -647,7 +666,7 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) GtkAdjustment *adjustment; int value; - view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->pending_scroll = SCROLL_TO_FIND_LOCATION; adjustment = view->vadjustment; @@ -672,6 +691,8 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) widget->allocation.width + MARGIN); gtk_adjustment_set_value (view->hadjustment, value); } + + gtk_widget_queue_resize (GTK_WIDGET (view)); } /*** Geometry computations ***/ @@ -704,7 +725,7 @@ get_page_y_offset (EvView *view, int page, double zoom, int *y_offset) if (view->dual_page) { ev_page_cache_get_height_to_page (view->page_cache, page, view->rotation, zoom, NULL, &offset); - offset += (page / 2 + 1) * view->spacing + (page / 2) * (border.top + border.bottom); + 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); } else { ev_page_cache_get_height_to_page (view->page_cache, page, view->rotation, zoom, &offset, NULL); @@ -747,9 +768,9 @@ get_page_extents (EvView *view, max_width = max_width + border->left + border->right; /* Get the location of the bounding box */ if (view->dual_page) { - x = view->spacing + (page % 2) * (max_width + view->spacing); + x = view->spacing + ((page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? 0 : 1) * (max_width + view->spacing); x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2; - if (page % 2 == 0) + if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) x = x + (max_width - width - border->left - border->right); } else { x = view->spacing; @@ -769,10 +790,11 @@ get_page_extents (EvView *view, GtkBorder overall_border; gint other_page; - other_page = page ^ 1; + other_page = (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? 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_page_cache_get_n_pages (view->page_cache) + && (0 <= other_page)) { ev_page_cache_get_size (view->page_cache, other_page, view->rotation, @@ -790,7 +812,7 @@ get_page_extents (EvView *view, y = view->spacing; /* Adjust for being the left or right page */ - if (page % 2 == 0) + if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) x = x + max_width - width; else x = x + (max_width + overall_border.left + overall_border.right) + view->spacing; @@ -1031,13 +1053,16 @@ location_in_selected_text (EvView *view, /*** Hyperref ***/ static EvLink * -get_link_at_location (EvView *view, - gdouble x, - gdouble y) +ev_view_get_link_at_location (EvView *view, + gdouble x, + gdouble y) { gint page = -1; gint x_offset = 0, y_offset = 0; GList *link_mapping; + + x += view->scroll_x; + y += view->scroll_y; find_page_at_location (view, x, y, &page, &x_offset, &y_offset); @@ -1053,46 +1078,40 @@ get_link_at_location (EvView *view, } static void -goto_fitr_link (EvView *view, EvLink *link) +goto_fitr_dest (EvView *view, EvLinkDest *dest) { - GdkPoint view_point; EvPoint doc_point; - int doc_width, doc_height, page; double zoom; - page = ev_link_get_page (link); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); - - doc_point.x = ev_link_get_left (link); - doc_point.y = ev_link_get_top (link); - - zoom = zoom_for_size_best_fit (ev_link_get_right (link) - ev_link_get_left (link), - ev_link_get_top (link) - ev_link_get_bottom (link), + zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - ev_link_dest_get_left (dest), + ev_link_dest_get_bottom (dest) - ev_link_dest_get_top (dest), ev_view_get_width (view), ev_view_get_height (view), 0, 0); ev_view_set_sizing_mode (view, EV_SIZING_FREE); ev_view_set_zoom (view, zoom, FALSE); - ev_page_cache_set_current_page (view->page_cache, page); - if (doc_point_to_view_point (view, page, &doc_point, &view_point)) { - gtk_adjustment_set_value (view->hadjustment, view_point.x); - gtk_adjustment_set_value (view->vadjustment, view_point.y); - } + doc_point.x = ev_link_dest_get_left (dest); + doc_point.y = ev_link_dest_get_top (dest); + + view->current_page = ev_link_dest_get_page (dest); + view->pending_point = doc_point; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + gtk_widget_queue_resize (GTK_WIDGET (view)); } static void -goto_fitv_link (EvView *view, EvLink *link) +goto_fitv_dest (EvView *view, EvLinkDest *dest) { - GdkPoint view_point; EvPoint doc_point; int doc_width, doc_height, page; double zoom; - page = ev_link_get_page (link); + page = ev_link_dest_get_page (dest); ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); - doc_point.x = ev_link_get_left (link); + doc_point.x = ev_link_dest_get_left (dest); doc_point.y = 0; zoom = zoom_for_size_fit_height (doc_width - doc_point.x , doc_height, @@ -1101,151 +1120,287 @@ goto_fitv_link (EvView *view, EvLink *link) ev_view_set_sizing_mode (view, EV_SIZING_FREE); ev_view_set_zoom (view, zoom, FALSE); - ev_page_cache_set_current_page (view->page_cache, page); - if (doc_point_to_view_point (view, page, &doc_point, &view_point)) { - gtk_adjustment_set_value (view->hadjustment, view_point.x); - } + view->current_page = page; + view->pending_point = doc_point; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + gtk_widget_queue_resize (GTK_WIDGET (view)); } static void -goto_fith_link (EvView *view, EvLink *link) +goto_fith_dest (EvView *view, EvLinkDest *dest) { - GdkPoint view_point; EvPoint doc_point; int doc_width, doc_height, page; double zoom; - page = ev_link_get_page (link); + page = ev_link_dest_get_page (dest); ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); doc_point.x = 0; - doc_point.y = doc_height - ev_link_get_top (link); + doc_point.y = ev_link_dest_get_top (dest); - zoom = zoom_for_size_fit_width (doc_width, ev_link_get_top (link), + zoom = zoom_for_size_fit_width (doc_width, ev_link_dest_get_top (dest), ev_view_get_width (view), ev_view_get_height (view), 0); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); + ev_view_set_sizing_mode (view, EV_SIZING_FIT_WIDTH); ev_view_set_zoom (view, zoom, FALSE); - if (doc_point_to_view_point (view, page, &doc_point, &view_point)) { - gtk_adjustment_set_value (view->vadjustment, view_point.y); - } else { - ev_page_cache_set_current_page (view->page_cache, page); - } + view->current_page = page; + view->pending_point = doc_point; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + gtk_widget_queue_resize (GTK_WIDGET (view)); } static void -goto_fit_link (EvView *view, EvLink *link) +goto_fit_dest (EvView *view, EvLinkDest *dest) { double zoom; int doc_width, doc_height; int page; - page = ev_link_get_page (link); + 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_view_set_sizing_mode (view, EV_SIZING_FREE); + ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); ev_view_set_zoom (view, zoom, FALSE); - ev_page_cache_set_current_page (view->page_cache, page); + + view->current_page = page; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + gtk_widget_queue_resize (GTK_WIDGET (view)); } static void -goto_xyz_link (EvView *view, EvLink *link) +goto_xyz_dest (EvView *view, EvLinkDest *dest) { - GdkPoint view_point; EvPoint doc_point; - int height, page; + gint page; double zoom; - zoom = ev_link_get_zoom (link); - page = ev_link_get_page (link); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, NULL, &height); + zoom = ev_link_dest_get_zoom (dest); + page = ev_link_dest_get_page (dest); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); - if (zoom != 0) { + if (zoom > 1) { + ev_view_set_sizing_mode (view, EV_SIZING_FREE); ev_view_set_zoom (view, zoom, FALSE); } - doc_point.x = ev_link_get_left (link); - doc_point.y = height - ev_link_get_top (link); + doc_point.x = ev_link_dest_get_left (dest); + doc_point.y = ev_link_dest_get_top (dest); - if (doc_point_to_view_point (view, page, &doc_point, &view_point)) { - gtk_adjustment_set_value (view->hadjustment, view_point.x); - gtk_adjustment_set_value (view->vadjustment, view_point.y); - } else { - ev_page_cache_set_current_page (view->page_cache, page); - } + view->current_page = page; + view->pending_point = doc_point; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + gtk_widget_queue_resize (GTK_WIDGET (view)); } -void -ev_view_goto_link (EvView *view, EvLink *link) +static void +goto_dest (EvView *view, EvLinkDest *dest) { - EvLinkType type; - int page; + EvLinkDestType type; + int page, n_pages; - type = ev_link_get_link_type (link); + page = ev_link_dest_get_page (dest); + n_pages = ev_page_cache_get_n_pages (view->page_cache); + + if (page < 0 || page >= n_pages) + return; + + type = ev_link_dest_get_dest_type (dest); switch (type) { - case EV_LINK_TYPE_TITLE: - break; - case EV_LINK_TYPE_PAGE: - page = ev_link_get_page (link); + case EV_LINK_DEST_TYPE_PAGE: ev_page_cache_set_current_page (view->page_cache, page); break; - case EV_LINK_TYPE_PAGE_FIT: - goto_fit_link (view, link); + case EV_LINK_DEST_TYPE_FIT: + goto_fit_dest (view, dest); + break; + case EV_LINK_DEST_TYPE_FITH: + goto_fith_dest (view, dest); + break; + case EV_LINK_DEST_TYPE_FITV: + goto_fitv_dest (view, dest); + break; + case EV_LINK_DEST_TYPE_FITR: + goto_fitr_dest (view, dest); break; - case EV_LINK_TYPE_PAGE_FITH: - goto_fith_link (view, link); + case EV_LINK_DEST_TYPE_XYZ: + goto_xyz_dest (view, dest); break; - case EV_LINK_TYPE_PAGE_FITV: - goto_fitv_link (view, link); + case EV_LINK_DEST_TYPE_PAGE_LABEL: + ev_page_cache_set_page_label (view->page_cache, ev_link_dest_get_page_label (dest)); break; - case EV_LINK_TYPE_PAGE_FITR: - goto_fitr_link (view, link); + default: + g_assert_not_reached (); + } +} + +void +ev_view_goto_dest (EvView *view, EvLinkDest *dest) +{ + EvLinkDestType type; + + type = ev_link_dest_get_dest_type (dest); + + if (type == EV_LINK_DEST_TYPE_NAMED) { + EvLinkDest *dest2; + const gchar *named_dest; + + named_dest = ev_link_dest_get_named_dest (dest); + dest2 = ev_document_links_find_link_dest (EV_DOCUMENT_LINKS (view->document), + named_dest); + if (dest2) { + goto_dest (view, dest2); + g_object_unref (dest2); + } + + return; + } + + goto_dest (view, dest); +} + +void +ev_view_handle_link (EvView *view, EvLink *link) +{ + EvLinkAction *action = NULL; + EvLinkActionType type; + + action = ev_link_get_action (link); + if (!action) + return; + + type = ev_link_action_get_action_type (action); + + switch (type) { + case EV_LINK_ACTION_TYPE_GOTO_DEST: { + EvLinkDest *dest; + + dest = ev_link_action_get_dest (action); + ev_view_goto_dest (view, dest); + } break; - case EV_LINK_TYPE_PAGE_XYZ: - goto_xyz_link (view, link); + case EV_LINK_ACTION_TYPE_GOTO_REMOTE: + case EV_LINK_ACTION_TYPE_EXTERNAL_URI: + case EV_LINK_ACTION_TYPE_LAUNCH: + case EV_LINK_ACTION_TYPE_NAMED: + g_signal_emit (view, signals[SIGNAL_EXTERNAL_LINK], 0, action); break; - case EV_LINK_TYPE_EXTERNAL_URI: - case EV_LINK_TYPE_LAUNCH: - g_signal_emit (view, signals[SIGNAL_EXTERNAL_LINK], 0, link); + } +} + +static gchar * +page_label_from_dest (EvView *view, EvLinkDest *dest) +{ + EvLinkDestType type; + gchar *msg = NULL; + + type = ev_link_dest_get_dest_type (dest); + + switch (type) { + case EV_LINK_DEST_TYPE_NAMED: { + EvLinkDest *dest2; + const gchar *named_dest; + + named_dest = ev_link_dest_get_named_dest (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)); + g_object_unref (dest2); + } + } + break; + default: + msg = ev_page_cache_get_page_label (view->page_cache, + ev_link_dest_get_page (dest)); + } + + return msg; +} + +static char * +tip_from_action_named (EvLinkAction *action) +{ + const gchar *name = ev_link_action_get_name (action); + + if (g_ascii_strcasecmp (name, "FirstPage") == 0) { + return g_strdup (_("Go to first page")); + } else if (g_ascii_strcasecmp (name, "PrevPage") == 0) { + return g_strdup (_("Go to previous page")); + } else if (g_ascii_strcasecmp (name, "NextPage") == 0) { + return g_strdup (_("Go to next page")); + } else if (g_ascii_strcasecmp (name, "LastPage") == 0) { + return g_strdup (_("Go to last page")); + } else if (g_ascii_strcasecmp (name, "GoToPage") == 0) { + return g_strdup (_("Go to page")); + } else if (g_ascii_strcasecmp (name, "Find") == 0) { + return g_strdup (_("Find")); } + + return NULL; } static char * tip_from_link (EvView *view, EvLink *link) { - EvLinkType type; + EvLinkAction *action; + EvLinkActionType type; char *msg = NULL; char *page_label; + const char *title; - type = ev_link_get_link_type (link); + action = ev_link_get_action (link); + title = ev_link_get_title (link); + + if (!action) + return title ? g_strdup (title) : NULL; + + type = ev_link_action_get_action_type (action); switch (type) { - case EV_LINK_TYPE_TITLE: - if (ev_link_get_title (link)) - msg = g_strdup (ev_link_get_title (link)); - break; - case EV_LINK_TYPE_PAGE: - case EV_LINK_TYPE_PAGE_XYZ: - page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link)); + case EV_LINK_ACTION_TYPE_GOTO_DEST: + page_label = page_label_from_dest (view, + ev_link_action_get_dest (action)); msg = g_strdup_printf (_("Go to page %s"), page_label); g_free (page_label); break; - case EV_LINK_TYPE_EXTERNAL_URI: - msg = g_strdup (ev_link_get_uri (link)); + case EV_LINK_ACTION_TYPE_GOTO_REMOTE: + if (title) { + msg = g_strdup_printf (_("Go to %s on file “%s”"), title, + ev_link_action_get_filename (action)); + } else { + msg = g_strdup_printf (_("Go to file “%s”"), + ev_link_action_get_filename (action)); + } + + break; + case EV_LINK_ACTION_TYPE_EXTERNAL_URI: + msg = g_strdup (ev_link_action_get_uri (action)); + break; + case EV_LINK_ACTION_TYPE_LAUNCH: + msg = g_strdup_printf (_("Launch %s"), + ev_link_action_get_filename (action)); + break; + case EV_LINK_ACTION_TYPE_NAMED: + msg = tip_from_action_named (action); break; - default: + default: + if (title) + msg = g_strdup (title); break; } - + return msg; } @@ -1254,7 +1409,7 @@ handle_link_over_xy (EvView *view, gint x, gint y) { EvLink *link; - link = get_link_at_location (view, x + view->scroll_x, y + view->scroll_y); + link = ev_view_get_link_at_location (view, x, y); if (view->link_tooltip == NULL) { view->link_tooltip = ev_tooltip_new (GTK_WIDGET (view)); @@ -1456,12 +1611,12 @@ ev_view_size_allocate (GtkWidget *widget, view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL); - view->pending_scroll = SCROLL_TO_KEEP_POSITION; - view->pending_resize = FALSE; - if (view->document) view_update_range_and_current_page (view); + view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->pending_resize = FALSE; + GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); } @@ -1532,6 +1687,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) return TRUE; } + view->jump_to_find_result = FALSE; /* Shift+Wheel scrolls the in the perpendicular direction */ if (state & GDK_SHIFT_MASK) { if (event->direction == GDK_SCROLL_UP) @@ -1549,14 +1705,14 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) if (state == 0 && view->presentation) { switch (event->direction) { - case GDK_SCROLL_DOWN: - case GDK_SCROLL_RIGHT: - ev_view_next_page (view); - break; - case GDK_SCROLL_UP: - case GDK_SCROLL_LEFT: - ev_view_previous_page (view); - break; + case GDK_SCROLL_DOWN: + case GDK_SCROLL_RIGHT: + ev_view_next_page (view); + break; + case GDK_SCROLL_UP: + case GDK_SCROLL_LEFT: + ev_view_previous_page (view); + break; } return TRUE; @@ -1590,12 +1746,24 @@ ev_view_expose_event (GtkWidget *widget, EvView *view = EV_VIEW (widget); int i; + if (view->loading) { + GdkRectangle area = {0}; + + area.width = widget->allocation.width; + area.height = widget->allocation.height; + + draw_loading_text (view, + &area, + &(event->area)); + } + if (view->document == NULL) return FALSE; for (i = view->start_page; i <= view->end_page; i++) { GdkRectangle page_area; GtkBorder border; + gboolean page_ready = TRUE; if (!get_page_extents (view, i, &page_area, &border)) continue; @@ -1603,20 +1771,34 @@ ev_view_expose_event (GtkWidget *widget, page_area.x -= view->scroll_x; page_area.y -= view->scroll_y; - draw_one_page (view, i, &page_area, &border, &(event->area)); + draw_one_page (view, i, &page_area, &border, &(event->area), &page_ready); - if (EV_IS_DOCUMENT_FIND (view->document)) + if (page_ready && EV_IS_DOCUMENT_FIND (view->document)) highlight_find_results (view, i); } return FALSE; } +static gboolean +ev_view_popup_menu (GtkWidget *widget) +{ + gint x, y; + EvLink *link; + EvView *view = EV_VIEW (widget); + + gtk_widget_get_pointer (widget, &x, &y); + link = ev_view_get_link_at_location (view, x, y); + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); + return TRUE; +} + static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event) { EvView *view = EV_VIEW (widget); + EvLink *link; if (!GTK_WIDGET_HAS_FOCUS (widget)) { gtk_widget_grab_focus (widget); @@ -1653,6 +1835,10 @@ ev_view_button_press_event (GtkWidget *widget, ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG); + return TRUE; + case 3: + link = ev_view_get_link_at_location (view, event->x, event->y); + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); return TRUE; } @@ -1691,10 +1877,10 @@ selection_update_idle_cb (EvView *view) static gboolean selection_scroll_timeout_cb (EvView *view) { - gint y, shift = 0; + gint x, y, shift = 0; GtkWidget *widget = GTK_WIDGET (view); - gtk_widget_get_pointer (widget, NULL, &y); + gtk_widget_get_pointer (widget, &x, &y); if (y > widget->allocation.height) { shift = (y - widget->allocation.height) / 2; @@ -1708,6 +1894,20 @@ selection_scroll_timeout_cb (EvView *view) view->vadjustment->lower, view->vadjustment->upper - view->vadjustment->page_size)); + + if (x > widget->allocation.width) { + shift = (x - widget->allocation.width) / 2; + } else if (x < 0) { + shift = x / 2; + } + + if (shift) + gtk_adjustment_set_value (view->hadjustment, + CLAMP (view->hadjustment->value + shift, + view->hadjustment->lower, + view->hadjustment->upper - + view->hadjustment->page_size)); + return TRUE; } @@ -1834,9 +2034,8 @@ ev_view_button_release_event (GtkWidget *widget, ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } - if (view->document) { - link = get_link_at_location (view, event->x + view->scroll_x, - event->y + view->scroll_y); + if (view->document && view->pressed_button == 1) { + link = ev_view_get_link_at_location (view, event->x, event->y); } else { link = NULL; } @@ -1863,15 +2062,15 @@ ev_view_button_release_event (GtkWidget *widget, view->selection_info.in_drag = FALSE; } else if (link) { - ev_view_goto_link (view, link); + ev_view_handle_link (view, link); } else if (view->presentation) { switch (event->button) { - case 1: - ev_view_next_page (view); - return TRUE; - case 3: - ev_view_previous_page (view); - return TRUE; + case 1: + ev_view_next_page (view); + return TRUE; + case 3: + ev_view_previous_page (view); + return TRUE; } } @@ -2005,7 +2204,7 @@ highlight_find_results (EvView *view, int page) GdkRectangle view_rectangle; guchar alpha; - if (i == view->find_result && page == view->find_page) { + if (i == view->find_result && page == view->current_page) { alpha = 0x90; } else { alpha = 0x20; @@ -2029,6 +2228,12 @@ draw_loading_text (EvView *view, double real_scale; int target_width; + /* Don't annoy users with loading messages during presentations. + * FIXME: Temporary "workaround" for + * http://bugzilla.gnome.org/show_bug.cgi?id=320352 */ + if (view->presentation) + return; + const char *loading_text = _("Loading..."); layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text); @@ -2068,18 +2273,22 @@ draw_one_page (EvView *view, gint page, GdkRectangle *page_area, GtkBorder *border, - GdkRectangle *expose_area) + GdkRectangle *expose_area, + gboolean *page_ready) { gint width, height; GdkPixbuf *current_pixbuf; GdkRectangle overlap; GdkRectangle real_page_area; EvViewSelection *selection; + gint current_page; g_assert (view->document); + if (! gdk_rectangle_intersect (page_area, expose_area, &overlap)) return; - + + current_page = ev_page_cache_get_current_page (view->page_cache); selection = find_selection_for_page (view, page); ev_page_cache_get_size (view->page_cache, page, view->rotation, @@ -2092,10 +2301,12 @@ draw_one_page (EvView *view, real_page_area.y += border->top; real_page_area.width -= (border->left + border->right); real_page_area.height -= (border->top + border->bottom); + *page_ready = TRUE; ev_document_misc_paint_one_page (GTK_WIDGET(view)->window, GTK_WIDGET (view), - page_area, border); + page_area, border, + page == current_page); if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) { GdkPixbuf *selection_pixbuf = NULL; @@ -2150,6 +2361,7 @@ draw_one_page (EvView *view, draw_loading_text (view, &real_page_area, expose_area); + *page_ready = FALSE; } if (scaled_selection) { @@ -2201,6 +2413,7 @@ ev_view_destroy (GtkObject *object) if (view->link_tooltip) { gtk_widget_destroy (view->link_tooltip); + view->link_tooltip = NULL; } if (view->selection_scroll_id) { @@ -2226,31 +2439,30 @@ 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); + 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); } } @@ -2293,41 +2505,40 @@ ev_view_get_property (GObject *object, { EvView *view = EV_VIEW (object); - switch (prop_id) - { - case PROP_STATUS: - g_value_set_string (value, view->status); - break; - case PROP_FIND_STATUS: - g_value_set_string (value, view->status); - break; - 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); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + switch (prop_id) { + case PROP_STATUS: + g_value_set_string (value, view->status); + break; + case PROP_FIND_STATUS: + g_value_set_string (value, view->status); + break; + 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); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } } @@ -2358,10 +2569,11 @@ ev_view_class_init (EvViewClass *class) widget_class->leave_notify_event = ev_view_leave_notify_event; widget_class->style_set = ev_view_style_set; widget_class->drag_data_get = ev_view_drag_data_get; + widget_class->popup_menu = ev_view_popup_menu; gtk_object_class->destroy = ev_view_destroy; class->set_scroll_adjustments = ev_view_set_scroll_adjustments; - class->binding_activated = ev_view_binding_activated; + class->binding_activated = ev_view_scroll; widget_class->set_scroll_adjustments_signal = g_signal_new ("set-scroll-adjustments", @@ -2399,6 +2611,14 @@ ev_view_class_init (EvViewClass *class) g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); + signals[SIGNAL_POPUP_MENU] = g_signal_new ("popup", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvViewClass, popup_menu), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); g_object_class_install_property (object_class, PROP_STATUS, @@ -2483,10 +2703,14 @@ ev_view_class_init (EvViewClass *class) binding_set = gtk_binding_set_by_class (class); - add_scroll_binding_keypad (binding_set, GDK_Left, GTK_SCROLL_STEP_BACKWARD, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE); - add_scroll_binding_keypad (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Left, 0, EV_SCROLL_STEP_BACKWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Right, 0, EV_SCROLL_STEP_FORWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Left, GDK_MOD1_MASK, EV_SCROLL_STEP_DOWN, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, EV_SCROLL_STEP_UP, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Up, 0, EV_SCROLL_STEP_BACKWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Down, 0, EV_SCROLL_STEP_FORWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Up, GDK_MOD1_MASK, EV_SCROLL_STEP_DOWN, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Down, GDK_MOD1_MASK, EV_SCROLL_STEP_UP, FALSE); } static void @@ -2510,6 +2734,7 @@ ev_view_init (EvView *view) view->fullscreen = FALSE; view->sizing_mode = EV_SIZING_FIT_WIDTH; view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->jump_to_find_result = TRUE; } /*** Callbacks ***/ @@ -2517,10 +2742,18 @@ ev_view_init (EvView *view) static void find_changed_cb (EvDocument *document, int page, EvView *view) { - jump_to_find_page (view, EV_VIEW_FIND_NEXT); - jump_to_find_result (view); - update_find_status_message (view); + double percent; + int n_pages; + percent = ev_document_find_get_progress + (EV_DOCUMENT_FIND (view->document)); + n_pages = ev_page_cache_get_n_pages (view->page_cache); + + if (view->jump_to_find_result == TRUE) { + jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0); + jump_to_find_result (view); + } + update_find_status_message (view, percent * n_pages >= n_pages - 1 ); if (view->current_page == page) gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -2538,16 +2771,16 @@ page_changed_cb (EvPageCache *page_cache, EvView *view) { if (view->current_page != new_page) { - view->current_page = new_page; - view->pending_scroll = SCROLL_TO_CURRENT_PAGE; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); + } else { + gtk_widget_queue_draw (GTK_WIDGET (view)); + } - if (EV_IS_DOCUMENT_FIND (view->document)) { - view->find_page = new_page; - view->find_result = 0; - update_find_status_message (view); - } + if (EV_IS_DOCUMENT_FIND (view->document)) { + view->find_result = 0; + update_find_status_message (view, TRUE); } } @@ -2616,12 +2849,22 @@ clear_caches (EvView *view) } } +void +ev_view_set_loading (EvView *view, + gboolean loading) +{ + view->loading = loading; + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + void ev_view_set_document (EvView *view, EvDocument *document) { g_return_if_fail (EV_IS_VIEW (view)); + view->loading = FALSE; + if (document != view->document) { clear_caches (view); @@ -2635,7 +2878,6 @@ ev_view_set_document (EvView *view, } view->document = document; - view->find_page = 0; view->find_result = 0; if (view->document) { @@ -2706,7 +2948,7 @@ ev_view_set_continuous (EvView *view, if (view->continuous != continuous) { view->continuous = continuous; - view->pending_scroll = SCROLL_TO_CURRENT_PAGE; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); } @@ -2732,7 +2974,7 @@ ev_view_set_dual_page (EvView *view, if (view->dual_page == dual_page) return; - view->pending_scroll = SCROLL_TO_CURRENT_PAGE; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; view->dual_page = dual_page; /* FIXME: if we're keeping the pixbuf cache around, we should extend the * preload_cache_size to be 2 if dual_page is set. @@ -2779,7 +3021,7 @@ ev_view_set_presentation (EvView *view, return; view->presentation = presentation; - view->pending_scroll = SCROLL_TO_CURRENT_PAGE; + view->pending_scroll = SCROLL_TO_PAGE_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); if (GTK_WIDGET_REALIZED (view)) { @@ -3184,11 +3426,11 @@ ev_view_set_status (EvView *view, const char *message) } static void -update_find_status_message (EvView *view) +update_find_status_message (EvView *view, gboolean this_page) { char *message; - if (view->current_page == view->find_page) { + if (this_page) { int results; results = ev_document_find_get_n_results @@ -3206,13 +3448,9 @@ update_find_status_message (EvView *view) percent = ev_document_find_get_progress (EV_DOCUMENT_FIND (view->document)); - if (percent >= (1.0 - 1e-10)) { - message = g_strdup (_("Not found")); - } else { - message = g_strdup_printf (_("%3d%% remaining to search"), - (int) ((1.0 - percent) * 100)); - } - + message = g_strdup_printf (_("%3d%% remaining to search"), + (int) ((1.0 - percent) * 100)); + } ev_view_set_find_status (view, message); g_free (message); @@ -3245,7 +3483,7 @@ jump_to_find_result (EvView *view) EvRectangle rect; GdkRectangle view_rect; int n_results; - int page = view->find_page; + int page = view->current_page; n_results = ev_document_find_get_n_results (find, page); @@ -3258,8 +3496,18 @@ jump_to_find_result (EvView *view) } } +/** + * jump_to_find_page + * @view: #EvView instance + * @direction: Direction to look + * @shift: Shift from current page + * + * Jumps to the first page that has occurences of searched word. + * Uses a direction where to look and a shift from current page. + * + */ static void -jump_to_find_page (EvView *view, EvViewFindDirection direction) +jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) { int n_pages, i; @@ -3270,11 +3518,11 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction) int page; if (direction == EV_VIEW_FIND_NEXT) - page = view->find_page + i; + page = view->current_page + i; else - page = view->find_page - i; - - + page = view->current_page - i; + page += shift; + if (page >= n_pages) { page = page - n_pages; } @@ -3284,7 +3532,6 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction) has_results = ev_document_find_page_has_results (EV_DOCUMENT_FIND (view->document), page); if (has_results == -1) { - view->find_page = page; break; } else if (has_results == 1) { ev_page_cache_set_current_page (view->page_cache, page); @@ -3326,12 +3573,7 @@ ev_view_find_next (EvView *view) if (view->find_result >= n_results) { view->find_result = 0; - view->find_page++; - if (view->find_page >= n_pages) { - view->find_page = 0; - } - - jump_to_find_page (view, EV_VIEW_FIND_NEXT); + jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1); jump_to_find_result (view); } else { jump_to_find_result (view); @@ -3339,6 +3581,23 @@ ev_view_find_next (EvView *view) } } +gboolean +ev_view_can_find_previous (EvView *view) +{ + if (EV_IS_DOCUMENT_FIND (view->document)) { + EvDocumentFind *find = EV_DOCUMENT_FIND (view->document); + int i, n_pages; + + n_pages = ev_page_cache_get_n_pages (view->page_cache); + for (i = n_pages - 1; i >= 0; i--) { + if (ev_document_find_get_n_results (find, i) > 0) { + return TRUE; + } + } + } + + return FALSE; +} void ev_view_find_previous (EvView *view) { @@ -3356,12 +3615,7 @@ ev_view_find_previous (EvView *view) if (view->find_result < 0) { - view->find_page--; - if (view->find_page < 0) { - view->find_page = n_pages - 1; - } - - jump_to_find_page (view, EV_VIEW_FIND_PREV); + jump_to_find_page (view, EV_VIEW_FIND_PREV, -1); view->find_result = ev_document_find_get_n_results (find, view->current_page) - 1; jump_to_find_result (view); } else { @@ -3370,6 +3624,12 @@ ev_view_find_previous (EvView *view) } } +void ev_view_search_changed (EvView *view) +{ + /* search string has changed, focus on new search result */ + view->jump_to_find_result = TRUE; +} + /*** Selections ***/ /* compute_new_selection_rect/text calculates the area currently selected by @@ -3877,13 +4137,23 @@ ev_view_next_page (EvView *view) int page; g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + + if (!view->page_cache) + return FALSE; page = ev_page_cache_get_current_page (view->page_cache); - page = ev_view_get_dual_page (view) ? page + 2 : page + 1; + + if (view->dual_page && !view->presentation) + page = page + 2; + else + page = page + 1; if (page < ev_page_cache_get_n_pages (view->page_cache)) { ev_page_cache_set_current_page (view->page_cache, page); return TRUE; + } else if (ev_view_get_dual_page (view) && page == ev_page_cache_get_n_pages (view->page_cache)) { + ev_page_cache_set_current_page (view->page_cache, page - 1); + return TRUE; } else { return FALSE; } @@ -3896,13 +4166,23 @@ ev_view_previous_page (EvView *view) g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + if (!view->page_cache) + return FALSE; + page = ev_page_cache_get_current_page (view->page_cache); - page = ev_view_get_dual_page (view) ? page - 2 : page - 1; + + if (view->dual_page && !view->presentation) + page = page - 2; + else + page = page - 1; if (page >= 0) { ev_page_cache_set_current_page (view->page_cache, page); return TRUE; - } else { + } else if (ev_view_get_dual_page (view) && page == -1) { + ev_page_cache_set_current_page (view->page_cache, 0); + return TRUE; + } else { return FALSE; } } @@ -3924,3 +4204,22 @@ ev_sizing_mode_get_type (void) } return etype; } + +GType +ev_scroll_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + { EV_SCROLL_PAGE_FORWARD, "EV_SCROLL_PAGE_FORWARD", "scroll-page-forward" }, + { EV_SCROLL_PAGE_BACKWARD, "EV_SCROLL_PAGE_BACKWARD", "scroll-page-backward" }, + { EV_SCROLL_STEP_FORWARD, "EV_SCROLL_STEP_FORWARD", "scroll-step-forward" }, + { EV_SCROLL_STEP_FORWARD, "EV_SCROLL_STEP_FORWARD", "scroll-step-forward" }, + { EV_SCROLL_STEP_UP, "EV_SCROLL_STEP_UP", "scroll-step-up" }, + { EV_SCROLL_STEP_DOWN, "EV_SCROLL_STEP_DOWN", "scroll-step-down" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static ("EvScrollType", values); + } + return etype; +}