X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=ac14b699c7404724266e220a7515b2fd4ac20775;hb=2297bff1e7d745f0f837d44feeda03244368d7f1;hp=97ff001329284d5cc066e8a8883ceb43a5d1f893;hpb=470da44057ddaf67b1a1ef6254851e288537609e;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 97ff0013..ac14b699 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -33,12 +33,12 @@ #include "ev-document-images.h" #include "ev-document-links.h" #include "ev-document-misc.h" -#include "ev-document-transition.h" #include "ev-pixbuf-cache.h" -#include "ev-transition-animation.h" +#include "ev-page-cache.h" #include "ev-view-marshal.h" #include "ev-document-annotations.h" #include "ev-annotation-window.h" +#include "ev-loading-window.h" #include "ev-view.h" #include "ev-view-accessible.h" #include "ev-view-private.h" @@ -48,24 +48,13 @@ #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW)) #define EV_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass)) -enum { - PROP_0, - PROP_CONTINUOUS, - PROP_DUAL_PAGE, - PROP_FULLSCREEN, - PROP_PRESENTATION, - PROP_SIZING_MODE, - PROP_ZOOM, - PROP_ROTATION, - PROP_HAS_SELECTION, -}; - enum { SIGNAL_BINDING_ACTIVATED, SIGNAL_HANDLE_LINK, SIGNAL_EXTERNAL_LINK, SIGNAL_POPUP_MENU, - N_SIGNALS, + SIGNAL_SELECTION_CHANGED, + N_SIGNALS }; enum { @@ -188,11 +177,6 @@ static void ev_view_remove_all (EvView static AtkObject *ev_view_get_accessible (GtkWidget *widget); /*** Drawing ***/ -static guint32 ev_gdk_color_to_rgb (const GdkColor *color); -static void draw_rubberband (GtkWidget *widget, - GdkWindow *window, - const GdkRectangle *rect, - guchar alpha); static void highlight_find_results (EvView *view, int page); static void draw_one_page (EvView *view, @@ -202,17 +186,16 @@ static void draw_one_page (EvView GtkBorder *border, GdkRectangle *expose_area, gboolean *page_ready); -static void draw_loading_text (EvView *view, - GdkRectangle *page_area, - GdkRectangle *expose_area); +static void show_loading_window (EvView *view); +static void hide_loading_window (EvView *view); static void ev_view_reload_page (EvView *view, gint page, GdkRegion *region); +static void ev_view_loading_window_move (EvView *view); /*** Callbacks ***/ static void ev_view_change_page (EvView *view, - gint new_page, - gboolean start_transition); + gint new_page); static void job_finished_cb (EvPixbufCache *pixbuf_cache, GdkRegion *region, EvView *view); @@ -226,14 +209,6 @@ static void on_adjustment_value_changed (GtkAdjustment /*** GObject ***/ static void ev_view_finalize (GObject *object); static void ev_view_destroy (GtkObject *object); -static void ev_view_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void ev_view_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); static void ev_view_class_init (EvViewClass *class); static void ev_view_init (EvView *view); @@ -253,9 +228,6 @@ static double zoom_for_size_best_fit (gdouble doc_width, static void ev_view_zoom_for_size (EvView *view, int width, int height); -static void ev_view_zoom_for_size_presentation (EvView *view, - int width, - int height); static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, int width, int height); @@ -269,7 +241,6 @@ static void ev_view_zoom_for_size_single_page (EvView *view, int width, int height); /*** Cursors ***/ -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, @@ -304,11 +275,6 @@ 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_LAYOUT) /* HeightToPage cache */ @@ -487,19 +453,22 @@ ev_view_get_scrollbar_size (EvView *view, GtkWidget *widget = GTK_WIDGET (view); GtkWidget *sb; GtkWidget *swindow = gtk_widget_get_parent (GTK_WIDGET (view)); + GtkAllocation allocation; GtkRequisition req; gint spacing; if (!GTK_IS_SCROLLED_WINDOW (swindow)) return 0; + gtk_widget_get_allocation (widget, &allocation); + if (orientation == GTK_ORIENTATION_VERTICAL) { - if (widget->allocation.height >= widget->requisition.height) + if (allocation.height >= view->requisition.height) sb = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (swindow)); else return 0; } else { - if (widget->allocation.width >= widget->requisition.width) + if (allocation.width >= view->requisition.width) sb = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (swindow)); else return 0; @@ -517,28 +486,33 @@ scroll_to_point (EvView *view, gdouble y, GtkOrientation orientation) { + gdouble page_size; + gdouble upper, lower; + if (orientation == GTK_ORIENTATION_VERTICAL) { + page_size = gtk_adjustment_get_page_size (view->vadjustment); + upper = gtk_adjustment_get_upper (view->vadjustment); + lower = gtk_adjustment_get_lower (view->vadjustment); + if (view->continuous) { gtk_adjustment_clamp_page (view->vadjustment, y - view->spacing / 2, - y + view->vadjustment->page_size); + y + page_size); } else { gtk_adjustment_set_value (view->vadjustment, - CLAMP (y, - view->vadjustment->lower, - view->vadjustment->upper - - view->vadjustment->page_size)); + CLAMP (y, lower, upper - page_size)); } } else { + page_size = gtk_adjustment_get_page_size (view->hadjustment); + upper = gtk_adjustment_get_upper (view->hadjustment); + lower = gtk_adjustment_get_lower (view->hadjustment); + if (view->dual_page) { gtk_adjustment_clamp_page (view->hadjustment, x, - x + view->hadjustment->page_size); + x + page_size); } else { gtk_adjustment_set_value (view->hadjustment, - CLAMP (x, - view->hadjustment->lower, - view->hadjustment->upper - - view->hadjustment->page_size)); + CLAMP (x, lower, upper - page_size)); } } } @@ -577,19 +551,24 @@ view_set_adjustment_values (EvView *view, { GtkWidget *widget = GTK_WIDGET (view); GtkAdjustment *adjustment; - int requisition; - int allocation; - + GtkAllocation allocation; + int req_size; + int alloc_size; + gdouble page_size; + gdouble value; + gdouble upper; double factor; gint new_value; + gtk_widget_get_allocation (widget, &allocation); + if (orientation == GTK_ORIENTATION_HORIZONTAL) { - requisition = widget->requisition.width; - allocation = widget->allocation.width; + req_size = view->requisition.width; + alloc_size = allocation.width; adjustment = view->hadjustment; } else { - requisition = widget->requisition.height; - allocation = widget->allocation.height; + req_size = view->requisition.height; + alloc_size = allocation.height; adjustment = view->vadjustment; } @@ -597,23 +576,30 @@ view_set_adjustment_values (EvView *view, return; factor = 1.0; + value = gtk_adjustment_get_value (adjustment); + upper = gtk_adjustment_get_upper (adjustment); + page_size = gtk_adjustment_get_page_size (adjustment); + switch (view->pending_scroll) { case SCROLL_TO_KEEP_POSITION: case SCROLL_TO_FIND_LOCATION: - factor = (adjustment->value) / adjustment->upper; + factor = value / upper; break; case SCROLL_TO_PAGE_POSITION: break; case SCROLL_TO_CENTER: - factor = (adjustment->value + adjustment->page_size * 0.5) / adjustment->upper; + factor = (value + page_size * 0.5) / upper; break; } - adjustment->page_size = allocation; - adjustment->step_increment = allocation * 0.1; - adjustment->page_increment = allocation * 0.9; - adjustment->lower = 0; - adjustment->upper = MAX (allocation, requisition); + upper = MAX (alloc_size, req_size); + page_size = alloc_size; + + gtk_adjustment_set_page_size (adjustment, page_size); + gtk_adjustment_set_step_increment (adjustment, alloc_size * 0.1); + gtk_adjustment_set_page_increment (adjustment, alloc_size * 0.9); + gtk_adjustment_set_lower (adjustment, 0); + gtk_adjustment_set_upper (adjustment, upper); /* * We add 0.5 to the values before to average out our rounding errors. @@ -621,15 +607,15 @@ 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); + new_value = CLAMP (upper * factor + 0.5, 0, upper - page_size); gtk_adjustment_set_value (adjustment, (int)new_value); break; case SCROLL_TO_PAGE_POSITION: ev_view_scroll_to_page_position (view, orientation); break; case SCROLL_TO_CENTER: - new_value = CLAMP (adjustment->upper * factor - adjustment->page_size * 0.5 + 0.5, - 0, adjustment->upper - adjustment->page_size); + new_value = CLAMP (upper * factor - page_size * 0.5 + 0.5, + 0, upper - page_size); gtk_adjustment_set_value (adjustment, (int)new_value); break; } @@ -642,12 +628,12 @@ view_update_range_and_current_page (EvView *view) { gint start = view->start_page; gint end = view->end_page; - - /* Presentation trumps all other modes */ - if (view->presentation) { - view->start_page = view->current_page; - view->end_page = view->current_page; - } else if (view->continuous) { + + if (ev_document_get_n_pages (view->document) <= 0 || + !ev_document_check_dimensions (view->document)) + return; + + if (view->continuous) { GdkRectangle current_area, unused, page_area; GtkBorder border; gboolean found = FALSE; @@ -658,10 +644,10 @@ view_update_range_and_current_page (EvView *view) if (!(view->vadjustment && view->hadjustment)) return; - current_area.x = view->hadjustment->value; - current_area.width = view->hadjustment->page_size; - current_area.y = view->vadjustment->value; - current_area.height = view->vadjustment->page_size; + current_area.x = gtk_adjustment_get_value (view->hadjustment); + current_area.width = gtk_adjustment_get_page_size (view->hadjustment); + current_area.y = gtk_adjustment_get_value (view->vadjustment); + current_area.height = gtk_adjustment_get_page_size (view->vadjustment); for (i = 0; i < ev_document_get_n_pages (view->document); i++) { @@ -700,6 +686,7 @@ view_update_range_and_current_page (EvView *view) if (view->current_page != best_current_page) { view->current_page = best_current_page; + hide_loading_window (view); ev_document_model_set_page (view->model, best_current_page); } } @@ -722,23 +709,27 @@ view_update_range_and_current_page (EvView *view) view->end_page = view->current_page; } + if (view->start_page == -1 || view->end_page == -1) + return; + if (start != view->start_page || end != view->end_page) { gint i; - for (i = start; i < view->start_page; i++) { + for (i = start; i < view->start_page && start != -1; i++) { hide_annotation_windows (view, i); } - for (i = end; i > view->end_page; i--) { + for (i = end; i > view->end_page && end != -1; i--) { hide_annotation_windows (view, i); } } + ev_page_cache_set_page_range (view->page_cache, + view->start_page, + view->end_page); ev_pixbuf_cache_set_page_range (view->pixbuf_cache, view->start_page, view->end_page, - view->rotation, - view->scale, view->selection_info.selections); if (ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page)) @@ -815,6 +806,7 @@ compute_scroll_increment (EvView *view, GtkWidget *widget = GTK_WIDGET (view); GtkAdjustment *adjustment = view->vadjustment; GdkRegion *text_region, *region; + GtkAllocation allocation; gint page; GdkRectangle rect; EvRectangle doc_rect; @@ -825,17 +817,18 @@ compute_scroll_increment (EvView *view, gdouble fraction = 1.0; if (scroll != GTK_SCROLL_PAGE_BACKWARD && scroll != GTK_SCROLL_PAGE_FORWARD) - return adjustment->page_size; + return gtk_adjustment_get_page_size (adjustment); page = scroll == GTK_SCROLL_PAGE_BACKWARD ? view->start_page : view->end_page; - text_region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page); + text_region = ev_page_cache_get_text_mapping (view->page_cache, page); if (!text_region || gdk_region_empty (text_region)) - return adjustment->page_size; + return gtk_adjustment_get_page_size (adjustment); + gtk_widget_get_allocation (widget, &allocation); get_page_extents (view, page, &page_area, &border); rect.x = page_area.x + view->scroll_x; - rect.y = view->scroll_y + (scroll == GTK_SCROLL_PAGE_BACKWARD ? 5 : widget->allocation.height - 5); + rect.y = view->scroll_y + (scroll == GTK_SCROLL_PAGE_BACKWARD ? 5 : allocation.height - 5); rect.width = page_area.width; rect.height = 1; view_rect_to_doc_rect (view, &rect, &page_area, &doc_rect); @@ -872,12 +865,12 @@ compute_scroll_increment (EvView *view, gdk_region_get_rectangles (region, &recs, &n_recs); gdk_region_destroy (region); if (n_recs > 0) { - fraction = 1 - (recs[0].height / adjustment->page_size); + fraction = 1 - (recs[0].height / gtk_adjustment_get_page_size (adjustment)); } g_free (recs); } - return adjustment->page_size * fraction; + return gtk_adjustment_get_page_size (adjustment) * fraction; } @@ -888,12 +881,15 @@ ev_view_scroll (EvView *view, { GtkAdjustment *adjustment; double value, increment; + gdouble upper, lower; + gdouble page_size; + gdouble step_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) { + if (view->sizing_mode == EV_SIZING_BEST_FIT) { switch (scroll) { case GTK_SCROLL_PAGE_BACKWARD: case GTK_SCROLL_STEP_BACKWARD: @@ -911,7 +907,11 @@ ev_view_scroll (EvView *view, /* Assign values for increment and vertical adjustment */ adjustment = horizontal ? view->hadjustment : view->vadjustment; - value = adjustment->value; + value = gtk_adjustment_get_value (adjustment); + upper = gtk_adjustment_get_upper (adjustment); + lower = gtk_adjustment_get_lower (adjustment); + page_size = gtk_adjustment_get_page_size (adjustment); + step_increment = gtk_adjustment_get_step_increment (adjustment); /* Assign boolean for first and last page */ if (view->current_page == 0) @@ -922,50 +922,49 @@ ev_view_scroll (EvView *view, switch (scroll) { case GTK_SCROLL_PAGE_BACKWARD: /* Do not jump backwards if at the first page */ - if (value == (adjustment->lower) && first_page) { + if (value == lower && first_page) { /* Do nothing */ /* 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; + } else if (value == lower) { + value = upper - page_size; ev_view_previous_page (view); /* Jump to the top */ } else { increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_BACKWARD); - value = MAX (value - increment, adjustment->lower); + value = MAX (value - increment, lower); } break; case GTK_SCROLL_PAGE_FORWARD: /* Do not jump forward if at the last page */ - if (value == (adjustment->upper - adjustment->page_size) && last_page) { + if (value == (upper - page_size) && last_page) { /* Do nothing */ /* At the bottom of a page, assign the lower bound limit of next page */ - } else if (value == (adjustment->upper - adjustment->page_size)) { + } else if (value == (upper - page_size)) { value = 0; ev_view_next_page (view); /* Jump to the bottom */ } else { increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_FORWARD); - value = MIN (value + increment, adjustment->upper - adjustment->page_size); + value = MIN (value + increment, upper - page_size); } break; case GTK_SCROLL_STEP_BACKWARD: - value -= adjustment->step_increment; + value -= step_increment; break; case GTK_SCROLL_STEP_FORWARD: - value += adjustment->step_increment; + value += step_increment; break; case GTK_SCROLL_STEP_DOWN: - value -= adjustment->step_increment / 10; + value -= step_increment / 10; break; case GTK_SCROLL_STEP_UP: - value += adjustment->step_increment / 10; + value += step_increment / 10; break; default: break; } - value = CLAMP (value, adjustment->lower, - adjustment->upper - adjustment->page_size); + value = CLAMP (value, lower, upper - page_size); gtk_adjustment_set_value (adjustment, value); } @@ -977,31 +976,35 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) { GtkWidget *widget = GTK_WIDGET (view); GtkAdjustment *adjustment; + GtkAllocation allocation; + gdouble adj_value; int value; view->pending_scroll = SCROLL_TO_FIND_LOCATION; + gtk_widget_get_allocation (widget, &allocation); + adjustment = view->vadjustment; + adj_value = gtk_adjustment_get_value (adjustment); - if (rect->y < adjustment->value) { - value = MAX (adjustment->lower, rect->y - MARGIN); + if (rect->y < adj_value) { + value = MAX (gtk_adjustment_get_lower (adjustment), rect->y - MARGIN); gtk_adjustment_set_value (view->vadjustment, value); - } else if (rect->y + rect->height > - adjustment->value + widget->allocation.height) { - value = MIN (adjustment->upper, rect->y + rect->height - - widget->allocation.height + MARGIN); + } else if (rect->y + rect->height > adj_value + allocation.height) { + value = MIN (gtk_adjustment_get_upper (adjustment), rect->y + rect->height - + allocation.height + MARGIN); gtk_adjustment_set_value (view->vadjustment, value); } adjustment = view->hadjustment; + adj_value = gtk_adjustment_get_value (adjustment); - if (rect->x < adjustment->value) { - value = MAX (adjustment->lower, rect->x - MARGIN); + if (rect->x < adj_value) { + value = MAX (gtk_adjustment_get_lower (adjustment), rect->x - MARGIN); gtk_adjustment_set_value (view->hadjustment, value); - } else if (rect->x + rect->height > - adjustment->value + widget->allocation.width) { - value = MIN (adjustment->upper, rect->x + rect->width - - widget->allocation.width + MARGIN); + } else if (rect->x + rect->height > adj_value + allocation.width) { + value = MIN (gtk_adjustment_get_upper (adjustment), rect->x + rect->width - + allocation.width + MARGIN); gtk_adjustment_set_value (view->hadjustment, value); } @@ -1013,14 +1016,7 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) static void compute_border (EvView *view, int width, int height, GtkBorder *border) { - if (view->presentation) { - border->left = 0; - border->right = 0; - border->top = 0; - border->bottom = 0; - } else { - ev_document_misc_get_page_border_size (width, height, border); - } + ev_document_misc_get_page_border_size (width, height, border); } void @@ -1110,8 +1106,10 @@ get_page_extents (EvView *view, { GtkWidget *widget; int width, height; + GtkAllocation allocation; widget = GTK_WIDGET (view); + gtk_widget_get_allocation (widget, &allocation); /* Get the size of the page */ ev_view_get_page_size (view, page, &width, &height); @@ -1119,10 +1117,7 @@ get_page_extents (EvView *view, page_area->width = width + border->left + border->right; page_area->height = height + border->top + border->bottom; - if (view->presentation) { - page_area->x = (MAX (0, widget->allocation.width - width))/2; - page_area->y = (MAX (0, widget->allocation.height - height))/2; - } else if (view->continuous) { + if (view->continuous) { gint max_width; gint x, y; @@ -1131,12 +1126,12 @@ get_page_extents (EvView *view, /* Get the location of the bounding box */ if (view->dual_page) { x = view->spacing + ((page % 2 == get_dual_even_left (view)) ? 0 : 1) * (max_width + view->spacing); - x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2; + x = x + MAX (0, allocation.width - (max_width * 2 + view->spacing * 3)) / 2; if (page % 2 == get_dual_even_left (view)) x = x + (max_width - width - border->left - border->right); } else { x = view->spacing; - x = x + MAX (0, widget->allocation.width - (width + view->spacing * 2)) / 2; + x = x + MAX (0, allocation.width - (width + view->spacing * 2)) / 2; } get_page_y_offset (view, page, &y); @@ -1179,16 +1174,16 @@ get_page_extents (EvView *view, y = y + (max_height - height)/2; /* Adjust for extra allocation */ - x = x + MAX (0, widget->allocation.width - + x = x + MAX (0, allocation.width - ((max_width + overall_border.left + overall_border.right) * 2 + view->spacing * 3))/2; - y = y + MAX (0, widget->allocation.height - (height + view->spacing * 2))/2; + y = y + MAX (0, allocation.height - (height + view->spacing * 2))/2; } else { x = view->spacing; y = view->spacing; /* Adjust for extra allocation */ - x = x + MAX (0, widget->allocation.width - (width + border->left + border->right + view->spacing * 2))/2; - y = y + MAX (0, widget->allocation.height - (height + border->top + border->bottom + view->spacing * 2))/2; + x = x + MAX (0, allocation.width - (width + border->left + border->right + view->spacing * 2))/2; + y = y + MAX (0, allocation.height - (height + border->top + border->bottom + view->spacing * 2))/2; } page_area->x = x; @@ -1379,7 +1374,7 @@ location_in_text (EvView *view, if (page == -1) return FALSE; - region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page); + region = ev_page_cache_get_text_mapping (view->page_cache, page); if (region) return gdk_region_point_in (region, x_offset / view->scale, y_offset / view->scale); @@ -1387,18 +1382,6 @@ location_in_text (EvView *view, return FALSE; } -static int -ev_view_get_width (EvView *view) -{ - return GTK_WIDGET (view)->allocation.width; -} - -static int -ev_view_get_height (EvView *view) -{ - return GTK_WIDGET (view)->allocation.height; -} - static gboolean location_in_selected_text (EvView *view, gdouble x, @@ -1514,7 +1497,7 @@ ev_view_get_link_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); + link_mapping = ev_page_cache_get_link_mapping (view->page_cache, page); if (link_mapping) return ev_mapping_list_get_data (link_mapping, x_new, y_new); @@ -1528,14 +1511,17 @@ goto_fitr_dest (EvView *view, EvLinkDest *dest) EvPoint doc_point; gdouble zoom, left, top; gboolean change_left, change_top; + GtkAllocation allocation; + + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); left = ev_link_dest_get_left (dest, &change_left); top = ev_link_dest_get_top (dest, &change_top); zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - left, ev_link_dest_get_bottom (dest) - top, - ev_view_get_width (view), - ev_view_get_height (view)); + allocation.width, + allocation.height); ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); ev_document_model_set_scale (view->model, zoom); @@ -1544,7 +1530,7 @@ goto_fitr_dest (EvView *view, EvLinkDest *dest) doc_point.y = change_top ? top : 0; view->pending_point = doc_point; - ev_view_change_page (view, ev_link_dest_get_page (dest), TRUE); + ev_view_change_page (view, ev_link_dest_get_page (dest)); } static void @@ -1555,6 +1541,9 @@ goto_fitv_dest (EvView *view, EvLinkDest *dest) gint page; double zoom, left; gboolean change_left; + GtkAllocation allocation; + + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); page = ev_link_dest_get_page (dest); ev_document_get_page_size (view->document, page, &doc_width, &doc_height); @@ -1564,15 +1553,15 @@ goto_fitv_dest (EvView *view, EvLinkDest *dest) doc_point.y = 0; zoom = zoom_for_size_fit_height (doc_width - doc_point.x , doc_height, - ev_view_get_width (view), - ev_view_get_height (view)); + allocation.width, + allocation.height); ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); ev_document_model_set_scale (view->model, zoom); view->pending_point = doc_point; - ev_view_change_page (view, page, TRUE); + ev_view_change_page (view, page); } static void @@ -1583,6 +1572,9 @@ goto_fith_dest (EvView *view, EvLinkDest *dest) gint page; gdouble zoom, top; gboolean change_top; + GtkAllocation allocation; + + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); page = ev_link_dest_get_page (dest); ev_document_get_page_size (view->document, page, &doc_width, &doc_height); @@ -1593,15 +1585,15 @@ goto_fith_dest (EvView *view, EvLinkDest *dest) doc_point.y = change_top ? top : 0; zoom = zoom_for_size_fit_width (doc_width, top, - ev_view_get_width (view), - ev_view_get_height (view)); + allocation.width, + allocation.height); ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_WIDTH); ev_document_model_set_scale (view->model, zoom); view->pending_point = doc_point; - ev_view_change_page (view, page, TRUE); + ev_view_change_page (view, page); } static void @@ -1610,18 +1602,21 @@ goto_fit_dest (EvView *view, EvLinkDest *dest) double zoom; gdouble doc_width, doc_height; int page; + GtkAllocation allocation; + + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); page = ev_link_dest_get_page (dest); ev_document_get_page_size (view->document, page, &doc_width, &doc_height); zoom = zoom_for_size_best_fit (doc_width, doc_height, - ev_view_get_width (view), - ev_view_get_height (view)); + allocation.width, + allocation.height); ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT); ev_document_model_set_scale (view->model, zoom); - ev_view_change_page (view, page, TRUE); + ev_view_change_page (view, page); } static void @@ -1647,7 +1642,7 @@ goto_xyz_dest (EvView *view, EvLinkDest *dest) doc_point.y = change_top ? top : 0; view->pending_point = doc_point; - ev_view_change_page (view, page, TRUE); + ev_view_change_page (view, page); } static void @@ -1752,42 +1747,6 @@ ev_view_handle_link (EvView *view, EvLink *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_document_get_page_label (view->document, - 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_document_get_page_label (view->document, - ev_link_dest_get_page (dest)); - } - - return msg; -} - static char * tip_from_action_named (EvLinkAction *action) { @@ -1829,8 +1788,8 @@ tip_from_link (EvView *view, EvLink *link) switch (type) { case EV_LINK_ACTION_TYPE_GOTO_DEST: - page_label = ev_view_page_label_from_dest (view, - ev_link_action_get_dest (action)); + page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (view->document), + ev_link_action_get_dest (action)); if (page_label) { msg = g_strdup_printf (_("Go to page %s"), page_label); g_free (page_label); @@ -1932,7 +1891,7 @@ ev_view_get_image_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page); + image_mapping = ev_page_cache_get_image_mapping (view->page_cache, page); if (image_mapping) return ev_mapping_list_get_data (image_mapping, x_new, y_new); @@ -1956,7 +1915,7 @@ ev_view_get_form_field_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, page); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, page); if (forms_mapping) return ev_mapping_list_get_data (forms_mapping, x_new, y_new); @@ -1971,8 +1930,8 @@ ev_view_form_field_get_region (EvView *view, GdkRectangle view_area; GList *forms_mapping; - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, forms_mapping, field, &view_area); @@ -2023,8 +1982,8 @@ ev_view_form_field_button_create_widget (EvView *view, /* For radio buttons and checkbox buttons that are in a set * we need to update also the region for the current selected item */ - forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); for (l = forms_mapping; l; l = g_list_next (l)) { EvFormField *button = ((EvMapping *)(l->data))->data; GdkRegion *button_region; @@ -2342,7 +2301,8 @@ ev_view_form_field_choice_create_widget (EvView *view, g_signal_connect (choice, "changed", G_CALLBACK (ev_view_form_field_choice_changed), field); - g_signal_connect_after (GTK_BIN(choice)->child, "activate", + g_signal_connect_after (gtk_bin_get_child (GTK_BIN (choice)), + "activate", G_CALLBACK (ev_view_form_field_destroy), view); } else { /* ComboBoxText */ @@ -2407,7 +2367,8 @@ ev_view_handle_form_field (EvView *view, g_object_ref (field), (GDestroyNotify)g_object_unref); - form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page->index); + form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, form_field_mapping, field, &view_area); @@ -2470,7 +2431,7 @@ ev_view_window_child_move_with_parent (EvView *view, ev_view_window_child_move (view, child, dest_x, dest_y); } - if (child->visible && !GTK_WIDGET_VISIBLE (window)) + if (child->visible && !gtk_widget_get_visible (window)) gtk_widget_show (window); } @@ -2631,7 +2592,7 @@ show_annotation_windows (EvView *view, parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); - annots = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); for (l = annots; l && l->data; l = g_list_next (l)) { EvAnnotation *annot; @@ -2696,7 +2657,7 @@ hide_annotation_windows (EvView *view, { GList *annots, *l; - annots = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annots = ev_page_cache_get_annot_mapping (view->page_cache, page); for (l = annots; l && l->data; l = g_list_next (l)) { EvAnnotation *annot; @@ -2728,7 +2689,7 @@ ev_view_get_annotation_at_location (EvView *view, if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new)) return NULL; - annotations_mapping = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annotations_mapping = ev_page_cache_get_annot_mapping (view->page_cache, page); if (annotations_mapping) return ev_mapping_list_get_data (annotations_mapping, x_new, y_new); @@ -2784,25 +2745,28 @@ static void ev_view_size_request_continuous_dual_page (EvView *view, GtkRequisition *requisition) { - int max_width; gint n_pages; - GtkBorder border; - - ev_view_get_max_page_size (view, &max_width, NULL); - compute_border (view, max_width, max_width, &border); n_pages = ev_document_get_n_pages (view->document) + 1; - - requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); get_page_y_offset (view, n_pages, &requisition->height); - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - requisition->width = 1; - } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { - requisition->width = 1; - /* FIXME: This could actually be set on one page docs or docs - * with a strange aspect ratio. */ - /* requisition->height = 1;*/ + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; + + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; + + ev_view_get_max_page_size (view, &max_width, NULL); + compute_border (view, max_width, max_width, &border); + requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3); + } + break; + default: + g_assert_not_reached (); } } @@ -2810,24 +2774,28 @@ static void ev_view_size_request_continuous (EvView *view, GtkRequisition *requisition) { - int max_width; - int n_pages; - GtkBorder border; + gint n_pages; - ev_view_get_max_page_size (view, &max_width, NULL); n_pages = ev_document_get_n_pages (view->document); - compute_border (view, max_width, max_width, &border); - - requisition->width = max_width + (view->spacing * 2) + border.left + border.right; get_page_y_offset (view, n_pages, &requisition->height); - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - requisition->width = 1; - } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { - requisition->width = 1; - /* FIXME: This could actually be set on one page docs or docs - * with a strange aspect ratio. */ - /* requisition->height = 1;*/ + switch (view->sizing_mode) { + case EV_SIZING_FIT_WIDTH: + case EV_SIZING_BEST_FIT: + requisition->width = 1; + + break; + case EV_SIZING_FREE: { + gint max_width; + GtkBorder border; + + ev_view_get_max_page_size (view, &max_width, NULL); + compute_border (view, max_width, max_width, &border); + requisition->width = max_width + (view->spacing * 2) + border.left + border.right; + } + break; + default: + g_assert_not_reached (); } } @@ -2838,6 +2806,13 @@ ev_view_size_request_dual_page (EvView *view, GtkBorder border; gint width, height; + if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + requisition->height = 1; + + return; + } + /* Find the largest of the two. */ ev_view_get_page_size (view, view->current_page, @@ -2854,17 +2829,9 @@ ev_view_size_request_dual_page (EvView *view, } compute_border (view, width, height, &border); - requisition->width = ((width + border.left + border.right) * 2) + - (view->spacing * 3); - requisition->height = (height + border.top + border.bottom) + - (view->spacing * 2); - - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - requisition->width = 1; - } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { - requisition->width = 1; - requisition->height = 1; - } + requisition->width = view->sizing_mode == EV_SIZING_FIT_WIDTH ? 1 : + ((width + border.left + border.right) * 2) + (view->spacing * 3); + requisition->height = (height + border.top + border.bottom) + (view->spacing * 2); } static void @@ -2874,19 +2841,19 @@ ev_view_size_request_single_page (EvView *view, GtkBorder border; gint width, height; + if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + requisition->height = 1; + + return; + } + ev_view_get_page_size (view, view->current_page, &width, &height); compute_border (view, width, height, &border); - requisition->width = width + border.left + border.right + (2 * view->spacing); + requisition->width = view->sizing_mode == EV_SIZING_FIT_WIDTH ? 1 : + width + border.left + border.right + (2 * view->spacing); requisition->height = height + border.top + border.bottom + (2 * view->spacing); - - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - requisition->width = 1; - requisition->height = height + border.top + border.bottom + (2 * view->spacing); - } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { - requisition->width = 1; - requisition->height = 1; - } } static void @@ -2894,27 +2861,40 @@ ev_view_size_request (GtkWidget *widget, GtkRequisition *requisition) { EvView *view = EV_VIEW (widget); - + if (view->document == NULL) { - requisition->width = 1; - requisition->height = 1; + view->requisition.width = 1; + view->requisition.height = 1; + + *requisition = view->requisition; + return; } - if (view->presentation) { - requisition->width = 1; - requisition->height = 1; - return; + /* Get zoom for size here when not called from + * ev_view_size_allocate() + */ + if (!view->internal_size_request && + (view->sizing_mode == EV_SIZING_FIT_WIDTH || + view->sizing_mode == EV_SIZING_BEST_FIT)) { + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); + ev_view_zoom_for_size (view, + allocation.width, + allocation.height); } if (view->continuous && view->dual_page) - ev_view_size_request_continuous_dual_page (view, requisition); + ev_view_size_request_continuous_dual_page (view, &view->requisition); else if (view->continuous) - ev_view_size_request_continuous (view, requisition); + ev_view_size_request_continuous (view, &view->requisition); else if (view->dual_page) - ev_view_size_request_dual_page (view, requisition); + ev_view_size_request_dual_page (view, &view->requisition); else - ev_view_size_request_single_page (view, requisition); + ev_view_size_request_single_page (view, &view->requisition); + + *requisition = view->requisition; } static void @@ -2926,13 +2906,20 @@ ev_view_size_allocate (GtkWidget *widget, gint root_x, root_y; GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); - + + if (!view->document) + return; + if (view->sizing_mode == EV_SIZING_FIT_WIDTH || view->sizing_mode == EV_SIZING_BEST_FIT) { + GtkRequisition req; + ev_view_zoom_for_size (view, allocation->width, allocation->height); - ev_view_size_request (widget, &widget->requisition); + view->internal_size_request = TRUE; + ev_view_size_request (widget, &req); + view->internal_size_request = FALSE; } view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); @@ -2959,8 +2946,8 @@ ev_view_size_allocate (GtkWidget *widget, if (!field) continue; - form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, - field->page->index); + form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, + field->page->index); ev_view_get_area_from_mapping (view, field->page->index, form_field_mapping, field, &view_area); @@ -3013,13 +3000,16 @@ ev_view_size_allocate (GtkWidget *widget, static void ev_view_realize (GtkWidget *widget) { - EvView *view = EV_VIEW (widget); + EvView *view = EV_VIEW (widget); + GdkWindow *bin_window; + GtkStyle *style; if (GTK_WIDGET_CLASS (ev_view_parent_class)->realize) (* GTK_WIDGET_CLASS (ev_view_parent_class)->realize) (widget); - gdk_window_set_events (view->layout.bin_window, - (gdk_window_get_events (view->layout.bin_window) | + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + gdk_window_set_events (bin_window, + (gdk_window_get_events (bin_window) | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -3030,10 +3020,8 @@ ev_view_realize (GtkWidget *widget) GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK)); - if (view->presentation) - gdk_window_set_background (view->layout.bin_window, &widget->style->black); - else - gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]); + style = gtk_widget_get_style (widget); + gdk_window_set_background (bin_window, &style->mid[GTK_STATE_NORMAL]); on_adjustment_value_changed (NULL, view); } @@ -3046,7 +3034,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) state = event->state & gtk_accelerator_get_default_mod_mask (); - if (state == GDK_CONTROL_MASK && view->presentation == FALSE) { + if (state == GDK_CONTROL_MASK) { ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE); if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_LEFT) { @@ -3079,9 +3067,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) state &= ~GDK_SHIFT_MASK; } - if (state == 0 && - (view->presentation || - (view->sizing_mode == EV_SIZING_BEST_FIT && !view->continuous))) { + if (state == 0 && view->sizing_mode == EV_SIZING_BEST_FIT && !view->continuous) { switch (event->direction) { case GDK_SCROLL_DOWN: case GDK_SCROLL_RIGHT: @@ -3117,104 +3103,28 @@ 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); - cairo_t *cr; - gint i; - - if (view->animation) { - if (ev_transition_animation_ready (view->animation)) { - GdkRectangle page_area; - GtkBorder border; - - if (get_page_extents (view, view->current_page, &page_area, &border)) { - cr = gdk_cairo_create (view->layout.bin_window); - - /* normalize to x=0, y=0 */ - cairo_translate (cr, page_area.x, page_area.y); - page_area.x = page_area.y = 0; - - ev_transition_animation_paint (view->animation, cr, page_area); - cairo_destroy (cr); - } - } - - return TRUE; - } - - 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; + EvView *view = EV_VIEW (widget); + GdkWindow *bin_window; + cairo_t *cr; + gint i; - draw_loading_text (view, - &area, - &(event->area)); + if (view->loading) { + show_loading_window (view); + } else if (view->loading_window && + gtk_widget_get_visible (view->loading_window)) { + ev_view_loading_window_move (view); } if (view->document == NULL) return FALSE; - cr = gdk_cairo_create (view->layout.bin_window); - + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + cr = gdk_cairo_create (bin_window); + for (i = view->start_page; i >= 0 && i <= view->end_page; i++) { GdkRectangle page_area; GtkBorder border; @@ -3247,29 +3157,26 @@ ev_view_do_popup_menu (EvView *view, gdouble x, gdouble y) { + GList *items = NULL; EvLink *link; EvImage *image; EvAnnotation *annot; image = ev_view_get_image_at_location (view, x, y); - if (image) { - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image); - return TRUE; - } + if (image) + items = g_list_prepend (items, image); link = ev_view_get_link_at_location (view, x, y); - if (link) { - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); - return TRUE; - } + if (link) + items = g_list_prepend (items, link); annot = ev_view_get_annotation_at_location (view, x, y); - if (annot) { - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, annot); - return TRUE; - } + if (annot) + items = g_list_prepend (items, annot); + + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, items); - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL); + g_list_free (items); return TRUE; } @@ -3299,7 +3206,7 @@ get_link_area (EvView *view, find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); + link_mapping = ev_page_cache_get_link_mapping (view->page_cache, page); ev_view_get_area_from_mapping (view, page, link_mapping, link, area); @@ -3312,7 +3219,7 @@ get_annot_area (EvView *view, EvAnnotation *annot, GdkRectangle *area) { - GList *annots_mapping; + GList *annot_mapping; gint page; gint x_offset = 0, y_offset = 0; @@ -3321,9 +3228,9 @@ get_annot_area (EvView *view, find_page_at_location (view, x, y, &page, &x_offset, &y_offset); - annots_mapping = ev_pixbuf_cache_get_annots_mapping (view->pixbuf_cache, page); + annot_mapping = ev_page_cache_get_annot_mapping (view->page_cache, page); ev_view_get_area_from_mapping (view, page, - annots_mapping, + annot_mapping, annot, area); } @@ -3404,7 +3311,7 @@ ev_view_button_press_event (GtkWidget *widget, if (!view->document) return FALSE; - if (!GTK_WIDGET_HAS_FOCUS (widget)) { + if (!gtk_widget_has_focus (widget)) { gtk_widget_grab_focus (widget); } @@ -3564,7 +3471,7 @@ ev_view_drag_motion (GtkWidget *widget, if (gtk_drag_get_source_widget (context) == widget) gdk_drag_status (context, 0, time); else - gdk_drag_status (context, context->suggested_action, time); + gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), time); return TRUE; } @@ -3585,34 +3492,36 @@ selection_scroll_timeout_cb (EvView *view) { gint x, y, shift = 0; GtkWidget *widget = GTK_WIDGET (view); - + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_pointer (widget, &x, &y); - if (y > widget->allocation.height) { - shift = (y - widget->allocation.height) / 2; + if (y > allocation.height) { + shift = (y - allocation.height) / 2; } else if (y < 0) { shift = y / 2; } if (shift) gtk_adjustment_set_value (view->vadjustment, - CLAMP (view->vadjustment->value + shift, - view->vadjustment->lower, - view->vadjustment->upper - - view->vadjustment->page_size)); + CLAMP (gtk_adjustment_get_value (view->vadjustment) + shift, + gtk_adjustment_get_lower (view->vadjustment), + gtk_adjustment_get_upper (view->vadjustment) - + gtk_adjustment_get_page_size (view->vadjustment))); - if (x > widget->allocation.width) { - shift = (x - widget->allocation.width) / 2; + if (x > allocation.width) { + shift = (x - 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)); + CLAMP (gtk_adjustment_get_value (view->hadjustment) + shift, + gtk_adjustment_get_lower (view->hadjustment), + gtk_adjustment_get_upper (view->hadjustment) - + gtk_adjustment_get_page_size (view->hadjustment))); return TRUE; } @@ -3644,36 +3553,47 @@ ev_view_scroll_drag_release (EvView *view) { gdouble dhadj_value, dvadj_value; gdouble oldhadjustment, oldvadjustment; + gdouble h_page_size, v_page_size; + gdouble h_upper, v_upper; + GtkAllocation allocation; view->drag_info.momentum.x /= 1.2; view->drag_info.momentum.y /= 1.2; /* Alter these constants to change "friction" */ - dhadj_value = view->hadjustment->page_size * - (gdouble)view->drag_info.momentum.x / GTK_WIDGET (view)->allocation.width; - dvadj_value = view->vadjustment->page_size * - (gdouble)view->drag_info.momentum.y / GTK_WIDGET (view)->allocation.height; + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); + + h_page_size = gtk_adjustment_get_page_size (view->hadjustment); + v_page_size = gtk_adjustment_get_page_size (view->vadjustment); + + dhadj_value = h_page_size * + (gdouble)view->drag_info.momentum.x / allocation.width; + dvadj_value = v_page_size * + (gdouble)view->drag_info.momentum.y / allocation.height; oldhadjustment = gtk_adjustment_get_value (view->hadjustment); oldvadjustment = gtk_adjustment_get_value (view->vadjustment); - /* When we reach the edges, we need either to absorb some momentum and bounce by - * multiplying it on -0.5 or stop scrolling by setting momentum to 0. */ - if (((oldhadjustment + dhadj_value) > (view->hadjustment->upper - view->hadjustment->page_size)) || - ((oldhadjustment + dhadj_value) < 0)) + h_upper = gtk_adjustment_get_upper (view->hadjustment); + v_upper = gtk_adjustment_get_upper (view->vadjustment); + + /* When we reach the edges, we need either to absorb some momentum and bounce by + * multiplying it on -0.5 or stop scrolling by setting momentum to 0. */ + if (((oldhadjustment + dhadj_value) > (h_upper - h_page_size)) || + ((oldhadjustment + dhadj_value) < 0)) view->drag_info.momentum.x = 0; - if (((oldvadjustment + dvadj_value) > (view->vadjustment->upper - view->vadjustment->page_size)) || - ((oldvadjustment + dvadj_value) < 0)) + if (((oldvadjustment + dvadj_value) > (v_upper - v_page_size)) || + ((oldvadjustment + dvadj_value) < 0)) view->drag_info.momentum.y = 0; gtk_adjustment_set_value (view->hadjustment, - MIN (oldhadjustment + dhadj_value, - view->hadjustment->upper - view->hadjustment->page_size)); + MIN (oldhadjustment + dhadj_value, + h_upper - h_page_size)); gtk_adjustment_set_value (view->vadjustment, - MIN (oldvadjustment + dvadj_value, - view->vadjustment->upper - view->vadjustment->page_size)); + MIN (oldvadjustment + dvadj_value, + v_upper - v_page_size)); if (((view->drag_info.momentum.x < 1) && (view->drag_info.momentum.x > -1)) && - ((view->drag_info.momentum.y < 1) && (view->drag_info.momentum.y > -1))) + ((view->drag_info.momentum.y < 1) && (view->drag_info.momentum.y > -1))) return FALSE; else return TRUE; @@ -3683,14 +3603,16 @@ static gboolean ev_view_motion_notify_event (GtkWidget *widget, GdkEventMotion *event) { - EvView *view = EV_VIEW (widget); - gint x, y; + EvView *view = EV_VIEW (widget); + GdkWindow *bin_window; + gint x, y; if (!view->document) return FALSE; - - - if (event->is_hint || event->window != view->layout.bin_window) { + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + + if (event->is_hint || event->window != bin_window) { gtk_widget_get_pointer (widget, &x, &y); } else { x = event->x; @@ -3799,6 +3721,7 @@ ev_view_motion_notify_event (GtkWidget *widget, if (view->drag_info.in_drag) { int dx, dy; gdouble dhadj_value, dvadj_value; + GtkAllocation allocation; view->drag_info.buffer[0].x = event->x; view->drag_info.buffer[0].y = event->y; @@ -3806,20 +3729,22 @@ ev_view_motion_notify_event (GtkWidget *widget, dx = event->x_root - view->drag_info.start.x; dy = event->y_root - view->drag_info.start.y; - dhadj_value = view->hadjustment->page_size * - (gdouble)dx / widget->allocation.width; - dvadj_value = view->vadjustment->page_size * - (gdouble)dy / widget->allocation.height; + gtk_widget_get_allocation (widget, &allocation); + + dhadj_value = gtk_adjustment_get_page_size (view->hadjustment) * + (gdouble)dx / allocation.width; + dvadj_value = gtk_adjustment_get_page_size (view->vadjustment) * + (gdouble)dy / allocation.height; /* clamp scrolling to visible area */ gtk_adjustment_set_value (view->hadjustment, - MIN(view->drag_info.hadj - dhadj_value, - view->hadjustment->upper - - view->hadjustment->page_size)); + MIN (view->drag_info.hadj - dhadj_value, + gtk_adjustment_get_upper (view->hadjustment) - + gtk_adjustment_get_page_size (view->hadjustment))); gtk_adjustment_set_value (view->vadjustment, - MIN(view->drag_info.vadj - dvadj_value, - view->vadjustment->upper - - view->vadjustment->page_size)); + MIN (view->drag_info.vadj - dvadj_value, + gtk_adjustment_get_upper (view->vadjustment) - + gtk_adjustment_get_page_size (view->vadjustment))); return TRUE; } @@ -3857,7 +3782,7 @@ ev_view_button_release_event (GtkWidget *widget, if (view->document && !view->drag_info.in_drag && view->pressed_button != 3) { link = ev_view_get_link_at_location (view, event->x, event->y); } - + view->drag_info.in_drag = FALSE; if (view->pressed_button == 2) { @@ -3903,506 +3828,235 @@ ev_view_button_release_event (GtkWidget *widget, } 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; - } } - + return FALSE; } -/* Goto Window */ -/* Cut and paste from gtkwindow.c */ -static void -send_focus_change (GtkWidget *widget, - gboolean in) +static gboolean +ev_view_key_press_event (GtkWidget *widget, + GdkEventKey *event) { - GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); + EvView *view = EV_VIEW (widget); - g_object_ref (widget); + if (!view->document) + return FALSE; - if (in) - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); + if (!gtk_widget_has_focus (widget)) { + /* Forward key events to current focused window child */ + if (view->window_child_focus) { + GdkEventKey *new_event; + gboolean handled; - fevent->focus_change.type = GDK_FOCUS_CHANGE; - fevent->focus_change.window = g_object_ref (widget->window); - fevent->focus_change.in = in; + new_event = (GdkEventKey *) gdk_event_copy ((GdkEvent *)event); + g_object_unref (new_event->window); + new_event->window = gtk_widget_get_window (view->window_child_focus->window); + if (new_event->window) + g_object_ref (new_event->window); + gtk_widget_realize (view->window_child_focus->window); + handled = gtk_widget_event (view->window_child_focus->window, (GdkEvent *)new_event); + gdk_event_free ((GdkEvent *)new_event); - gtk_widget_event (widget, fevent); + return handled; + } - g_object_notify (G_OBJECT (widget), "has-focus"); + return FALSE; + } - g_object_unref (widget); - gdk_event_free (fevent); + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); } -static void -ev_view_goto_window_hide (EvView *view) +static gint +ev_view_focus_in (GtkWidget *widget, + GdkEventFocus *event) { - /* 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), ""); + if (EV_VIEW (widget)->pixbuf_cache) + ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); + gtk_widget_queue_draw (widget); + + return FALSE; } -static gboolean -ev_view_goto_window_delete_event (GtkWidget *widget, - GdkEventAny *event, - EvView *view) +static gint +ev_view_focus_out (GtkWidget *widget, + GdkEventFocus *event) { - ev_view_goto_window_hide (view); + if (EV_VIEW (widget)->pixbuf_cache) + ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); + gtk_widget_queue_draw (widget); - return TRUE; + return FALSE; } static gboolean -key_is_numeric (guint keyval) +ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) { - return ((keyval >= GDK_0 && keyval <= GDK_9) || - (keyval >= GDK_KP_0 && keyval <= GDK_KP_9)); -} + EvView *view = EV_VIEW (widget); -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; - } + if (view->cursor != EV_VIEW_CURSOR_NORMAL) + ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); return FALSE; } static gboolean -ev_view_goto_window_button_press_event (GtkWidget *widget, - GdkEventButton *event, - EvView *view) +ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) { - ev_view_goto_window_hide (view); + EvView *view = EV_VIEW (widget); - return TRUE; + ev_view_handle_cursor_over_xy (view, event->x, event->y); + + return FALSE; } static void -ev_view_goto_entry_activate (GtkEntry *entry, - EvView *view) +ev_view_style_set (GtkWidget *widget, + GtkStyle *old_style) { - const gchar *text; - gint page; - - text = gtk_entry_get_text (entry); - page = atoi (text) - 1; - - ev_view_goto_window_hide (view); + if (EV_VIEW (widget)->pixbuf_cache) + ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); - if (page >= 0 && page < ev_document_get_n_pages (view->document)) { - ev_document_model_set_page (view->model, page); - } + GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style); } +/*** Drawing ***/ + static void -ev_view_goto_window_create (EvView *view) +draw_rubberband (EvView *view, + GdkWindow *window, + const GdkRectangle *rect, + gdouble alpha) { - GtkWidget *frame, *hbox, *toplevel, *label; + GtkStyle *style; + GdkColor *fill_color_gdk; + gdouble r, g, b; + cairo_t *cr; - 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; - } + style = gtk_widget_get_style (GTK_WIDGET (view)); + fill_color_gdk = gdk_color_copy (&style->base[GTK_STATE_SELECTED]); + r = fill_color_gdk->red / 65535.; + g = fill_color_gdk->green / 65535.; + b = fill_color_gdk->blue / 65535.; - view->goto_window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_screen (GTK_WINDOW (view->goto_window), - gtk_widget_get_screen (GTK_WIDGET (view))); + cr = gdk_cairo_create (window); - 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); + cairo_set_source_rgba (cr, r, g, b, alpha); + cairo_rectangle (cr, + rect->x - view->scroll_x, + rect->y - view->scroll_y, + rect->width, rect->height); + cairo_fill_preserve (cr); - 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); + cairo_set_line_width (cr, 0.5); + cairo_set_source_rgb (cr, r, g, b); + cairo_stroke (cr); - 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); + cairo_destroy (cr); - 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 (GTK_BOX (hbox), view->goto_entry, TRUE, TRUE, 0); - gtk_widget_show (view->goto_entry); - gtk_widget_realize (view->goto_entry); + gdk_color_free (fill_color_gdk); } -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) +highlight_find_results (EvView *view, int page) { - EvView *view = EV_VIEW (widget); - EvPresentationState current; + gint i, n_results = 0; + GdkWindow *bin_window; - if (!view->document) - return FALSE; + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - if (!GTK_WIDGET_HAS_FOCUS (widget)) { - /* Forward key events to current focused window child */ - if (view->window_child_focus) { - GdkEventKey *new_event; - gboolean handled; - - new_event = (GdkEventKey *) gdk_event_copy ((GdkEvent *)event); - g_object_unref (new_event->window); - new_event->window = g_object_ref (view->window_child_focus->window->window); - gtk_widget_realize (view->window_child_focus->window); - handled = gtk_widget_event (view->window_child_focus->window, (GdkEvent *)new_event); - gdk_event_free ((GdkEvent *)new_event); - - return handled; - } - - return FALSE; - } - - if (!view->presentation || - view->presentation_state == EV_PRESENTATION_END) - return gtk_bindings_activate_event (GTK_OBJECT (widget), event); - - - current = view->presentation_state; + n_results = ev_view_find_get_n_results (view, page); - switch (event->keyval) { - case GDK_b: - case GDK_B: - case GDK_period: - case GDK_KP_Decimal: - 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; - } - } + for (i = 0; i < n_results; i++) { + EvRectangle *rectangle; + GdkRectangle view_rectangle; + gdouble alpha; - if (current == view->presentation_state) { - if (ev_document_get_n_pages (view->document) > 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; + if (i == view->find_result && page == view->current_page) { + alpha = 0.6; + } else { + alpha = 0.3; } - - 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) -{ - if (EV_VIEW (widget)->pixbuf_cache) - ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); - gtk_widget_queue_draw (widget); - - return FALSE; -} -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); - - return FALSE; -} - -static gboolean -ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) -{ - EvView *view = EV_VIEW (widget); - - if (view->cursor != EV_VIEW_CURSOR_NORMAL) - ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); - - return FALSE; -} - -static gboolean -ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) -{ - EvView *view = EV_VIEW (widget); - - ev_view_handle_cursor_over_xy (view, event->x, event->y); - - return FALSE; + rectangle = ev_view_find_get_result (view, page, i); + doc_rect_to_view_rect (view, page, rectangle, &view_rectangle); + draw_rubberband (view, bin_window, &view_rectangle, alpha); + } } static void -ev_view_style_set (GtkWidget *widget, - GtkStyle *old_style) +ev_view_loading_window_move (EvView *view) { - if (EV_VIEW (widget)->pixbuf_cache) - ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); + GtkWidget *widget = GTK_WIDGET (view); + EvLoadingWindow *window = EV_LOADING_WINDOW (view->loading_window); + gint root_x, root_y; + gint window_width; + GtkAllocation allocation; - GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style); -} + gtk_widget_get_allocation (widget, &allocation); + gdk_window_get_origin (gtk_widget_get_window (widget), &root_x, &root_y); + ev_loading_window_get_size (window, &window_width, NULL); -/*** Drawing ***/ + root_x += allocation.width - window_width - 10; + root_y += 10; -static guint32 -ev_gdk_color_to_rgb (const GdkColor *color) -{ - guint32 result; - result = (0xff0000 | (color->red & 0xff00)); - result <<= 8; - result |= ((color->green & 0xff00) | (color->blue >> 8)); - return result; + ev_loading_window_move (window, root_x, root_y); } -static void -draw_rubberband (GtkWidget *widget, GdkWindow *window, - const GdkRectangle *rect, guchar alpha) +static gboolean +show_loading_window_cb (EvView *view) { - GdkGC *gc; - GdkPixbuf *pixbuf; - GdkColor *fill_color_gdk; - guint fill_color; + if (!view->loading_window) { + GtkWindow *parent; + GdkScreen *screen; - fill_color_gdk = gdk_color_copy (>K_WIDGET (widget)->style->base[GTK_STATE_SELECTED]); - fill_color = ev_gdk_color_to_rgb (fill_color_gdk) << 8 | alpha; + parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); + view->loading_window = ev_loading_window_new (parent); - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, - rect->width, rect->height); - gdk_pixbuf_fill (pixbuf, fill_color); + /* Show the window off screen to get a valid size asap */ + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + gtk_window_move (GTK_WINDOW (view->loading_window), + gdk_screen_get_width (screen) + 1, + gdk_screen_get_height (screen) + 1); + gtk_widget_show (view->loading_window); + } - gdk_draw_pixbuf (window, NULL, pixbuf, - 0, 0, - rect->x - EV_VIEW (widget)->scroll_x, rect->y - EV_VIEW (widget)->scroll_y, - rect->width, rect->height, - GDK_RGB_DITHER_NONE, - 0, 0); + ev_view_loading_window_move (view); - g_object_unref (pixbuf); + gtk_widget_show (view->loading_window); - gc = gdk_gc_new (window); - gdk_gc_set_rgb_fg_color (gc, fill_color_gdk); - gdk_draw_rectangle (window, gc, FALSE, - rect->x - EV_VIEW (widget)->scroll_x, rect->y - EV_VIEW (widget)->scroll_y, - rect->width - 1, - rect->height - 1); - g_object_unref (gc); + view->loading_timeout = 0; - gdk_color_free (fill_color_gdk); + return FALSE; } - static void -highlight_find_results (EvView *view, int page) +show_loading_window (EvView *view) { - gint i, n_results = 0; - - n_results = ev_view_find_get_n_results (view, page); - - for (i = 0; i < n_results; i++) { - EvRectangle *rectangle; - GdkRectangle view_rectangle; - guchar alpha; - - if (i == view->find_result && page == view->current_page) { - alpha = 0x90; - } else { - alpha = 0x20; - } + if (view->loading_window && gtk_widget_get_visible (view->loading_window)) { + ev_view_loading_window_move (view); + return; + } - rectangle = ev_view_find_get_result (view, page, i); - doc_rect_to_view_rect (view, page, rectangle, &view_rectangle); - draw_rubberband (GTK_WIDGET (view), view->layout.bin_window, - &view_rectangle, alpha); - } + if (!view->loading_timeout) { + view->loading_timeout = + g_timeout_add_full (G_PRIORITY_LOW, + 0.5, (GSourceFunc)show_loading_window_cb, + view, NULL); + } } static void -draw_loading_text (EvView *view, - GdkRectangle *page_area, - GdkRectangle *expose_area) +hide_loading_window (EvView *view) { - cairo_t *cr; - gint width, height; - - if (!view->loading_text) { - const gchar *loading_text = _("Loading..."); - PangoLayout *layout; - PangoFontDescription *font_desc; - PangoRectangle logical_rect; - gint target_width; - gdouble real_scale; - - ev_document_fc_mutex_lock (); + if (view->loading_timeout) { + g_source_remove (view->loading_timeout); + view->loading_timeout = 0; + } - 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 (); - } - - 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); + if (view->loading_window && gtk_widget_get_visible (view->loading_window)) { + gtk_widget_hide (view->loading_window); + } } static void @@ -4414,8 +4068,11 @@ draw_one_page (EvView *view, GdkRectangle *expose_area, gboolean *page_ready) { + GdkWindow *bin_window; GdkRectangle overlap; GdkRectangle real_page_area; + gint current_page; + gboolean inverted_colors; g_assert (view->document); @@ -4431,15 +4088,14 @@ draw_one_page (EvView *view, real_page_area.height -= (border->top + border->bottom); *page_ready = TRUE; - if (!view->presentation) { - gint current_page; - - current_page = ev_document_model_get_page (view->model); - ev_document_misc_paint_one_page (view->layout.bin_window, - GTK_WIDGET (view), - page_area, border, - page == current_page); - } + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + current_page = ev_document_model_get_page (view->model); + inverted_colors = ev_document_model_get_inverted_colors (view->model); + ev_document_misc_paint_one_page (bin_window, + GTK_WIDGET (view), + page_area, border, + page == current_page, + inverted_colors); if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) { gint width, height; @@ -4451,17 +4107,17 @@ draw_one_page (EvView *view, page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page); if (!page_surface) { - if (!view->presentation) { - draw_loading_text (view, - &real_page_area, - expose_area); - } + if (page == current_page) + show_loading_window (view); *page_ready = FALSE; return; } + if (page == current_page) + hide_loading_window (view); + ev_view_get_page_size (view, page, &width, &height); page_width = cairo_image_surface_get_width (page_surface); @@ -4549,20 +4205,19 @@ ev_view_destroy (GtkObject *object) view->model = NULL; } - if (view->document) { - g_object_unref (view->document); - view->document = NULL; - } - if (view->pixbuf_cache) { g_object_unref (view->pixbuf_cache); view->pixbuf_cache = NULL; } - if (view->goto_window) { - gtk_widget_destroy (view->goto_window); - view->goto_window = NULL; - view->goto_entry = NULL; + if (view->document) { + g_object_unref (view->document); + view->document = NULL; + } + + if (view->page_cache) { + g_object_unref (view->page_cache); + view->page_cache = NULL; } ev_view_window_children_free (view); @@ -4577,11 +4232,6 @@ ev_view_destroy (GtkObject *object) view->selection_update_id = 0; } - if (view->loading_text) { - cairo_surface_destroy (view->loading_text); - view->loading_text = NULL; - } - if (view->scroll_info.timeout_id) { g_source_remove (view->scroll_info.timeout_id); view->scroll_info.timeout_id = 0; @@ -4597,48 +4247,16 @@ ev_view_destroy (GtkObject *object) view->drag_info.release_timeout_id = 0; } - ev_view_presentation_transition_stop (view); + if (view->loading_timeout) { + g_source_remove (view->loading_timeout); + view->loading_timeout = 0; + } ev_view_set_scroll_adjustments (GTK_LAYOUT (view), NULL, NULL); GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object); } -static void -ev_view_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - 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)); - 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); - } -} - static AtkObject * ev_view_get_accessible (GtkWidget *widget) { @@ -4670,45 +4288,6 @@ ev_view_get_accessible (GtkWidget *widget) return GTK_WIDGET_CLASS (ev_view_parent_class)->get_accessible (widget); } -static void -ev_view_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EvView *view = EV_VIEW (object); - - switch (prop_id) { - case PROP_CONTINUOUS: - g_value_set_boolean (value, view->continuous); - break; - case PROP_DUAL_PAGE: - g_value_set_boolean (value, view->dual_page); - break; - case PROP_FULLSCREEN: - g_value_set_boolean (value, view->fullscreen); - break; - case PROP_PRESENTATION: - g_value_set_boolean (value, view->presentation); - break; - case PROP_SIZING_MODE: - g_value_set_enum (value, view->sizing_mode); - break; - case PROP_ZOOM: - g_value_set_double (value, view->scale); - break; - case PROP_ROTATION: - g_value_set_int (value, view->rotation); - break; - case PROP_HAS_SELECTION: - g_value_set_boolean (value, - view->selection_info.selections != NULL); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -} - static void ev_view_class_init (EvViewClass *class) { @@ -4719,8 +4298,6 @@ ev_view_class_init (EvViewClass *class) GtkBindingSet *binding_set; object_class->finalize = ev_view_finalize; - object_class->set_property = ev_view_set_property; - object_class->get_property = ev_view_get_property; widget_class->expose_event = ev_view_expose_event; widget_class->button_press_event = ev_view_button_press_event; @@ -4778,76 +4355,17 @@ ev_view_class_init (EvViewClass *class) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (EvViewClass, popup_menu), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, - G_TYPE_OBJECT); - - - g_object_class_install_property (object_class, - PROP_CONTINUOUS, - g_param_spec_boolean ("continuous", - "Continuous", - "Continuous scrolling mode", - TRUE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_DUAL_PAGE, - g_param_spec_boolean ("dual-page", - "Dual Page", - "Two pages visible at once", - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_FULLSCREEN, - g_param_spec_boolean ("fullscreen", - "Full Screen", - "Draw page in a fullscreen fashion", - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_PRESENTATION, - g_param_spec_boolean ("presentation", - "Presentation", - "Draw page in presentation mode", - TRUE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_SIZING_MODE, - g_param_spec_enum ("sizing-mode", - "Sizing Mode", - "Sizing Mode", - EV_TYPE_SIZING_MODE, - EV_SIZING_FIT_WIDTH, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_ZOOM, - g_param_spec_double ("zoom", - "Zoom factor", - "Zoom factor", - 0, - G_MAXDOUBLE, - 1.0, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_ROTATION, - g_param_spec_double ("rotation", - "Rotation", - "Rotation", - 0, - 360, - 0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_HAS_SELECTION, - g_param_spec_boolean ("has-selection", - "Has selection", - "The view has selections", - FALSE, - G_PARAM_READABLE)); + G_TYPE_POINTER); + signals[SIGNAL_SELECTION_CHANGED] = g_signal_new ("selection-changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvViewClass, selection_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); binding_set = gtk_binding_set_by_class (class); @@ -4873,7 +4391,7 @@ ev_view_class_init (EvViewClass *class) static void ev_view_init (EvView *view) { - GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE); view->start_page = -1; view->end_page = -1; @@ -4890,8 +4408,6 @@ ev_view_init (EvView *view) view->selection_mode = EV_VIEW_SELECTION_TEXT; 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; @@ -4906,16 +4422,14 @@ ev_view_init (EvView *view) static void ev_view_change_page (EvView *view, - gint new_page, - gboolean start_transition) + gint new_page) { gint x, y; view->current_page = new_page; view->pending_scroll = SCROLL_TO_PAGE_POSITION; - if (view->presentation && start_transition) - ev_view_presentation_transition_start (view); + hide_loading_window (view); gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); ev_view_handle_cursor_over_xy (view, x, y); @@ -4923,82 +4437,16 @@ ev_view_change_page (EvView *view, gtk_widget_queue_resize (GTK_WIDGET (view)); } -static void -ev_view_transition_animation_finish (EvTransitionAnimation *animation, - EvView *view) -{ - g_object_unref (view->animation); - view->animation = NULL; - ev_view_change_page (view, view->current_page, TRUE); -} - -/** - * ev_view_transition_animation_cancel: - * @animation: Animation to finish - * @view: An EvView - * - * Does almost the same as cancel, but without scheduling the transition. - */ - -static void -ev_view_transition_animation_cancel (EvTransitionAnimation *animation, - EvView *view) -{ - g_object_unref (view->animation); - view->animation = NULL; - ev_view_change_page (view, view->current_page, FALSE); -} - -static void -ev_view_transition_animation_frame (EvTransitionAnimation *animation, - gdouble progress, - EvView *view) -{ - gtk_widget_queue_draw (GTK_WIDGET (view)); -} - -static void -ev_view_presentation_animation_start (EvView *view, - int new_page) -{ - EvTransitionEffect *effect = NULL; - cairo_surface_t *surface; - - if (EV_IS_DOCUMENT_TRANSITION (view->document)) - effect = ev_document_transition_get_effect (EV_DOCUMENT_TRANSITION (view->document), - view->current_page); - if (!effect) - return; - - view->animation = ev_transition_animation_new (effect); - - surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page); - ev_transition_animation_set_origin_surface (view->animation, surface); - surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, new_page); - if (surface) - ev_transition_animation_set_dest_surface (view->animation, surface); - - g_signal_connect (view->animation, "frame", - G_CALLBACK (ev_view_transition_animation_frame), view); - g_signal_connect (view->animation, "finished", - G_CALLBACK (ev_view_transition_animation_finish), view); -} - static void job_finished_cb (EvPixbufCache *pixbuf_cache, GdkRegion *region, EvView *view) { - if (view->animation) { - cairo_surface_t *surface; - - surface = ev_pixbuf_cache_get_surface (pixbuf_cache, view->current_page); - ev_transition_animation_set_dest_surface (view->animation, surface); - } - if (region) { - gdk_window_invalidate_region (view->layout.bin_window, - region, TRUE); + GdkWindow *bin_window; + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + gdk_window_invalidate_region (bin_window, region, TRUE); } else { gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -5014,10 +4462,7 @@ ev_view_page_changed_cb (EvDocumentModel *model, return; if (view->current_page != new_page) { - if (view->presentation) - ev_view_presentation_animation_start (view, new_page); - - ev_view_change_page (view, new_page, TRUE); + ev_view_change_page (view, new_page); } else { gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -5031,21 +4476,24 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, { int dx = 0, dy = 0; gint x, y; + gint value; GList *children, *l; - if (! GTK_WIDGET_REALIZED (view)) + if (!gtk_widget_get_realized (GTK_WIDGET (view))) return; if (view->hadjustment) { - dx = view->scroll_x - (int) view->hadjustment->value; - view->scroll_x = (int) view->hadjustment->value; + value = (gint) gtk_adjustment_get_value (view->hadjustment); + dx = view->scroll_x - value; + view->scroll_x = value; } else { view->scroll_x = 0; } if (view->vadjustment) { - dy = view->scroll_y - (int) view->vadjustment->value; - view->scroll_y = (int) view->vadjustment->value; + value = (gint) gtk_adjustment_get_value (view->vadjustment); + dy = view->scroll_y - value; + view->scroll_y = value; } else { view->scroll_y = 0; } @@ -5072,11 +4520,15 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, ev_view_window_child_move (view, child, child->x + dx, child->y + dy); } - if (view->pending_resize) + if (view->pending_resize) { gtk_widget_queue_draw (GTK_WIDGET (view)); - else - gdk_window_scroll (view->layout.bin_window, dx, dy); - + } else { + GdkWindow *bin_window; + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + gdk_window_scroll (bin_window, dx, dy); + } + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); ev_view_handle_cursor_over_xy (view, x, y); @@ -5100,7 +4552,8 @@ setup_caches (EvView *view) gboolean inverted_colors; view->height_to_page_cache = ev_view_get_height_to_page_cache (view); - view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document); + view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->model, view->pixbuf_cache_size); + view->page_cache = ev_page_cache_new (view->document); inverted_colors = ev_document_model_get_inverted_colors (view->model); ev_pixbuf_cache_set_inverted_colors (view->pixbuf_cache, inverted_colors); g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view); @@ -5113,12 +4566,44 @@ clear_caches (EvView *view) g_object_unref (view->pixbuf_cache); view->pixbuf_cache = NULL; } + + if (view->page_cache) { + g_object_unref (view->page_cache); + view->page_cache = NULL; + } +} + +/** + * ev_view_set_page_cache_size: + * @view: + * @cache_size: + * + * Sets the maximum size in bytes that will be used to cache + * rendered pages. Use 0 to disable caching rendered pages. + * + * Note that this limit doesn't affect the current visible page range, + * which will always be rendered. In order to limit the total memory used + * you have to use ev_document_model_set_max_scale() too. + * + */ +void +ev_view_set_page_cache_size (EvView *view, + gsize cache_size) +{ + if (view->pixbuf_cache_size == cache_size) + return; + + view->pixbuf_cache_size = cache_size; + if (view->pixbuf_cache) + ev_pixbuf_cache_set_max_size (view->pixbuf_cache, cache_size); } void ev_view_set_loading (EvView *view, gboolean loading) { + if (view->loading && !loading) + hide_loading_window (view); view->loading = loading; gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -5150,7 +4635,9 @@ ev_view_autoscroll_cb (EvView *view) speed = pow ((((gdouble)view->scroll_info.last_y - view->scroll_info.start_y) / 100), 3); value = gtk_adjustment_get_value (view->vadjustment); - value = CLAMP (value + speed, 0, view->vadjustment->upper - view->vadjustment->page_size); + value = CLAMP (value + speed, 0, + gtk_adjustment_get_upper (view->vadjustment) - + gtk_adjustment_get_page_size (view->vadjustment)); gtk_adjustment_set_value (view->vadjustment, value); return TRUE; @@ -5203,8 +4690,6 @@ ev_view_document_changed_cb (EvDocumentModel *model, { EvDocument *document = ev_document_model_get_document (model); - view->loading = FALSE; - if (document != view->document) { gint current_page; @@ -5218,13 +4703,14 @@ ev_view_document_changed_cb (EvDocumentModel *model, view->find_result = 0; if (view->document) { + view->loading = FALSE; g_object_ref (view->document); setup_caches (view); } current_page = ev_document_model_get_page (model); if (view->current_page != current_page) { - ev_view_change_page (view, current_page, TRUE); + ev_view_change_page (view, current_page); } else { view->pending_scroll = SCROLL_TO_KEEP_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); @@ -5239,7 +4725,7 @@ ev_view_rotation_changed_cb (EvDocumentModel *model, { gint rotation = ev_document_model_get_rotation (model); - ev_view_set_rotation (view, rotation); + view->rotation = rotation; if (view->pixbuf_cache) { ev_pixbuf_cache_clear (view->pixbuf_cache); @@ -5275,8 +4761,7 @@ ev_view_sizing_mode_changed_cb (EvDocumentModel *model, { EvSizingMode mode = ev_document_model_get_sizing_mode (model); - ev_view_set_sizing_mode (view, mode); - + view->sizing_mode = mode; if (mode != EV_SIZING_FREE) gtk_widget_queue_resize (GTK_WIDGET (view)); } @@ -5292,12 +4777,7 @@ ev_view_scale_changed_cb (EvDocumentModel *model, if (ABS (view->scale - scale) < EPSILON) return; - if (view->loading_text) { - cairo_surface_destroy (view->loading_text); - view->loading_text = NULL; - } - - ev_view_set_zoom (view, scale); + view->scale = scale; view->pending_resize = TRUE; if (view->sizing_mode == EV_SIZING_FREE) @@ -5311,7 +4791,7 @@ ev_view_continuous_changed_cb (EvDocumentModel *model, { gboolean continuous = ev_document_model_get_continuous (model); - ev_view_set_continuous (view, continuous); + view->continuous = continuous; view->pending_scroll = SCROLL_TO_PAGE_POSITION; gtk_widget_queue_resize (GTK_WIDGET (view)); } @@ -5323,7 +4803,7 @@ ev_view_dual_page_changed_cb (EvDocumentModel *model, { gboolean dual_page = ev_document_model_get_dual_page (model); - ev_view_set_dual_page (view, dual_page); + view->dual_page = dual_page; view->pending_scroll = SCROLL_TO_PAGE_POSITION; /* FIXME: if we're keeping the pixbuf cache around, we should extend the * preload_cache_size to be 2 if dual_page is set. @@ -5338,7 +4818,7 @@ ev_view_fullscreen_changed_cb (EvDocumentModel *model, { gboolean fullscreen = ev_document_model_get_fullscreen (model); - ev_view_set_fullscreen (view, fullscreen); + view->fullscreen = fullscreen; gtk_widget_queue_resize (GTK_WIDGET (view)); } @@ -5362,6 +4842,16 @@ ev_view_set_model (EvView *view, g_object_unref (view->model); } view->model = g_object_ref (model); + + /* Initialize view from model */ + view->rotation = ev_document_model_get_rotation (view->model); + view->sizing_mode = ev_document_model_get_sizing_mode (view->model); + view->scale = ev_document_model_get_scale (view->model); + view->continuous = ev_document_model_get_continuous (view->model); + view->dual_page = ev_document_model_get_dual_page (view->model); + view->fullscreen = ev_document_model_get_fullscreen (view->model); + ev_view_document_changed_cb (view->model, NULL, view); + g_signal_connect (view->model, "notify::document", G_CALLBACK (ev_view_document_changed_cb), view); @@ -5412,190 +4902,6 @@ ev_view_reload (EvView *view) /*** Zoom and sizing mode ***/ -void -ev_view_set_zoom (EvView *view, - double scale) -{ - view->scale = scale; - - g_object_notify (G_OBJECT (view), "zoom"); -} - -double -ev_view_get_zoom (EvView *view) -{ - return view->scale; -} - -gboolean -ev_view_get_continuous (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - - return view->continuous; -} - -void -ev_view_set_continuous (EvView *view, - gboolean continuous) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - view->continuous = continuous; - - g_object_notify (G_OBJECT (view), "continuous"); -} - -gboolean -ev_view_get_dual_page (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - - return view->dual_page; -} - -void -ev_view_set_dual_page (EvView *view, - gboolean dual_page) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - view->dual_page = dual_page; - - g_object_notify (G_OBJECT (view), "dual-page"); -} - -void -ev_view_set_fullscreen (EvView *view, - gboolean fullscreen) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - view->fullscreen = fullscreen; - - g_object_notify (G_OBJECT (view), "fullscreen"); -} - -gboolean -ev_view_get_fullscreen (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - - return view->fullscreen; -} - -void -ev_view_set_presentation (EvView *view, - gboolean presentation) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - presentation = presentation != FALSE; - - 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_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT); - } else { - ev_document_model_set_sizing_mode (view->model, view->sizing_mode_saved); - ev_document_model_set_scale (view->model, view->scale_saved); - } - - gtk_widget_queue_resize (GTK_WIDGET (view)); - - if (presentation) - ev_view_presentation_transition_start (view); - else { - ev_view_presentation_transition_stop (view); - - if (view->animation) { - /* stop any running animation */ - ev_view_transition_animation_cancel (view->animation, view); - } - } - - if (GTK_WIDGET_REALIZED (view)) { - if (view->presentation) - gdk_window_set_background (view->layout.bin_window, - >K_WIDGET (view)->style->black); - else - gdk_window_set_background (view->layout.bin_window, - >K_WIDGET (view)->style->mid [GTK_STATE_NORMAL]); - } - - g_object_notify (G_OBJECT (view), "presentation"); -} - -gboolean -ev_view_get_presentation (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), FALSE); - - 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) { - view->trans_timeout_id = - g_timeout_add_seconds (duration, - (GSourceFunc) transition_next_page, - view); - } -} - -void -ev_view_set_sizing_mode (EvView *view, - EvSizingMode sizing_mode) -{ - view->sizing_mode = sizing_mode; - - g_object_notify (G_OBJECT (view), "sizing-mode"); -} - -EvSizingMode -ev_view_get_sizing_mode (EvView *view) -{ - g_return_val_if_fail (EV_IS_VIEW (view), EV_SIZING_FREE); - - return view->sizing_mode; -} - gboolean ev_view_can_zoom_in (EvView *view) { @@ -5615,9 +4921,6 @@ 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; scale = ev_document_model_get_scale (view->model) * ZOOM_IN_FACTOR; ev_document_model_set_scale (view->model, scale); @@ -5630,42 +4933,18 @@ 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; scale = ev_document_model_get_scale (view->model) * ZOOM_OUT_FACTOR; ev_document_model_set_scale (view->model, scale); } -void -ev_view_set_rotation (EvView *view, int rotation) -{ - view->rotation = rotation; - - g_object_notify (G_OBJECT (view), "rotation"); -} - -int -ev_view_get_rotation (EvView *view) -{ - return view->rotation; -} - static double zoom_for_size_fit_width (gdouble doc_width, gdouble doc_height, int target_width, int target_height) { - double scale; - - scale = (double)target_width / doc_width; - - if (doc_height * scale > target_height) - scale = (double)target_width / doc_width; - - return scale; + return (double)target_width / doc_width; } static double @@ -5674,14 +4953,7 @@ zoom_for_size_fit_height (gdouble doc_width, int target_width, int target_height) { - double scale; - - scale = (double)target_height / doc_height; - - if (doc_width * scale > target_width) - scale = (double)target_height / doc_height; - - return scale; + return (double)target_height / doc_height; } static double @@ -5696,28 +4968,9 @@ zoom_for_size_best_fit (gdouble doc_width, w_scale = (double)target_width / doc_width; h_scale = (double)target_height / doc_height; - if (doc_height * w_scale > target_height) - w_scale = (double)target_width / doc_width; - if (doc_width * h_scale > target_width) - h_scale = (double)target_height / doc_height; - return MIN (w_scale, h_scale); } - -static void -ev_view_zoom_for_size_presentation (EvView *view, - int width, - int height) -{ - gdouble doc_width, doc_height; - gdouble scale; - - get_doc_page_size (view, view->current_page, &doc_width, &doc_height); - scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); - ev_document_model_set_scale (view->model, scale); -} - static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, int width, @@ -5726,6 +4979,7 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, gdouble doc_width, doc_height; GtkBorder border; gdouble scale; + gint sb_size; ev_document_get_max_page_size (view->document, &doc_width, &doc_height); if (view->rotation == 90 || view->rotation == 270) { @@ -5742,13 +4996,12 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, width -= (2 * (border.left + border.right) + 3 * view->spacing); height -= (border.top + border.bottom + 2 * view->spacing - 1); - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - gint sb_size; + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); - sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); } else if (view->sizing_mode == EV_SIZING_BEST_FIT) - scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width - sb_size, height); else g_assert_not_reached (); @@ -5763,6 +5016,7 @@ ev_view_zoom_for_size_continuous (EvView *view, gdouble doc_width, doc_height; GtkBorder border; gdouble scale; + gint sb_size; ev_document_get_max_page_size (view->document, &doc_width, &doc_height); if (view->rotation == 90 || view->rotation == 270) { @@ -5778,13 +5032,12 @@ ev_view_zoom_for_size_continuous (EvView *view, width -= (border.left + border.right + 2 * view->spacing); height -= (border.top + border.bottom + 2 * view->spacing - 1); - if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { - gint sb_size; + sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); - sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height); } else if (view->sizing_mode == EV_SIZING_BEST_FIT) - scale = zoom_for_size_best_fit (doc_width, doc_height, width, height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width - sb_size, height); else g_assert_not_reached (); @@ -5877,9 +5130,7 @@ ev_view_zoom_for_size (EvView *view, if (view->document == NULL) return; - if (view->presentation) - ev_view_zoom_for_size_presentation (view, width, height); - else if (view->continuous && view->dual_page) + if (view->continuous && view->dual_page) ev_view_zoom_for_size_continuous_and_dual_page (view, width, height); else if (view->continuous) ev_view_zoom_for_size_continuous (view, width, height); @@ -6190,7 +5441,7 @@ merge_selection_region (EvView *view, g_list_free (view->selection_info.selections); view->selection_info.selections = new_list; ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, new_list); - g_object_notify (G_OBJECT (view), "has-selection"); + g_signal_emit (view, signals[SIGNAL_SELECTION_CHANGED], 0, NULL); new_list_ptr = new_list; old_list_ptr = old_list; @@ -6240,7 +5491,7 @@ merge_selection_region (EvView *view, view->scale, &tmp_region); - if (tmp_region) { + if (tmp_region && !gdk_region_empty (tmp_region)) { new_sel->covered_region = gdk_region_copy (tmp_region); } } @@ -6276,8 +5527,11 @@ merge_selection_region (EvView *view, /* Redraw the damaged region! */ if (region) { + GdkWindow *bin_window; GdkRectangle page_area; - GtkBorder border; + GtkBorder border; + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); /* I don't know why but the region is smaller * than expected. This hack fixes it, I guess @@ -6289,7 +5543,7 @@ merge_selection_region (EvView *view, gdk_region_offset (region, page_area.x + border.left - view->scroll_x, page_area.y + border.top - view->scroll_y); - gdk_window_invalidate_region (view->layout.bin_window, region, TRUE); + gdk_window_invalidate_region (bin_window, region, TRUE); gdk_region_destroy (region); } } @@ -6327,13 +5581,16 @@ selection_free (EvViewSelection *selection) static void clear_selection (EvView *view) { - g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL); - g_list_free (view->selection_info.selections); - view->selection_info.selections = NULL; + if (view->selection_info.selections) { + g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL); + g_list_free (view->selection_info.selections); + view->selection_info.selections = NULL; + + g_signal_emit (view, signals[SIGNAL_SELECTION_CHANGED], 0, 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"); } void @@ -6381,10 +5638,8 @@ get_selected_text (EvView *view) GString *text; GList *l; gchar *normalized_text; - EvRenderContext *rc; text = g_string_new (NULL); - rc = ev_render_context_new (NULL, view->rotation, view->scale); ev_document_doc_mutex_lock (); @@ -6394,19 +5649,14 @@ get_selected_text (EvView *view) gchar *tmp; page = ev_document_get_page (view->document, selection->page); - ev_render_context_set_page (rc, page); - g_object_unref (page); - tmp = ev_selection_get_selected_text (EV_SELECTION (view->document), - rc, selection->style, + page, selection->style, &(selection->rect)); - + g_object_unref (page); g_string_append (text, tmp); g_free (tmp); } - g_object_unref (rc); - ev_document_doc_mutex_unlock (); normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC); @@ -6526,63 +5776,26 @@ ev_view_copy_link_address (EvView *view, } /*** Cursor operations ***/ - -static GdkCursor * -ev_view_create_invisible_cursor(void) -{ - GdkBitmap *empty; - GdkColor black = { 0, 0, 0, 0 }; - static char bits[] = { 0x00 }; - - empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1); - - return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0); -} - static void ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) { GdkCursor *cursor = NULL; - GdkDisplay *display; GtkWidget *widget; + GdkWindow *bin_window; if (view->cursor == new_cursor) { return; } - widget = gtk_widget_get_toplevel (GTK_WIDGET (view)); - display = gtk_widget_get_display (widget); view->cursor = new_cursor; - switch (new_cursor) { - case EV_VIEW_CURSOR_NORMAL: - gdk_window_set_cursor (view->layout.bin_window, NULL); - break; - case EV_VIEW_CURSOR_IBEAM: - cursor = gdk_cursor_new_for_display (display, GDK_XTERM); - break; - case EV_VIEW_CURSOR_LINK: - cursor = gdk_cursor_new_for_display (display, GDK_HAND2); - break; - case EV_VIEW_CURSOR_WAIT: - cursor = gdk_cursor_new_for_display (display, GDK_WATCH); - break; - case EV_VIEW_CURSOR_HIDDEN: - cursor = ev_view_create_invisible_cursor (); - break; - case EV_VIEW_CURSOR_DRAG: - cursor = gdk_cursor_new_for_display (display, GDK_FLEUR); - break; - case EV_VIEW_CURSOR_AUTOSCROLL: - cursor = gdk_cursor_new_for_display (display, GDK_DOUBLE_ARROW); - break; - } - - if (cursor) { - gdk_window_set_cursor (view->layout.bin_window, cursor); + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + widget = gtk_widget_get_toplevel (GTK_WIDGET (view)); + cursor = ev_view_cursor_new (gtk_widget_get_display (widget), new_cursor); + gdk_window_set_cursor (bin_window, cursor); + gdk_flush (); + if (cursor) gdk_cursor_unref (cursor); - gdk_flush(); - } } void @@ -6597,19 +5810,6 @@ 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) { @@ -6620,24 +5820,10 @@ ev_view_next_page (EvView *view) if (!view->document) 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; - } - - if (view->animation) { - ev_view_transition_animation_cancel (view->animation, view); - } - - ev_view_presentation_transition_stop (view); - ev_view_reset_presentation_state (view); - page = ev_document_model_get_page (view->model); n_pages = ev_document_get_n_pages (view->document); - if (view->dual_page && !view->presentation) + if (view->dual_page) page = page + 2; else page = page + 1; @@ -6645,10 +5831,6 @@ ev_view_next_page (EvView *view) if (page < n_pages) { ev_document_model_set_page (view->model, page); return TRUE; - } else if (view->presentation && page == n_pages) { - view->presentation_state = EV_PRESENTATION_END; - gtk_widget_queue_draw (GTK_WIDGET (view)); - return TRUE; } else if (view->dual_page && page == n_pages) { ev_document_model_set_page (view->model, page - 1); return TRUE; @@ -6667,28 +5849,9 @@ ev_view_previous_page (EvView *view) if (!view->document) 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; - } - - if (view->animation) { - ev_view_transition_animation_cancel (view->animation, view); - } - - ev_view_reset_presentation_state (view); - page = ev_document_model_get_page (view->model); - if (view->dual_page && !view->presentation) + if (view->dual_page) page = page - 2; else page = page - 1; @@ -6696,7 +5859,7 @@ ev_view_previous_page (EvView *view) if (page >= 0) { ev_document_model_set_page (view->model, page); return TRUE; - } else if (ev_view_get_dual_page (view) && page == -1) { + } else if (view->dual_page && page == -1) { ev_document_model_set_page (view->model, 0); return TRUE; } else {