X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view.c;h=4fda98c155989e76c65369fa5d000bbcd973e5fc;hb=8370e4fa6c0a90a4d10294e3a74ed87d90b8db94;hp=d8eb8ac2b2d1aad5d98c7423db4eae11f243b5f0;hpb=e0acc158e0e24d2f5d0d482ca7eaa20ad83e0f82;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index d8eb8ac2..4fda98c1 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -26,20 +27,25 @@ #include #include #include -#include #include "ev-marshal.h" #include "ev-view.h" #include "ev-view-private.h" #include "ev-utils.h" #include "ev-selection.h" +#include "ev-document-links.h" +#include "ev-document-images.h" #include "ev-document-find.h" +#include "ev-document-transition.h" +#include "ev-document-forms.h" #include "ev-document-misc.h" -#include "ev-debug.h" #include "ev-job-queue.h" #include "ev-page-cache.h" #include "ev-pixbuf-cache.h" +#if !GTK_CHECK_VERSION (2, 11, 7) #include "ev-tooltip.h" +#endif +#include "ev-application.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)) @@ -48,7 +54,6 @@ enum { PROP_0, - PROP_STATUS, PROP_FIND_STATUS, PROP_CONTINUOUS, PROP_DUAL_PAGE, @@ -63,11 +68,18 @@ enum { enum { SIGNAL_BINDING_ACTIVATED, SIGNAL_ZOOM_INVALID, + SIGNAL_HANDLE_LINK, SIGNAL_EXTERNAL_LINK, SIGNAL_POPUP_MENU, N_SIGNALS, }; +enum { + TARGET_DND_URI, + TARGET_DND_TEXT, + TARGET_DND_IMAGE +}; + enum { TARGET_STRING, TARGET_TEXT, @@ -76,13 +88,17 @@ enum { TARGET_TEXT_BUFFER_CONTENTS }; -static const GtkTargetEntry targets[] = { +static const GtkTargetEntry clipboard_targets[] = { { "STRING", 0, TARGET_STRING }, { "TEXT", 0, TARGET_TEXT }, { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, { "UTF8_STRING", 0, TARGET_UTF8_STRING }, }; +static const GtkTargetEntry view_drop_targets[] = { + { "text/uri-list", 0, 0 } +}; + static guint signals[N_SIGNALS]; typedef enum { @@ -101,22 +117,17 @@ typedef enum { /*** Scrolling ***/ static void scroll_to_current_page (EvView *view, GtkOrientation orientation); -static void ev_view_set_scroll_adjustments (EvView *view, +static void ev_view_set_scroll_adjustments (GtkLayout *layout, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); static void view_update_range_and_current_page (EvView *view); static void set_scroll_adjustment (EvView *view, GtkOrientation orientation, GtkAdjustment *adjustment); -static void ev_view_set_scroll_adjustments (EvView *view, - GtkAdjustment *hadjustment, - 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); @@ -148,19 +159,21 @@ 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); +static gboolean doc_point_to_view_point (EvView *view, + int page, + EvPoint *doc_point, + GdkPoint *view_point); /*** Hyperrefs ***/ -static EvLink * ev_view_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, - gint x, - gint y); +/*** Forms ***/ +static EvFormField *ev_view_get_form_field_at_location (EvView *view, + gdouble x, + gdouble y); + /*** GtkWidget implementation ***/ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition); @@ -179,6 +192,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, @@ -191,6 +205,7 @@ static gboolean ev_view_leave_notify_event (GtkWidget GdkEventCrossing *event); static void ev_view_style_set (GtkWidget *widget, GtkStyle *old_style); +static void ev_view_remove_all (EvView *view); static AtkObject *ev_view_get_accessible (GtkWidget *widget); @@ -204,8 +219,13 @@ static void highlight_find_results (EvView int page); static void draw_one_page (EvView *view, gint page, + cairo_t *cr, 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 ***/ @@ -213,6 +233,7 @@ static void find_changed_cb (EvDocument int page, EvView *view); static void job_finished_cb (EvPixbufCache *pixbuf_cache, + GdkRegion *region, EvView *view); static void page_changed_cb (EvPageCache *page_cache, int new_page, @@ -278,17 +299,19 @@ static void ev_view_zoom_for_size_single_page (EvView *view, static GdkCursor* ev_view_create_invisible_cursor (void); static void ev_view_set_cursor (EvView *view, EvViewCursor new_cursor); +static void ev_view_handle_cursor_over_xy (EvView *view, + gint x, + gint y); -/*** Status messages ***/ -static void ev_view_set_status (EvView *view, - const char *message); -static void update_find_status_message (EvView *view); +/*** Find ***/ +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, @@ -305,8 +328,12 @@ static void ev_view_primary_clear_cb (GtkClipboard gpointer data); static void ev_view_update_primary_selection (EvView *ev_view); +/*** Presentation ***/ +static void ev_view_presentation_transition_start (EvView *ev_view); +static void ev_view_presentation_transition_stop (EvView *ev_view); + -G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET) +G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT) static void scroll_to_current_page (EvView *view, GtkOrientation orientation) @@ -328,11 +355,14 @@ scroll_to_current_page (EvView *view, GtkOrientation orientation) if (orientation == GTK_ORIENTATION_VERTICAL) { if (view->continuous) { gtk_adjustment_clamp_page (view->vadjustment, - view_point.y - view->spacing, + view_point.y - view->spacing / 2, view_point.y + view->vadjustment->page_size); } else { gtk_adjustment_set_value (view->vadjustment, - view_point.y); + CLAMP (view_point.y, + view->vadjustment->lower, + view->vadjustment->upper - + view->vadjustment->page_size)); } } else { if (view->dual_page) { @@ -377,6 +407,7 @@ 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_PAGE_POSITION: @@ -397,6 +428,7 @@ 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; @@ -416,9 +448,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; @@ -426,8 +458,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)) @@ -443,39 +475,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, @@ -518,45 +561,67 @@ set_scroll_adjustment (EvView *view, } static void -ev_view_set_scroll_adjustments (EvView *view, +ev_view_set_scroll_adjustments (GtkLayout *layout, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment) { + EvView *view = EV_VIEW (layout); + set_scroll_adjustment (view, GTK_ORIENTATION_HORIZONTAL, hadjustment); set_scroll_adjustment (view, GTK_ORIENTATION_VERTICAL, vadjustment); - + on_adjustment_value_changed (NULL, 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; @@ -574,7 +639,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); @@ -587,62 +652,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); } @@ -656,7 +689,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; @@ -681,6 +714,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 ***/ @@ -713,7 +748,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); @@ -756,9 +791,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; @@ -778,10 +813,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, @@ -799,7 +835,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; @@ -1038,6 +1074,47 @@ location_in_selected_text (EvView *view, return FALSE; } +static gboolean +get_doc_point_from_offset (EvView *view, + gint page, + gint x_offset, + gint y_offset, + gint *x_new, + gint *y_new) +{ + int width, height; + double x, y; + + ev_page_cache_get_size (view->page_cache, page, + view->rotation, + 1.0, + &width, &height); + + x_offset = x_offset / view->scale; + y_offset = y_offset / view->scale; + + if (view->rotation == 0) { + x = x_offset; + y = y_offset; + } else if (view->rotation == 90) { + x = y_offset; + y = width - x_offset; + } else if (view->rotation == 180) { + x = width - x_offset; + y = height - y_offset; + } else if (view->rotation == 270) { + x = height - y_offset; + y = x_offset; + } else { + g_assert_not_reached (); + } + + *x_new = x; + *y_new = y; + + return TRUE; +} + /*** Hyperref ***/ static EvLink * ev_view_get_link_at_location (EvView *view, @@ -1046,7 +1123,11 @@ ev_view_get_link_at_location (EvView *view, { 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; @@ -1056,34 +1137,37 @@ ev_view_get_link_at_location (EvView *view, if (page == -1) return NULL; + + if (get_doc_point_from_offset (view, page, x_offset, + y_offset, &x_new, &y_new) == FALSE) + return NULL; + link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); if (link_mapping) - return ev_link_mapping_find (link_mapping, x_offset / view->scale, y_offset / view->scale); + return ev_link_mapping_find (link_mapping, x_new, y_new); else return NULL; } static void -goto_fitr_link (EvView *view, EvLink *link) +goto_fitr_dest (EvView *view, EvLinkDest *dest) { EvPoint doc_point; - int page; double zoom; - 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); - page = ev_link_get_page (link); - doc_point.x = ev_link_get_left (link); - doc_point.y = ev_link_get_top (link); + doc_point.x = ev_link_dest_get_left (dest); + doc_point.y = ev_link_dest_get_top (dest); - view->current_page = page; + view->current_page = ev_link_dest_get_page (dest); view->pending_point = doc_point; view->pending_scroll = SCROLL_TO_PAGE_POSITION; @@ -1091,16 +1175,16 @@ goto_fitr_link (EvView *view, EvLink *link) } static void -goto_fitv_link (EvView *view, EvLink *link) +goto_fitv_dest (EvView *view, EvLinkDest *dest) { 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, @@ -1118,23 +1202,23 @@ goto_fitv_link (EvView *view, EvLink *link) } static void -goto_fith_link (EvView *view, EvLink *link) +goto_fith_dest (EvView *view, EvLinkDest *dest) { 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); view->current_page = page; @@ -1145,19 +1229,19 @@ goto_fith_link (EvView *view, EvLink *link) } 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); view->current_page = page; @@ -1167,23 +1251,22 @@ goto_fit_link (EvView *view, EvLink *link) } static void -goto_xyz_link (EvView *view, EvLink *link) +goto_xyz_dest (EvView *view, EvLinkDest *dest) { 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); view->current_page = page; view->pending_point = doc_point; @@ -1192,80 +1275,233 @@ goto_xyz_link (EvView *view, EvLink *link) 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, current_page; + + page = ev_link_dest_get_page (dest); + n_pages = ev_page_cache_get_n_pages (view->page_cache); - type = ev_link_get_link_type (link); + if (page < 0 || page >= n_pages) + return; + + current_page = view->current_page; + + 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_TYPE_PAGE_FITH: - goto_fith_link (view, link); + case EV_LINK_DEST_TYPE_FITH: + goto_fith_dest (view, dest); break; - case EV_LINK_TYPE_PAGE_FITV: - goto_fitv_link (view, link); + case EV_LINK_DEST_TYPE_FITV: + goto_fitv_dest (view, dest); break; - case EV_LINK_TYPE_PAGE_FITR: - goto_fitr_link (view, link); + case EV_LINK_DEST_TYPE_FITR: + goto_fitr_dest (view, dest); + break; + case EV_LINK_DEST_TYPE_XYZ: + 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)); + break; + default: + g_assert_not_reached (); + } + + if (current_page != view->current_page) + ev_page_cache_set_current_page (view->page_cache, + view->current_page); +} + +static 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; + + g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link); + + 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); + } +} + +gchar * +ev_view_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; + case EV_LINK_DEST_TYPE_PAGE_LABEL: { + msg = g_strdup (ev_link_dest_get_page_label (dest)); + } + 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)); + case EV_LINK_ACTION_TYPE_GOTO_DEST: + page_label = ev_view_page_label_from_dest (view, + ev_link_action_get_dest (action)); + if (page_label) { + msg = g_strdup_printf (_("Go to page %s"), page_label); + g_free (page_label); + } + break; + 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_TYPE_PAGE: - case EV_LINK_TYPE_PAGE_XYZ: - page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link)); - msg = g_strdup_printf (_("Go to page %s"), page_label); - g_free (page_label); + case EV_LINK_ACTION_TYPE_LAUNCH: + msg = g_strdup_printf (_("Launch %s"), + ev_link_action_get_filename (action)); break; - case EV_LINK_TYPE_EXTERNAL_URI: - msg = g_strdup (ev_link_get_uri (link)); + case EV_LINK_ACTION_TYPE_NAMED: + msg = tip_from_action_named (action); break; - default: + default: + if (title) + msg = g_strdup (title); break; } - + return msg; } static void -handle_link_over_xy (EvView *view, gint x, gint y) +ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) { - EvLink *link; + EvLink *link; + EvFormField *field; + if (view->cursor == EV_VIEW_CURSOR_HIDDEN) + return; + link = ev_view_get_link_at_location (view, x, y); - + +#if !GTK_CHECK_VERSION (2, 11, 7) if (view->link_tooltip == NULL) { view->link_tooltip = ev_tooltip_new (GTK_WIDGET (view)); } @@ -1274,8 +1510,12 @@ handle_link_over_xy (EvView *view, gint x, gint y) view->hovered_link = link; ev_tooltip_deactivate (EV_TOOLTIP (view->link_tooltip)); } +#endif if (link) { +#if GTK_CHECK_VERSION (2, 11, 7) + g_object_set (view, "has-tooltip", TRUE, NULL); +#else char *msg = tip_from_link (view, link); if (msg && g_utf8_validate (msg, -1, NULL)) { @@ -1286,68 +1526,613 @@ handle_link_over_xy (EvView *view, gint x, gint y) ev_tooltip_activate (tooltip); } g_free (msg); - +#endif 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) { + if (view->cursor == EV_VIEW_CURSOR_LINK || + view->cursor == EV_VIEW_CURSOR_IBEAM) + ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); + } else if (EV_IS_FORM_FIELD_TEXT (field)) { + ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM); + } else { + 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 { - ev_view_set_status (view, NULL); if (view->cursor == EV_VIEW_CURSOR_LINK || view->cursor == EV_VIEW_CURSOR_IBEAM) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } - return; } -/*** GtkWidget implementation ***/ - -static void -ev_view_size_request_continuous_dual_page (EvView *view, - GtkRequisition *requisition) +/*** Images ***/ +static EvImage * +ev_view_get_image_at_location (EvView *view, + gdouble x, + gdouble y) { - int max_width; - gint n_pages; - GtkBorder border; + gint page = -1; + gint x_offset = 0, y_offset = 0; + gint x_new = 0, y_new = 0; + GList *image_mapping; - ev_page_cache_get_max_width (view->page_cache, view->rotation, - view->scale, &max_width); - compute_border (view, max_width, max_width, &border); + if (!EV_IS_DOCUMENT_IMAGES (view->document)) + return NULL; - n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1; + x += view->scroll_x; + y += view->scroll_y; - requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - 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 (page == -1) + return NULL; + + if (get_doc_point_from_offset (view, page, x_offset, + y_offset, &x_new, &y_new) == FALSE) + return NULL; + + image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page); + + if (image_mapping) + return ev_image_mapping_find (image_mapping, x_new, y_new); + else + return NULL; } -static void -ev_view_size_request_continuous (EvView *view, - GtkRequisition *requisition) +/*** Forms ***/ +static EvFormField * +ev_view_get_form_field_at_location (EvView *view, + gdouble x, + gdouble y) { - int max_width; - int n_pages; - GtkBorder border; + 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; - 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); + if (get_doc_point_from_offset (view, page, x_offset, + y_offset, &x_new, &y_new) == FALSE) + return NULL; - requisition->width = max_width + (view->spacing * 2) + border.left + border.right; - get_page_y_offset (view, n_pages, view->scale, &requisition->height); + forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, page); - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - requisition->width = 1; - } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { + if (forms_mapping) + return ev_form_field_mapping_find (forms_mapping, x_new, y_new); + else + return NULL; +} + +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); + ev_form_field_mapping_get_area (forms_mapping, field, &field_area); + doc_rect_to_view_rect (view, field->page, &field_area, &view_area); + view_area.x -= view->scroll_x; + view_area.y -= view->scroll_y; + + return gdk_region_rectangle (&view_area); +} + +static gboolean +ev_view_forms_remove_widgets (EvView *view) +{ + ev_view_remove_all (view); + + return FALSE; +} + +static void +ev_view_form_field_destroy (GtkWidget *widget, + EvView *view) +{ + g_idle_add ((GSourceFunc)ev_view_forms_remove_widgets, view); +} + +static GtkWidget * +ev_view_form_field_button_create_widget (EvView *view, + EvFormField *field) +{ + EvFormFieldButton *field_button = EV_FORM_FIELD_BUTTON (field); + GdkRegion *field_region = NULL; + + switch (field_button->type) { + case EV_FORM_FIELD_BUTTON_PUSH: + return NULL; + case EV_FORM_FIELD_BUTTON_CHECK: + case EV_FORM_FIELD_BUTTON_RADIO: { + gboolean state; + GList *forms_mapping, *l; + + state = ev_document_forms_form_field_button_get_state (EV_DOCUMENT_FORMS (view->document), + field); + + /* FIXME: it actually depends on NoToggleToOff flags */ + if (field_button->type == EV_FORM_FIELD_BUTTON_RADIO && + state && field_button->state) + return NULL; + + field_region = ev_view_form_field_get_region (view, field); + + /* 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); + for (l = forms_mapping; l; l = g_list_next (l)) { + EvFormField *button = ((EvFormFieldMapping *)(l->data))->field; + GdkRegion *button_region; + + if (button->id == field->id) + continue; + + /* FIXME: only buttons in the same group should be updated */ + if (!EV_IS_FORM_FIELD_BUTTON (button) || + EV_FORM_FIELD_BUTTON (button)->type != field_button->type || + EV_FORM_FIELD_BUTTON (button)->state != TRUE) + continue; + + button_region = ev_view_form_field_get_region (view, button); + gdk_region_union (field_region, button_region); + gdk_region_destroy (button_region); + } + + ev_document_forms_form_field_button_set_state (EV_DOCUMENT_FORMS (view->document), + field, !state); + field_button->state = !state; + } + break; + } + + ev_pixbuf_cache_reload_page (view->pixbuf_cache, + field_region, + field->page, + view->rotation, + view->scale); + gdk_region_destroy (field_region); + + return NULL; +} + +static void +ev_view_form_field_text_save (EvView *view, + GtkWidget *widget) +{ + EvFormField *field; + + if (!view->document) + return; + + field = g_object_get_data (G_OBJECT (widget), "form-field"); + + if (field->changed) { + EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field); + GdkRegion *field_region; + + field_region = ev_view_form_field_get_region (view, field); + + ev_document_forms_form_field_text_set_text (EV_DOCUMENT_FORMS (view->document), + field, field_text->text); + field->changed = FALSE; + ev_pixbuf_cache_reload_page (view->pixbuf_cache, + field_region, + field->page, + view->rotation, + view->scale); + gdk_region_destroy (field_region); + } +} + +static void +ev_view_form_field_text_changed (GtkWidget *widget, + EvFormField *field) +{ + EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field); + gchar *text = NULL; + + if (GTK_IS_ENTRY (widget)) { + text = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget))); + } else if (GTK_IS_TEXT_BUFFER (widget)) { + GtkTextIter start, end; + + gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (widget), &start, &end); + text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (widget), + &start, &end, FALSE); + } + + if (!field_text->text || + (field_text->text && g_ascii_strcasecmp (field_text->text, text) != 0)) { + g_free (field_text->text); + field_text->text = text; + field->changed = TRUE; + } +} + +static GtkWidget * +ev_view_form_field_text_create_widget (EvView *view, + EvFormField *field) +{ + EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field); + GtkWidget *text = NULL; + gchar *txt; + + txt = ev_document_forms_form_field_text_get_text (EV_DOCUMENT_FORMS (view->document), + field); + + switch (field_text->type) { + case EV_FORM_FIELD_TEXT_FILE_SELECT: + /* TODO */ + case EV_FORM_FIELD_TEXT_NORMAL: + text = gtk_entry_new (); + gtk_entry_set_has_frame (GTK_ENTRY (text), FALSE); + gtk_entry_set_max_length (GTK_ENTRY (text), field_text->max_len); + gtk_entry_set_visibility (GTK_ENTRY (text), !field_text->is_password); + + if (txt) { + gtk_entry_set_text (GTK_ENTRY (text), txt); + g_free (txt); + } + + g_signal_connect (G_OBJECT (text), "changed", + G_CALLBACK (ev_view_form_field_text_changed), + field); + g_signal_connect_after (G_OBJECT (text), "activate", + G_CALLBACK (ev_view_form_field_destroy), + view); + break; + case EV_FORM_FIELD_TEXT_MULTILINE: { + GtkTextBuffer *buffer; + + text = gtk_text_view_new (); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); + + if (txt) { + gtk_text_buffer_set_text (buffer, txt, -1); + g_free (txt); + } + + g_signal_connect (G_OBJECT (buffer), "changed", + G_CALLBACK (ev_view_form_field_text_changed), + field); + } + break; + } + + g_object_weak_ref (G_OBJECT (text), + (GWeakNotify)ev_view_form_field_text_save, + view); + + return text; +} + +static void +ev_view_form_field_choice_save (EvView *view, + GtkWidget *widget) +{ + EvFormField *field; + + if (!view->document) + return; + + field = g_object_get_data (G_OBJECT (widget), "form-field"); + + if (field->changed) { + GList *l; + EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field); + GdkRegion *field_region; + + field_region = ev_view_form_field_get_region (view, field); + + if (field_choice->is_editable) { + ev_document_forms_form_field_choice_set_text (EV_DOCUMENT_FORMS (view->document), + field, field_choice->text); + } else { + ev_document_forms_form_field_choice_unselect_all (EV_DOCUMENT_FORMS (view->document), field); + for (l = field_choice->selected_items; l; l = g_list_next (l)) { + ev_document_forms_form_field_choice_select_item (EV_DOCUMENT_FORMS (view->document), + field, + GPOINTER_TO_INT (l->data)); + } + } + field->changed = FALSE; + ev_pixbuf_cache_reload_page (view->pixbuf_cache, + field_region, + field->page, + view->rotation, + view->scale); + gdk_region_destroy (field_region); + } +} + +static void +ev_view_form_field_choice_changed (GtkWidget *widget, + EvFormField *field) +{ + EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field); + + if (GTK_IS_COMBO_BOX (widget)) { + gint item; + + item = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); + if (GPOINTER_TO_INT (field_choice->selected_items->data) != item) { + g_list_free (field_choice->selected_items); + field_choice->selected_items = NULL; + field_choice->selected_items = g_list_prepend (field_choice->selected_items, + GINT_TO_POINTER (item)); + field->changed = TRUE; + } + + if (GTK_IS_COMBO_BOX_ENTRY (widget)) { + gchar *text; + + text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); + if (!field_choice->text || + (field_choice->text && g_ascii_strcasecmp (field_choice->text, text) != 0)) { + g_free (field_choice->text); + field_choice->text = text; + field->changed = TRUE; + } + } + } else if (GTK_IS_TREE_SELECTION (widget)) { + GtkTreeSelection *selection = GTK_TREE_SELECTION (widget); + GtkTreeModel *model; + GList *items, *l; + + items = gtk_tree_selection_get_selected_rows (selection, &model); + g_list_free (field_choice->selected_items); + field_choice->selected_items = NULL; + + for (l = items; l && l->data; l = g_list_next (l)) { + GtkTreeIter iter; + GtkTreePath *path = (GtkTreePath *)l->data; + gint item; + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 1, &item, -1); + + field_choice->selected_items = g_list_prepend (field_choice->selected_items, + GINT_TO_POINTER (item)); + + gtk_tree_path_free (path); + } + + g_list_free (items); + + field->changed = TRUE; + } +} + +static GtkWidget * +ev_view_form_field_choice_create_widget (EvView *view, + EvFormField *field) +{ + EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field); + GtkWidget *choice; + GtkTreeModel *model; + gint n_items, i; + gint selected_item = 0; + + n_items = ev_document_forms_form_field_choice_get_n_items (EV_DOCUMENT_FORMS (view->document), + field); + model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT)); + for (i = 0; i < n_items; i++) { + GtkTreeIter iter; + gchar *item; + + item = ev_document_forms_form_field_choice_get_item (EV_DOCUMENT_FORMS (view->document), + field, i); + if (ev_document_forms_form_field_choice_is_item_selected ( + EV_DOCUMENT_FORMS (view->document), field, i)) { + selected_item = i; + /* FIXME: we need a get_selected_items function in poppler */ + field_choice->selected_items = g_list_prepend (field_choice->selected_items, + GINT_TO_POINTER (i)); + } + + if (item) { + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, item, + 1, i, + -1); + g_free (item); + } + } + + if (field_choice->type == EV_FORM_FIELD_CHOICE_LIST) { + GtkCellRenderer *renderer; + GtkWidget *tree_view; + GtkTreeSelection *selection; + + tree_view = gtk_tree_view_new_with_model (model); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); + if (field_choice->multi_select) { + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + } + + /* TODO: set selected items */ + + renderer = gtk_cell_renderer_text_new (); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), + 0, + "choix", renderer, + "text", 0, + NULL); + + choice = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (choice), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (choice), tree_view); + gtk_widget_show (tree_view); + + g_signal_connect (G_OBJECT (selection), "changed", + G_CALLBACK (ev_view_form_field_choice_changed), + field); + g_signal_connect_after (G_OBJECT (selection), "changed", + G_CALLBACK (ev_view_form_field_destroy), + view); + } else if (field_choice->is_editable) { /* ComboBoxEntry */ + gchar *text; + + choice = gtk_combo_box_entry_new_with_model (model, 0); + text = ev_document_forms_form_field_choice_get_text (EV_DOCUMENT_FORMS (view->document), field); + if (text) { + gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (choice))), text); + g_free (text); + } + + g_signal_connect (G_OBJECT (choice), "changed", + G_CALLBACK (ev_view_form_field_choice_changed), + field); + g_signal_connect_after (G_OBJECT (GTK_BIN (choice)->child), "activate", + G_CALLBACK (ev_view_form_field_destroy), + view); + } else { /* ComboBoxText */ + GtkCellRenderer *renderer; + + choice = gtk_combo_box_new_with_model (model); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (choice), + renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (choice), + renderer, + "text", 0, + NULL); + 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_CALLBACK (ev_view_form_field_choice_changed), + field); + g_signal_connect_after (G_OBJECT (choice), "changed", + G_CALLBACK (ev_view_form_field_destroy), + view); + } + + g_object_unref (model); + + g_object_weak_ref (G_OBJECT (choice), + (GWeakNotify)ev_view_form_field_choice_save, + view); + + return choice; +} + +static void +ev_view_handle_form_field (EvView *view, + EvFormField *field, + gdouble x, + gdouble y) +{ + GtkWidget *field_widget = NULL; + GList *form_field_mapping; + EvRectangle field_area; + GdkRectangle view_area; + + if (field->is_read_only) + return; + + if (EV_IS_FORM_FIELD_BUTTON (field)) { + field_widget = ev_view_form_field_button_create_widget (view, field); + } else if (EV_IS_FORM_FIELD_TEXT (field)) { + field_widget = ev_view_form_field_text_create_widget (view, field); + } else if (EV_IS_FORM_FIELD_CHOICE (field)) { + field_widget = ev_view_form_field_choice_create_widget (view, field); + } else if (EV_IS_FORM_FIELD_SIGNATURE (field)) { + /* TODO */ + } + + /* Form field doesn't require a widget */ + if (!field_widget) + return; + + g_object_set_data_full (G_OBJECT (field_widget), "form-field", + g_object_ref (field), + (GDestroyNotify)g_object_unref); + + form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page); + ev_form_field_mapping_get_area (form_field_mapping, field, &field_area); + + doc_rect_to_view_rect (view, field->page, &field_area, &view_area); + view_area.x -= view->scroll_x; + view_area.y -= view->scroll_y; + + 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) +{ + int max_width; + gint n_pages; + GtkBorder border; + + ev_page_cache_get_max_width (view->page_cache, view->rotation, + view->scale, &max_width); + compute_border (view, max_width, max_width, &border); + + n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1; + + requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); + get_page_y_offset (view, n_pages, view->scale, &requisition->height); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + requisition->width = 1; + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + /* FIXME: This could actually be set on one page docs or docs + * with a strange aspect ratio. */ + /* requisition->height = 1;*/ + } +} + +static void +ev_view_size_request_continuous (EvView *view, + GtkRequisition *requisition) +{ + int max_width; + int n_pages; + GtkBorder border; + + + 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); + + requisition->width = max_width + (view->spacing * 2) + border.left + border.right; + get_page_y_offset (view, n_pages, view->scale, &requisition->height); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + requisition->width = 1; + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { requisition->width = 1; /* FIXME: This could actually be set on one page docs or docs * with a strange aspect ratio. */ @@ -1426,7 +2211,7 @@ ev_view_size_request (GtkWidget *widget, GtkRequisition *requisition) { EvView *view = EV_VIEW (widget); - + if (view->document == NULL) { requisition->width = 1; requisition->height = 1; @@ -1454,7 +2239,10 @@ ev_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { EvView *view = EV_VIEW (widget); + GList *children, *l; + 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) { @@ -1462,59 +2250,80 @@ ev_view_size_allocate (GtkWidget *widget, ev_view_size_request (widget, &widget->requisition); } - + view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL); + if (view->document) + view_update_range_and_current_page (view); + view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->pending_resize = FALSE; - if (view->document) - view_update_range_and_current_page (view); + 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; + GtkRequisition child_requisition; + GtkWidget *child = (GtkWidget *)l->data; + + field = g_object_get_data (G_OBJECT (child), "form-field"); + if (!field) + continue; - GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); + form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, + field->page); + ev_form_field_mapping_get_area (form_field_mapping, field, &field_area); + + doc_rect_to_view_rect (view, field->page, &field_area, &view_area); + view_area.x -= view->scroll_x; + view_area.y -= view->scroll_y; + + gtk_widget_size_request (child, &child_requisition); + if (child_requisition.width != view_area.width || + child_requisition.height != view_area.height) + gtk_widget_set_size_request (child, view_area.width, view_area.height); + + gtk_container_child_get (GTK_CONTAINER (widget), + child, + "x", &child_allocation.x, + "y", &child_allocation.y, + NULL); + if (child_allocation.x != view_area.x || + child_allocation.y != view_area.y) { + gtk_layout_move (GTK_LAYOUT (widget), child, view_area.x, view_area.y); + } + } + g_list_free (children); } static void ev_view_realize (GtkWidget *widget) { EvView *view = EV_VIEW (widget); - GdkWindowAttr attributes; - - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + if (GTK_WIDGET_CLASS (ev_view_parent_class)->realize) + (* GTK_WIDGET_CLASS (ev_view_parent_class)->realize) (widget); - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.event_mask = GDK_EXPOSURE_MASK | + gdk_window_set_events (view->layout.bin_window, + (gdk_window_get_events (view->layout.bin_window) | + GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK | GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK; - - widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, - GDK_WA_X | GDK_WA_Y | - GDK_WA_COLORMAP | - GDK_WA_VISUAL); - gdk_window_set_user_data (widget->window, widget); - widget->style = gtk_style_attach (widget->style, widget->window); + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK)); if (view->presentation) - gdk_window_set_background (widget->window, &widget->style->black); + gdk_window_set_background (view->layout.bin_window, &widget->style->black); else - gdk_window_set_background (widget->window, &widget->style->mid [GTK_STATE_NORMAL]); + gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]); } static gboolean @@ -1542,6 +2351,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) @@ -1559,14 +2369,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; @@ -1593,19 +2403,88 @@ find_selection_for_page (EvView *view, return NULL; } +static void +draw_end_presentation_page (EvView *view, + GdkRectangle *page_area) +{ + PangoLayout *layout; + PangoFontDescription *font_desc; + gchar *markup; + const gchar *text = _("End of presentation. Press Escape to exit."); + + if (view->presentation_state != EV_PRESENTATION_END) + return; + + layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL); + markup = g_strdup_printf ("%s", text); + pango_layout_set_markup (layout, markup, -1); + g_free (markup); + + font_desc = pango_font_description_new (); + pango_font_description_set_size (font_desc, 16 * PANGO_SCALE); + pango_layout_set_font_description (layout, font_desc); + + gtk_paint_layout (GTK_WIDGET (view)->style, + view->layout.bin_window, + GTK_WIDGET_STATE (view), + FALSE, + page_area, + GTK_WIDGET (view), + NULL, + page_area->x + 15, + page_area->y + 15, + layout); + + pango_font_description_free (font_desc); + g_object_unref (layout); +} + static gboolean ev_view_expose_event (GtkWidget *widget, GdkEventExpose *event) { - EvView *view = EV_VIEW (widget); - int i; + EvView *view = EV_VIEW (widget); + cairo_t *cr; + gint i; + + if (view->presentation) { + switch (view->presentation_state) { + case EV_PRESENTATION_END: { + GdkRectangle area = {0}; + + area.width = widget->allocation.width; + area.height = widget->allocation.height; + + draw_end_presentation_page (view, &area); + } + return FALSE; + case EV_PRESENTATION_BLACK: + case EV_PRESENTATION_WHITE: + return FALSE; + case EV_PRESENTATION_NORMAL: + default: + break; + } + } else 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; + cr = gdk_cairo_create (view->layout.bin_window); + 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; @@ -1613,21 +2492,116 @@ 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, cr, &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); } + cairo_destroy (cr); + + if (GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) + (* GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) (widget, event); + return FALSE; } +static gboolean +ev_view_do_popup_menu (EvView *view, + gdouble x, + gdouble y) +{ + EvLink *link; + EvImage *image; + + image = ev_view_get_image_at_location (view, x, y); + if (image) { + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image); + return TRUE; + } + + link = ev_view_get_link_at_location (view, x, y); + if (link) { + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); + return TRUE; + } + + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL); + + return TRUE; +} + +static gboolean +ev_view_popup_menu (GtkWidget *widget) +{ + gint x, y; + + gtk_widget_get_pointer (widget, &x, &y); + return ev_view_do_popup_menu (EV_VIEW (widget), x, y); +} + +#if GTK_CHECK_VERSION (2, 11, 7) +static void +get_link_area (EvView *view, + gint x, + gint y, + EvLink *link, + GdkRectangle *area) +{ + EvRectangle ev_rect; + 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); + + doc_rect_to_view_rect (view, page, &ev_rect, area); + area->y -= view->scroll_y ; +} + +static gboolean +ev_view_query_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_tip, + GtkTooltip *tooltip) +{ + EvView *view = EV_VIEW (widget); + EvLink *link; + gchar *text; + + link = ev_view_get_link_at_location (view, x, y); + if (!link) + return FALSE; + + text = tip_from_link (view, link); + if (text && g_utf8_validate (text, -1, NULL)) { + GdkRectangle link_area; + + get_link_area (view, x, y, link, &link_area); + gtk_tooltip_set_text (tooltip, text); + gtk_tooltip_set_tip_area (tooltip, &link_area); + } + g_free (text); + + return TRUE; +} +#endif /* GTK_CHECK_VERSION (2, 11, 7) */ + static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event) { EvView *view = EV_VIEW (widget); - EvLink *link; + + if (!view->document) + return FALSE; if (!GTK_WIDGET_HAS_FOCUS (widget)) { gtk_widget_grab_focus (widget); @@ -1637,7 +2611,10 @@ ev_view_button_press_event (GtkWidget *widget, view->selection_info.in_drag = FALSE; switch (event->button) { - case 1: + case 1: { + EvImage *image; + EvFormField *field; + if (view->selection_info.selections) { if (location_in_selected_text (view, event->x + view->scroll_x, @@ -1645,14 +2622,30 @@ ev_view_button_press_event (GtkWidget *widget, view->selection_info.in_drag = TRUE; } else { clear_selection (view); + + view->selection_info.start.x = event->x + view->scroll_x; + view->selection_info.start.y = event->y + view->scroll_y; } gtk_widget_queue_draw (widget); + } else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) && + (image = ev_view_get_image_at_location (view, event->x, event->y))) { + if (view->image_dnd_info.image) + g_object_unref (view->image_dnd_info.image); + view->image_dnd_info.image = g_object_ref (image); + view->image_dnd_info.in_drag = TRUE; + + view->image_dnd_info.start.x = event->x + view->scroll_x; + view->image_dnd_info.start.y = event->y + view->scroll_y; + } 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); + } else { + ev_view_remove_all (view); + view->selection_info.start.x = event->x + view->scroll_x; + view->selection_info.start.y = event->y + view->scroll_y; } - - view->selection_info.start.x = event->x + view->scroll_x; - view->selection_info.start.y = event->y + view->scroll_y; - + } return TRUE; case 2: /* use root coordinates as reference point because @@ -1666,14 +2659,26 @@ ev_view_button_press_event (GtkWidget *widget, 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; + return ev_view_do_popup_menu (view, event->x, event->y); } return FALSE; } +static void +ev_view_remove_all (EvView *view) +{ + GList *children, *child; + + children = gtk_container_get_children (GTK_CONTAINER (view)); + for (child = children; child && child->data; child = g_list_next (child)) { + gtk_container_remove (GTK_CONTAINER (view), + GTK_WIDGET (child->data)); + } + g_list_free (children); +} + +/*** Drag and Drop ***/ static void ev_view_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -1683,18 +2688,95 @@ ev_view_drag_data_get (GtkWidget *widget, { EvView *view = EV_VIEW (widget); - if (view->selection_info.selections && - ev_document_can_get_text (view->document)) { - gchar *text; + switch (info) { + case TARGET_DND_TEXT: + if (view->selection_info.selections && + ev_document_can_get_text (view->document)) { + gchar *text; - text = get_selected_text (view); + text = get_selected_text (view); + + gtk_selection_data_set_text (selection_data, + text, + strlen (text)); + + g_free (text); + } + break; + case TARGET_DND_IMAGE: + if (view->image_dnd_info.image) { + GdkPixbuf *pixbuf; - gtk_selection_data_set_text (selection_data, text, strlen (text)); + pixbuf = ev_image_get_pixbuf (view->image_dnd_info.image); + gtk_selection_data_set_pixbuf (selection_data, pixbuf); + } + break; + case TARGET_DND_URI: + if (view->image_dnd_info.image) { + const gchar *tmp_uri; + gchar **uris; - g_free (text); + tmp_uri = ev_image_save_tmp (view->image_dnd_info.image); + + uris = g_new0 (gchar *, 2); + uris[0] = (gchar *)tmp_uri; + + gtk_selection_data_set_uris (selection_data, uris); + + /* g_free instead of g_strfreev since tmp_uri is const */ + g_free (uris); + } } } +static gboolean +ev_view_drag_motion (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time) +{ + if (gtk_drag_get_source_widget (context) == widget) + gdk_drag_status (context, 0, time); + else + gdk_drag_status (context, context->suggested_action, time); + + return TRUE; +} + +static void +ev_view_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time) +{ + gchar **uris; + gint i = 0; + GSList *uri_list = NULL; + + uris = gtk_selection_data_get_uris (selection_data); + if (!uris) { + gtk_drag_finish (context, FALSE, FALSE, time); + return; + } + + for (i = 0; uris[i]; i++) { + uri_list = g_slist_prepend (uri_list, (gpointer) uris[i]); + } + + ev_application_open_uri_list (EV_APP, uri_list, + gtk_widget_get_screen (widget), + 0); + gtk_drag_finish (context, TRUE, FALSE, time); + + g_strfreev (uris); + g_slist_free (uri_list); +} + + static gboolean selection_update_idle_cb (EvView *view) { @@ -1706,10 +2788,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; @@ -1723,6 +2805,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; } @@ -1736,7 +2832,7 @@ ev_view_motion_notify_event (GtkWidget *widget, if (!view->document) return FALSE; - if (event->is_hint || event->window != widget->window) { + if (event->is_hint || event->window != view->layout.bin_window) { gtk_widget_get_pointer (widget, &x, &y); } else { x = event->x; @@ -1748,19 +2844,38 @@ ev_view_motion_notify_event (GtkWidget *widget, view->selection_info.start.x, view->selection_info.start.y, x, y)) { - GdkDragContext *context; GtkTargetList *target_list = gtk_target_list_new (NULL, 0); - gtk_target_list_add_text_targets (target_list, 0); + gtk_target_list_add_text_targets (target_list, TARGET_DND_TEXT); - context = gtk_drag_begin (widget, target_list, - GDK_ACTION_COPY, - 1, (GdkEvent *)event); + gtk_drag_begin (widget, target_list, + GDK_ACTION_COPY, + 1, (GdkEvent *)event); view->selection_info.in_drag = FALSE; gtk_target_list_unref (target_list); + return TRUE; + } + } else if (view->image_dnd_info.in_drag) { + if (gtk_drag_check_threshold (widget, + view->selection_info.start.x, + view->selection_info.start.y, + x, y)) { + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); + + gtk_target_list_add_uri_targets (target_list, TARGET_DND_URI); + gtk_target_list_add_image_targets (target_list, TARGET_DND_IMAGE, TRUE); + + gtk_drag_begin (widget, target_list, + GDK_ACTION_COPY, + 1, (GdkEvent *)event); + + view->image_dnd_info.in_drag = FALSE; + + gtk_target_list_unref (target_list); + return TRUE; } } @@ -1826,12 +2941,8 @@ ev_view_motion_notify_event (GtkWidget *widget, return TRUE; } - /* For the Evince 0.4.x release, we limit links to un-rotated documents - * only. - */ - } else if (view->pressed_button <= 0 && - view->rotation == 0) { - handle_link_over_xy (view, x, y); + } else if (view->pressed_button <= 0) { + ev_view_handle_cursor_over_xy (view, x, y); return TRUE; } @@ -1849,7 +2960,7 @@ ev_view_button_release_event (GtkWidget *widget, ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } - if (view->document) { + if (view->document && view->pressed_button != 3) { link = ev_view_get_link_at_location (view, event->x, event->y); } else { link = NULL; @@ -1857,6 +2968,7 @@ ev_view_button_release_event (GtkWidget *widget, view->pressed_button = -1; view->drag_info.in_drag = FALSE; + view->image_dnd_info.in_drag = FALSE; if (view->selection_scroll_id) { g_source_remove (view->selection_scroll_id); @@ -1877,21 +2989,310 @@ ev_view_button_release_event (GtkWidget *widget, view->selection_info.in_drag = FALSE; } else if (link) { - ev_view_goto_link (view, link); + if (event->button == 2) { + EvLinkAction *action; + EvLinkActionType type; + + action = ev_link_get_action (link); + if (!action) + return FALSE; + + type = ev_link_action_get_action_type (action); + if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) { + g_signal_emit (view, + signals[SIGNAL_EXTERNAL_LINK], + 0, action); + } + } else { + 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; } } return FALSE; } +/* Goto Window */ +/* Cut and paste from gtkwindow.c */ +static void +send_focus_change (GtkWidget *widget, + gboolean in) +{ + GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); + + g_object_ref (widget); + + if (in) + GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); + else + GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); + + fevent->focus_change.type = GDK_FOCUS_CHANGE; + fevent->focus_change.window = g_object_ref (widget->window); + fevent->focus_change.in = in; + + gtk_widget_event (widget, fevent); + + g_object_notify (G_OBJECT (widget), "has-focus"); + + g_object_unref (widget); + gdk_event_free (fevent); +} + +static void +ev_view_goto_window_hide (EvView *view) +{ + /* send focus-in event */ + send_focus_change (view->goto_entry, FALSE); + gtk_widget_hide (view->goto_window); + gtk_entry_set_text (GTK_ENTRY (view->goto_entry), ""); +} + +static gboolean +ev_view_goto_window_delete_event (GtkWidget *widget, + GdkEventAny *event, + EvView *view) +{ + ev_view_goto_window_hide (view); + + return TRUE; +} + +static gboolean +key_is_numeric (guint keyval) +{ + return ((keyval >= GDK_0 && keyval <= GDK_9) || + (keyval >= GDK_KP_0 && keyval <= GDK_KP_9)); +} + +static gboolean +ev_view_goto_window_key_press_event (GtkWidget *widget, + GdkEventKey *event, + EvView *view) +{ + switch (event->keyval) { + case GDK_Escape: + case GDK_Tab: + case GDK_KP_Tab: + case GDK_ISO_Left_Tab: + ev_view_goto_window_hide (view); + return TRUE; + case GDK_Return: + case GDK_KP_Enter: + case GDK_ISO_Enter: + case GDK_BackSpace: + case GDK_Delete: + return FALSE; + default: + if (!key_is_numeric (event->keyval)) + return TRUE; + } + + return FALSE; +} + +static gboolean +ev_view_goto_window_button_press_event (GtkWidget *widget, + GdkEventButton *event, + EvView *view) +{ + ev_view_goto_window_hide (view); + + return TRUE; +} + +static void +ev_view_goto_entry_activate (GtkEntry *entry, + EvView *view) +{ + const gchar *text; + gint page; + + text = gtk_entry_get_text (entry); + page = atoi (text) - 1; + + 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); +} + +static void +ev_view_goto_window_create (EvView *view) +{ + GtkWidget *frame, *hbox, *toplevel, *label; + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); + + if (view->goto_window) { + if (GTK_WINDOW (toplevel)->group) + gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, + GTK_WINDOW (view->goto_window)); + else if (GTK_WINDOW (view->goto_window)->group) + gtk_window_group_remove_window (GTK_WINDOW (view->goto_window)->group, + GTK_WINDOW (view->goto_window)); + return; + } + + view->goto_window = gtk_window_new (GTK_WINDOW_POPUP); + + if (GTK_WINDOW (toplevel)->group) + gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, + GTK_WINDOW (view->goto_window)); + + gtk_window_set_modal (GTK_WINDOW (view->goto_window), TRUE); + + g_signal_connect (view->goto_window, "delete_event", + G_CALLBACK (ev_view_goto_window_delete_event), + view); + g_signal_connect (view->goto_window, "key_press_event", + G_CALLBACK (ev_view_goto_window_key_press_event), + view); + g_signal_connect (view->goto_window, "button_press_event", + G_CALLBACK (ev_view_goto_window_button_press_event), + view); + + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add (GTK_CONTAINER (view->goto_window), frame); + gtk_widget_show (frame); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 3); + gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_widget_show (hbox); + + label = gtk_label_new(_("Jump to page:")); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 3); + gtk_widget_show (label); + gtk_widget_realize (label); + + view->goto_entry = gtk_entry_new (); + g_signal_connect (view->goto_entry, "activate", + G_CALLBACK (ev_view_goto_entry_activate), + view); + gtk_box_pack_start_defaults (GTK_BOX (hbox), view->goto_entry); + gtk_widget_show (view->goto_entry); + gtk_widget_realize (view->goto_entry); +} + +static void +ev_view_goto_entry_grab_focus (EvView *view) +{ + GtkWidgetClass *entry_parent_class; + + entry_parent_class = g_type_class_peek_parent (GTK_ENTRY_GET_CLASS (view->goto_entry)); + (entry_parent_class->grab_focus) (view->goto_entry); + + send_focus_change (view->goto_entry, TRUE); +} + +static void +ev_view_goto_window_send_key_event (EvView *view, + GdkEvent *event) +{ + GdkEventKey *new_event; + GdkScreen *screen; + + /* Move goto window off screen */ + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + gtk_window_move (GTK_WINDOW (view->goto_window), + gdk_screen_get_width (screen) + 1, + gdk_screen_get_height (screen) + 1); + gtk_widget_show (view->goto_window); + + new_event = (GdkEventKey *) gdk_event_copy (event); + g_object_unref (new_event->window); + new_event->window = g_object_ref (view->goto_window->window); + gtk_widget_realize (view->goto_window); + + gtk_widget_event (view->goto_window, (GdkEvent *)new_event); + gdk_event_free ((GdkEvent *)new_event); + gtk_widget_hide (view->goto_window); +} + +static gboolean +ev_view_key_press_event (GtkWidget *widget, + GdkEventKey *event) +{ + EvView *view = EV_VIEW (widget); + EvPresentationState current; + + if (!view->document) + return FALSE; + + if (!view->presentation || + view->presentation_state == EV_PRESENTATION_END) + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + + + current = view->presentation_state; + + switch (event->keyval) { + case GDK_b: + case GDK_B: + view->presentation_state = + (view->presentation_state == EV_PRESENTATION_BLACK) ? + EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK; + break; + case GDK_w: + case GDK_W: + view->presentation_state = + (view->presentation_state == EV_PRESENTATION_WHITE) ? + EV_PRESENTATION_NORMAL : EV_PRESENTATION_WHITE; + break; + default: + if (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE) { + view->presentation_state = EV_PRESENTATION_NORMAL; + } + } + + if (current == view->presentation_state) { + if (ev_page_cache_get_n_pages (view->page_cache) > 1 && + key_is_numeric (event->keyval)) { + gint x, y; + + ev_view_goto_window_create (view); + ev_view_goto_window_send_key_event (view, (GdkEvent *)event); + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + gtk_window_move (GTK_WINDOW (view->goto_window), x, y); + gtk_widget_show (view->goto_window); + ev_view_goto_entry_grab_focus (view); + + return TRUE; + } + + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + } + + switch (view->presentation_state) { + case EV_PRESENTATION_NORMAL: + case EV_PRESENTATION_BLACK: + gdk_window_set_background (view->layout.bin_window, + &widget->style->black); + break; + case EV_PRESENTATION_WHITE: + gdk_window_set_background (view->layout.bin_window, + &widget->style->white); + break; + default: + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + } + + gtk_widget_queue_draw (widget); + return TRUE; +} + static gint ev_view_focus_in (GtkWidget *widget, GdkEventFocus *event) @@ -1907,6 +3308,9 @@ static gint ev_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { + if (EV_VIEW (widget)->goto_window) + ev_view_goto_window_hide (EV_VIEW (widget)); + if (EV_VIEW (widget)->pixbuf_cache) ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); gtk_widget_queue_draw (widget); @@ -1919,17 +3323,17 @@ ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) { EvView *view = EV_VIEW (widget); - ev_view_set_status (view, NULL); - if (view->cursor == EV_VIEW_CURSOR_LINK || view->cursor == EV_VIEW_CURSOR_IBEAM) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); +#if !GTK_CHECK_VERSION (2, 11, 7) if (view->link_tooltip) { view->hovered_link = NULL; ev_tooltip_deactivate (EV_TOOLTIP (view->link_tooltip)); } - +#endif + return FALSE; } @@ -1938,7 +3342,7 @@ ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) { EvView *view = EV_VIEW (widget); - handle_link_over_xy (view, event->x, event->y); + ev_view_handle_cursor_over_xy (view, event->x, event->y); return FALSE; } @@ -2008,8 +3412,6 @@ highlight_find_results (EvView *view, int page) EvDocumentFind *find; int i, results = 0; - g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document)); - find = EV_DOCUMENT_FIND (view->document); results = ev_document_find_get_n_results (find, page); @@ -2019,7 +3421,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; @@ -2027,7 +3429,7 @@ highlight_find_results (EvView *view, int page) ev_document_find_get_result (find, page, i, &rectangle); doc_rect_to_view_rect (view, page, &rectangle, &view_rectangle); - draw_rubberband (GTK_WIDGET (view), GTK_WIDGET(view)->window, + draw_rubberband (GTK_WIDGET (view), view->layout.bin_window, &view_rectangle, alpha); } } @@ -2037,68 +3439,86 @@ draw_loading_text (EvView *view, GdkRectangle *page_area, GdkRectangle *expose_area) { - PangoLayout *layout; - PangoFontDescription *font_desc; - PangoRectangle logical_rect; - double real_scale; - int target_width; - - const char *loading_text = _("Loading..."); - - layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text); - - font_desc = pango_font_description_new (); + cairo_t *cr; + gint width, height; + /* 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; - /* We set the font to be 10 points, get the size, and scale appropriately */ - pango_font_description_set_size (font_desc, 10 * PANGO_SCALE); - pango_layout_set_font_description (layout, font_desc); - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + if (!view->loading_text) { + const gchar *loading_text = _("Loading..."); + PangoLayout *layout; + PangoFontDescription *font_desc; + PangoRectangle logical_rect; + gint target_width; + gdouble real_scale; - /* Make sure we fit the middle of the page */ - target_width = MAX (page_area->width / 2, 1); - real_scale = ((double)target_width / (double) logical_rect.width) * (PANGO_SCALE * 10); - pango_font_description_set_size (font_desc, (int)real_scale); - pango_layout_set_font_description (layout, font_desc); - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + ev_document_fc_mutex_lock (); - gtk_paint_layout (GTK_WIDGET (view)->style, - GTK_WIDGET (view)->window, - GTK_WIDGET_STATE (view), - FALSE, - page_area, - GTK_WIDGET (view), - NULL, - page_area->x + (target_width/2), - page_area->y + (page_area->height - logical_rect.height) / 2, - layout); + layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text); + + font_desc = pango_font_description_new (); + + /* We set the font to be 10 points, get the size, and scale appropriately */ + pango_font_description_set_size (font_desc, 10 * PANGO_SCALE); + pango_layout_set_font_description (layout, font_desc); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + + target_width = MAX (page_area->width / 2, 1); + real_scale = ((double)target_width / (double) logical_rect.width) * (PANGO_SCALE * 10); + pango_font_description_set_size (font_desc, (int)real_scale); + pango_layout_set_font_description (layout, font_desc); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + + view->loading_text = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + logical_rect.width, + logical_rect.height); + cr = cairo_create (view->loading_text); + cairo_set_source_rgb (cr, + 155 / (double)255, + 155 / (double)255, + 155 / (double)255); + pango_cairo_show_layout (cr, layout); + cairo_destroy (cr); + + pango_font_description_free (font_desc); + g_object_unref (layout); + + ev_document_fc_mutex_unlock (); + } - pango_font_description_free (font_desc); - g_object_unref (layout); + width = (page_area->width - cairo_image_surface_get_width (view->loading_text)) / 2; + height = (page_area->height - cairo_image_surface_get_height (view->loading_text)) / 2; + + cr = gdk_cairo_create (view->layout.bin_window); + cairo_translate (cr, + page_area->x + width, + page_area->y + height); + cairo_set_source_surface (cr, view->loading_text, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); } static void -draw_one_page (EvView *view, - gint page, - GdkRectangle *page_area, - GtkBorder *border, - GdkRectangle *expose_area) +draw_one_page (EvView *view, + gint page, + cairo_t *cr, + GdkRectangle *page_area, + GtkBorder *border, + GdkRectangle *expose_area, + gboolean *page_ready) { - gint width, height; - GdkPixbuf *current_pixbuf; GdkRectangle overlap; GdkRectangle real_page_area; - EvViewSelection *selection; g_assert (view->document); + if (! gdk_rectangle_intersect (page_area, expose_area, &overlap)) return; - selection = find_selection_for_page (view, page); - ev_page_cache_get_size (view->page_cache, - page, view->rotation, - view->scale, - &width, &height); /* Render the document itself */ real_page_area = *page_area; @@ -2106,78 +3526,96 @@ 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); + if (!view->presentation) { + gint current_page; + + current_page = ev_page_cache_get_current_page (view->page_cache); + ev_document_misc_paint_one_page (view->layout.bin_window, + GTK_WIDGET (view), + page_area, border, + page == current_page); + } if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) { - GdkPixbuf *selection_pixbuf = NULL; - GdkPixbuf *scaled_image; - GdkPixbuf *scaled_selection; + gint width, height; + gint page_width, page_height; + cairo_surface_t *page_surface = NULL; + gint selection_width, selection_height; + cairo_surface_t *selection_surface = NULL; - current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, page); + page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page); - /* Get the selection pixbuf iff we have something to draw */ - if (current_pixbuf && view->selection_mode == EV_VIEW_SELECTION_TEXT && selection) - selection_pixbuf = ev_pixbuf_cache_get_selection_pixbuf (view->pixbuf_cache, - page, - view->scale, - NULL); - - if (current_pixbuf == NULL) - scaled_image = NULL; - else if (width == gdk_pixbuf_get_width (current_pixbuf) && - height == gdk_pixbuf_get_height (current_pixbuf)) - scaled_image = g_object_ref (current_pixbuf); - else - /* FIXME: We don't want to scale the whole area, just the right - * area of it */ - scaled_image = gdk_pixbuf_scale_simple (current_pixbuf, - width, height, - GDK_INTERP_NEAREST); - - if (selection_pixbuf == NULL) - scaled_selection = NULL; - else if (width == gdk_pixbuf_get_width (selection_pixbuf) && - height == gdk_pixbuf_get_height (selection_pixbuf)) - scaled_selection = g_object_ref (selection_pixbuf); - else - /* FIXME: We don't want to scale the whole area, just the right - * area of it */ - scaled_selection = gdk_pixbuf_scale_simple (selection_pixbuf, - width, height, - GDK_INTERP_NEAREST); - - if (scaled_image) { - gdk_draw_pixbuf (GTK_WIDGET(view)->window, - GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL], - scaled_image, - overlap.x - real_page_area.x, - overlap.y - real_page_area.y, - overlap.x, overlap.y, - overlap.width, overlap.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); - g_object_unref (scaled_image); - } else { + if (!page_surface) { draw_loading_text (view, &real_page_area, expose_area); + *page_ready = FALSE; + + return; + } + + ev_page_cache_get_size (view->page_cache, + page, view->rotation, + view->scale, + &width, &height); + + page_width = cairo_image_surface_get_width (page_surface); + page_height = cairo_image_surface_get_height (page_surface); + + cairo_save (cr); + cairo_translate (cr, overlap.x, overlap.y); + + if (width != page_width || height != page_height) { + cairo_pattern_set_filter (cairo_get_source (cr), + CAIRO_FILTER_FAST); + cairo_scale (cr, + (gdouble)width / page_width, + (gdouble)height / page_height); + } + + cairo_surface_set_device_offset (page_surface, + overlap.x - real_page_area.x, + overlap.y - real_page_area.y); + cairo_set_source_surface (cr, page_surface, 0, 0); + cairo_paint (cr); + cairo_restore (cr); + + /* Get the selection pixbuf iff we have something to draw */ + if (find_selection_for_page (view, page) && + view->selection_mode == EV_VIEW_SELECTION_TEXT) { + selection_surface = + ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache, + page, + view->scale, + NULL); + } + + if (!selection_surface) { + return; } - if (scaled_selection) { - gdk_draw_pixbuf (GTK_WIDGET(view)->window, - GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL], - scaled_selection, - overlap.x - real_page_area.x, - overlap.y - real_page_area.y, - overlap.x, overlap.y, - overlap.width, overlap.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); - g_object_unref (scaled_selection); + selection_width = cairo_image_surface_get_width (selection_surface); + selection_height = cairo_image_surface_get_height (selection_surface); + + cairo_save (cr); + cairo_translate (cr, overlap.x, overlap.y); + + if (width != selection_width || height != selection_height) { + cairo_pattern_set_filter (cairo_get_source (cr), + CAIRO_FILTER_FAST); + cairo_scale (cr, + (gdouble)width / selection_width, + (gdouble)height / selection_height); } + + cairo_surface_set_device_offset (selection_surface, + overlap.x - real_page_area.x, + overlap.y - real_page_area.y); + cairo_set_source_surface (cr, selection_surface, 0, 0); + cairo_paint (cr); + cairo_restore (cr); } } @@ -2188,13 +3626,14 @@ ev_view_finalize (GObject *object) { EvView *view = EV_VIEW (object); - LOG ("Finalize"); - - g_free (view->status); g_free (view->find_status); clear_selection (view); + if (view->image_dnd_info.image) + g_object_unref (view->image_dnd_info.image); + view->image_dnd_info.image = NULL; + G_OBJECT_CLASS (ev_view_parent_class)->finalize (object); } @@ -2213,8 +3652,16 @@ ev_view_destroy (GtkObject *object) view->pixbuf_cache = NULL; } +#if !GTK_CHECK_VERSION (2, 11, 7) if (view->link_tooltip) { gtk_widget_destroy (view->link_tooltip); + view->link_tooltip = NULL; + } +#endif + if (view->goto_window) { + gtk_widget_destroy (view->goto_window); + view->goto_window = NULL; + view->goto_entry = NULL; } if (view->selection_scroll_id) { @@ -2227,7 +3674,14 @@ ev_view_destroy (GtkObject *object) view->selection_update_id = 0; } - ev_view_set_scroll_adjustments (view, NULL, NULL); + if (view->loading_text) { + cairo_surface_destroy (view->loading_text); + view->loading_text = NULL; + } + + ev_view_presentation_transition_stop (view); + + ev_view_set_scroll_adjustments (GTK_LAYOUT (view), NULL, NULL); GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object); } @@ -2240,31 +3694,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); } } @@ -2307,41 +3760,37 @@ 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_FIND_STATUS: + g_value_set_string (value, view->find_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); } } @@ -2351,6 +3800,7 @@ ev_view_class_init (EvViewClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + GtkLayoutClass *layout_class = GTK_LAYOUT_CLASS (class); GtkBindingSet *binding_set; object_class->finalize = ev_view_finalize; @@ -2361,6 +3811,7 @@ ev_view_class_init (EvViewClass *class) widget_class->button_press_event = ev_view_button_press_event; widget_class->motion_notify_event = ev_view_motion_notify_event; widget_class->button_release_event = ev_view_button_release_event; + widget_class->key_press_event = ev_view_key_press_event; widget_class->focus_in_event = ev_view_focus_in; widget_class->focus_out_event = ev_view_focus_out; widget_class->get_accessible = ev_view_get_accessible; @@ -2372,21 +3823,18 @@ 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; - gtk_object_class->destroy = ev_view_destroy; + widget_class->drag_motion = ev_view_drag_motion; + widget_class->drag_data_received = ev_view_drag_data_received; + widget_class->popup_menu = ev_view_popup_menu; +#if GTK_CHECK_VERSION (2, 11, 7) + widget_class->query_tooltip = ev_view_query_tooltip; +#endif - class->set_scroll_adjustments = ev_view_set_scroll_adjustments; - class->binding_activated = ev_view_binding_activated; + gtk_object_class->destroy = ev_view_destroy; - widget_class->set_scroll_adjustments_signal = - g_signal_new ("set-scroll-adjustments", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EvViewClass, set_scroll_adjustments), - NULL, NULL, - ev_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, 2, - GTK_TYPE_ADJUSTMENT, - GTK_TYPE_ADJUSTMENT); + layout_class->set_scroll_adjustments = ev_view_set_scroll_adjustments; + + class->binding_activated = ev_view_scroll; signals[SIGNAL_BINDING_ACTIVATED] = g_signal_new ("binding_activated", G_TYPE_FROM_CLASS (object_class), @@ -2405,6 +3853,14 @@ ev_view_class_init (EvViewClass *class) NULL, NULL, ev_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, + G_STRUCT_OFFSET (EvViewClass, handle_link), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); signals[SIGNAL_EXTERNAL_LINK] = g_signal_new ("external-link", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, @@ -2422,13 +3878,6 @@ ev_view_class_init (EvViewClass *class) G_TYPE_NONE, 1, G_TYPE_OBJECT); - g_object_class_install_property (object_class, - PROP_STATUS, - g_param_spec_string ("status", - "Status Message", - "The status message", - NULL, - G_PARAM_READABLE)); g_object_class_install_property (object_class, PROP_FIND_STATUS, @@ -2481,20 +3930,20 @@ ev_view_class_init (EvViewClass *class) PROP_ZOOM, g_param_spec_double ("zoom", "Zoom factor", - "Zoom factor", - MIN_SCALE, - MAX_SCALE, - 1.0, - G_PARAM_READWRITE)); + "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)); + "Rotation", + 0, + 360, + 0, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_HAS_SELECTION, g_param_spec_boolean ("has-selection", @@ -2505,10 +3954,23 @@ 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); + gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, EV_TYPE_SCROLL_TYPE, + EV_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, EV_TYPE_SCROLL_TYPE, + EV_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE); + gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, EV_TYPE_SCROLL_TYPE, + EV_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE); + gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, EV_TYPE_SCROLL_TYPE, + EV_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE); + } static void @@ -2529,9 +3991,20 @@ ev_view_init (EvView *view) view->continuous = TRUE; view->dual_page = FALSE; view->presentation = FALSE; + view->presentation_state = EV_PRESENTATION_NORMAL; view->fullscreen = FALSE; view->sizing_mode = EV_SIZING_FIT_WIDTH; view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->jump_to_find_result = TRUE; + + gtk_layout_set_hadjustment (GTK_LAYOUT (view), NULL); + gtk_layout_set_vadjustment (GTK_LAYOUT (view), NULL); + + gtk_drag_dest_set (GTK_WIDGET (view), + GTK_DEST_DEFAULT_ALL, + view_drop_targets, + G_N_ELEMENTS (view_drop_targets), + GDK_ACTION_COPY); } /*** Callbacks ***/ @@ -2539,19 +4012,33 @@ 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)); } static void job_finished_cb (EvPixbufCache *pixbuf_cache, + GdkRegion *region, EvView *view) { - gtk_widget_queue_draw (GTK_WIDGET (view)); + if (region) { + gdk_window_invalidate_region (view->layout.bin_window, + region, TRUE); + } else { + gtk_widget_queue_draw (GTK_WIDGET (view)); + } } static void @@ -2560,23 +4047,35 @@ page_changed_cb (EvPageCache *page_cache, EvView *view) { if (view->current_page != new_page) { - + gint x, y; + view->current_page = new_page; view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + if (view->presentation) + ev_view_presentation_transition_start (view); + + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + ev_view_handle_cursor_over_xy (view, x, y); + 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); } } -static void on_adjustment_value_changed (GtkAdjustment *adjustment, - EvView *view) +static void +on_adjustment_value_changed (GtkAdjustment *adjustment, + EvView *view) { int dx = 0, dy = 0; + gint x, y; + GList *children, *l; if (! GTK_WIDGET_REALIZED (view)) return; @@ -2595,12 +4094,27 @@ static void on_adjustment_value_changed (GtkAdjustment *adjustment, view->scroll_y = 0; } - + children = gtk_container_get_children (GTK_CONTAINER (view)); + for (l = children; l && l->data; l = g_list_next (l)) { + gint child_x, child_y; + GtkWidget *child = (GtkWidget *)l->data; + + gtk_container_child_get (GTK_CONTAINER (view), + child, + "x", &child_x, + "y", &child_y, + NULL); + gtk_layout_move (GTK_LAYOUT (view), child, child_x + dx, child_y + dy); + } + g_list_free (children); + if (view->pending_resize) gtk_widget_queue_draw (GTK_WIDGET (view)); else - gdk_window_scroll (GTK_WIDGET (view)->window, dx, dy); - + gdk_window_scroll (view->layout.bin_window, dx, dy); + + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + ev_view_handle_cursor_over_xy (view, x, y); if (view->document) view_update_range_and_current_page (view); @@ -2623,6 +4137,9 @@ setup_caches (EvView *view) g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view); view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document); 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 @@ -2638,12 +4155,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); @@ -2657,7 +4184,6 @@ ev_view_set_document (EvView *view, } view->document = document; - view->find_page = 0; view->find_result = 0; if (view->document) { @@ -2691,11 +4217,16 @@ ev_view_set_zoom (EvView *view, else scale = factor; - scale = CLAMP (scale, MIN_SCALE, MAX_SCALE); + scale = CLAMP (scale, view->min_scale, view->max_scale); if (ABS (view->scale - scale) < EPSILON) return; + if (view->loading_text) { + cairo_surface_destroy (view->loading_text); + view->loading_text = NULL; + } + view->scale = scale; view->pending_resize = TRUE; @@ -2710,6 +4241,18 @@ ev_view_get_zoom (EvView *view) return view->scale; } +void +ev_view_set_screen_dpi (EvView *view, + gdouble dpi) +{ + g_return_if_fail (EV_IS_VIEW (view)); + g_return_if_fail (dpi > 0); + + view->dpi = dpi; + view->min_scale = MIN_SCALE * dpi / 72.0; + view->max_scale = MAX_SCALE * dpi / 72.0; +} + gboolean ev_view_get_continuous (EvView *view) { @@ -2800,20 +4343,37 @@ ev_view_set_presentation (EvView *view, if (view->presentation == presentation) return; + if (!presentation) + view->presentation_state = EV_PRESENTATION_NORMAL; + view->presentation = presentation; view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + if (presentation) { + view->sizing_mode_saved = view->sizing_mode; + view->scale_saved = view->scale; + ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); + } else { + ev_view_set_sizing_mode (view, view->sizing_mode_saved); + ev_view_set_zoom (view, view->scale_saved, FALSE); + } + gtk_widget_queue_resize (GTK_WIDGET (view)); + if (presentation) + ev_view_presentation_transition_start (view); + else + ev_view_presentation_transition_stop (view); + if (GTK_WIDGET_REALIZED (view)) { if (view->presentation) - gdk_window_set_background (GTK_WIDGET(view)->window, + gdk_window_set_background (view->layout.bin_window, >K_WIDGET (view)->style->black); else - gdk_window_set_background (GTK_WIDGET(view)->window, + gdk_window_set_background (view->layout.bin_window, >K_WIDGET (view)->style->mid [GTK_STATE_NORMAL]); } - g_object_notify (G_OBJECT (view), "presentation"); } @@ -2825,6 +4385,49 @@ ev_view_get_presentation (EvView *view) return view->presentation; } +static gboolean +transition_next_page (EvView *view) +{ + ev_view_next_page (view); + + return FALSE; +} + +static void +ev_view_presentation_transition_stop (EvView *view) +{ + if (view->trans_timeout_id > 0) + g_source_remove (view->trans_timeout_id); + view->trans_timeout_id = 0; +} + +static void +ev_view_presentation_transition_start (EvView *view) +{ + gdouble duration; + + if (!EV_IS_DOCUMENT_TRANSITION (view->document)) + return; + + ev_view_presentation_transition_stop (view); + + duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document), + view->current_page); + if (duration > 0) { +#if GLIB_CHECK_VERSION (2, 13, 0) + view->trans_timeout_id = + g_timeout_add_seconds (duration, + (GSourceFunc) transition_next_page, + view); +#else + view->trans_timeout_id = + g_timeout_add (duration * 1000, + (GSourceFunc) transition_next_page, + view); +#endif + } +} + void ev_view_set_sizing_mode (EvView *view, EvSizingMode sizing_mode) @@ -2851,13 +4454,13 @@ ev_view_get_sizing_mode (EvView *view) gboolean ev_view_can_zoom_in (EvView *view) { - return view->scale * ZOOM_IN_FACTOR <= MAX_SCALE; + return view->scale * ZOOM_IN_FACTOR <= view->max_scale; } gboolean ev_view_can_zoom_out (EvView *view) { - return view->scale * ZOOM_OUT_FACTOR >= MIN_SCALE; + return view->scale * ZOOM_OUT_FACTOR >= view->min_scale; } void @@ -2865,6 +4468,9 @@ ev_view_zoom_in (EvView *view) { 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); } @@ -2874,6 +4480,9 @@ ev_view_zoom_out (EvView *view) { 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); } @@ -3156,13 +4765,14 @@ ev_view_zoom_for_size_single_page (EvView *view, ev_view_set_zoom (view, scale, FALSE); } -void +static void ev_view_set_zoom_for_size (EvView *view, int width, int height, int vsb_width, int hsb_height) { + g_return_if_fail (EV_IS_VIEW (view)); g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH || view->sizing_mode == EV_SIZING_BEST_FIT); g_return_if_fail (width >= 0); @@ -3183,34 +4793,13 @@ ev_view_set_zoom_for_size (EvView *view, ev_view_zoom_for_size_single_page (view, width, height, vsb_width, hsb_height); } -/*** Status text messages ***/ - -const char * -ev_view_get_status (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), NULL); - - return view->status; -} - -static void -ev_view_set_status (EvView *view, const char *message) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - if (message != view->status) { - g_free (view->status); - view->status = g_strdup (message); - g_object_notify (G_OBJECT (view), "status"); - } -} - +/*** Find ***/ 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 @@ -3228,13 +4817,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); @@ -3258,8 +4843,6 @@ ev_view_set_find_status (EvView *view, const char *message) g_object_notify (G_OBJECT (view), "find-status"); } -/*** Find ***/ - static void jump_to_find_result (EvView *view) { @@ -3267,7 +4850,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); @@ -3280,8 +4863,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; @@ -3292,11 +4885,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; } @@ -3306,7 +4899,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); @@ -3348,12 +4940,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); @@ -3361,6 +4948,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) { @@ -3378,12 +4982,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 { @@ -3392,6 +4991,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 @@ -3492,8 +5097,6 @@ compute_new_selection_text (EvView *view, } - - /* Now create a list of EvViewSelection's for the affected * pages. This could be an empty list, a list of just one * page or a number of pages.*/ @@ -3600,10 +5203,12 @@ merge_selection_region (EvView *view, * region too. */ if (new_sel) { GdkRegion *tmp_region = NULL; - ev_pixbuf_cache_get_selection_pixbuf (view->pixbuf_cache, - cur_page, - view->scale, - &tmp_region); + + ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache, + cur_page, + view->scale, + &tmp_region); + if (tmp_region) { new_sel->covered_region = gdk_region_copy (tmp_region); } @@ -3611,8 +5216,7 @@ merge_selection_region (EvView *view, /* Now we figure out what needs redrawing */ if (old_sel && new_sel) { - if (old_sel->covered_region && - new_sel->covered_region) { + if (old_sel->covered_region && new_sel->covered_region) { /* We only want to redraw the areas that have * changed, so we xor the old and new regions * and redraw if it's different */ @@ -3644,11 +5248,17 @@ merge_selection_region (EvView *view, GdkRectangle page_area; GtkBorder border; + /* I don't know why but the region is smaller + * than expected. This hack fixes it, I guess + * 10 pixels more won't hurt + */ + gdk_region_shrink (region, -5, -5); + get_page_extents (view, cur_page, &page_area, &border); gdk_region_offset (region, page_area.x + border.left - view->scroll_x, page_area.y + border.top - view->scroll_y); - gdk_window_invalidate_region (GTK_WIDGET (view)->window, region, TRUE); + gdk_window_invalidate_region (view->layout.bin_window, region, TRUE); gdk_region_destroy (region); } } @@ -3687,6 +5297,8 @@ clear_selection (EvView *view) g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL); view->selection_info.selections = NULL; view->selection_info.in_selection = FALSE; + if (view->pixbuf_cache) + ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, NULL); g_object_notify (G_OBJECT (view), "has-selection"); } @@ -3737,6 +5349,7 @@ get_selected_text (EvView *ev_view) { GString *text; GList *l; + gchar *normalized_text; text = g_string_new (NULL); @@ -3755,7 +5368,9 @@ get_selected_text (EvView *ev_view) ev_document_doc_mutex_unlock (); - return g_string_free (text, FALSE); + normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC); + g_string_free (text, TRUE); + return normalized_text; } void @@ -3789,8 +5404,10 @@ ev_view_primary_get_cb (GtkClipboard *clipboard, } text = get_selected_text (ev_view); - gtk_selection_data_set_text (selection_data, text, -1); - g_free (text); + if (text) { + gtk_selection_data_set_text (selection_data, text, -1); + g_free (text); + } } static void @@ -3812,8 +5429,8 @@ ev_view_update_primary_selection (EvView *ev_view) if (ev_view->selection_info.selections) { if (!gtk_clipboard_set_with_owner (clipboard, - targets, - G_N_ELEMENTS (targets), + clipboard_targets, + G_N_ELEMENTS (clipboard_targets), ev_view_primary_get_cb, ev_view_primary_clear_cb, G_OBJECT (ev_view))) @@ -3855,7 +5472,7 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) switch (new_cursor) { case EV_VIEW_CURSOR_NORMAL: - gdk_window_set_cursor (widget->window, NULL); + gdk_window_set_cursor (view->layout.bin_window, NULL); break; case EV_VIEW_CURSOR_IBEAM: cursor = gdk_cursor_new_for_display (display, GDK_XTERM); @@ -3875,7 +5492,7 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) } if (cursor) { - gdk_window_set_cursor (widget->window, cursor); + gdk_window_set_cursor (view->layout.bin_window, cursor); gdk_cursor_unref (cursor); gdk_flush(); } @@ -3893,19 +5510,57 @@ ev_view_show_cursor (EvView *view) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } +static void +ev_view_reset_presentation_state (EvView *view) +{ + if (!view->presentation || + view->presentation_state == EV_PRESENTATION_NORMAL) + return; + + view->presentation_state = EV_PRESENTATION_NORMAL; + gdk_window_set_background (view->layout.bin_window, + >K_WIDGET (view)->style->black); + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + gboolean ev_view_next_page (EvView *view) { - int page; + int page, n_pages; g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + + if (!view->page_cache) + return FALSE; + if (view->presentation && + (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE)) { + ev_view_reset_presentation_state (view); + return FALSE; + } + + ev_view_presentation_transition_stop (view); + ev_view_reset_presentation_state (view); + page = ev_page_cache_get_current_page (view->page_cache); - page = ev_view_get_dual_page (view) ? page + 2 : page + 1; + n_pages = ev_page_cache_get_n_pages (view->page_cache); + + if (view->dual_page && !view->presentation) + page = page + 2; + else + page = page + 1; - if (page < ev_page_cache_get_n_pages (view->page_cache)) { + if (page < n_pages) { ev_page_cache_set_current_page (view->page_cache, 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); + return TRUE; } else { return FALSE; } @@ -3918,13 +5573,38 @@ ev_view_previous_page (EvView *view) g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + if (!view->page_cache) + return FALSE; + + if (view->presentation && + view->presentation_state == EV_PRESENTATION_END) { + ev_view_reset_presentation_state (view); + return TRUE; + } + + if (view->presentation && + (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE)) { + ev_view_reset_presentation_state (view); + return FALSE; + } + + ev_view_reset_presentation_state (view); + 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; } } @@ -3946,3 +5626,56 @@ 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; +} + +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); + } +}