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=760cf04ffdcf67ca6f431d3b7c13872755db72eb;hpb=766adb9bff7a5c8ada0d18cafd3643e647fb6f23;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 760cf04f..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" @@ -38,6 +38,7 @@ #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" @@ -176,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, @@ -190,12 +186,12 @@ 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, @@ -457,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; @@ -487,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)); } } } @@ -547,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; } @@ -567,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. @@ -591,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; } @@ -628,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++) { @@ -670,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); } } @@ -692,6 +709,9 @@ 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; @@ -710,8 +730,6 @@ view_update_range_and_current_page (EvView *view) 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)) @@ -788,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; @@ -798,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_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); @@ -845,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; } @@ -861,6 +881,9 @@ 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; @@ -884,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) @@ -895,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); } @@ -950,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); } @@ -1076,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); @@ -1094,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); @@ -1142,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; @@ -1350,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, @@ -1491,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); @@ -1518,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); @@ -1527,8 +1553,8 @@ 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); @@ -1546,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); @@ -1556,8 +1585,8 @@ 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); @@ -1573,13 +1602,16 @@ 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); @@ -2269,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 */ @@ -2398,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); } @@ -2828,21 +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; } + /* 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 @@ -2854,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); @@ -2941,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 | @@ -2958,7 +3020,8 @@ ev_view_realize (GtkWidget *widget) GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK)); - 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); } @@ -3044,25 +3107,23 @@ static gboolean ev_view_expose_event (GtkWidget *widget, GdkEventExpose *event) { - EvView *view = EV_VIEW (widget); - cairo_t *cr; - gint i; + EvView *view = EV_VIEW (widget); + GdkWindow *bin_window; + cairo_t *cr; + gint i; if (view->loading) { - GdkRectangle area = {0}; - - area.width = widget->allocation.width; - area.height = widget->allocation.height; - - draw_loading_text (view, - &area, - &(event->area)); + 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; @@ -3096,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; } @@ -3253,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); } @@ -3413,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; } @@ -3434,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; } @@ -3493,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; @@ -3532,13 +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; @@ -3647,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; @@ -3654,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; } @@ -3765,7 +3842,7 @@ ev_view_key_press_event (GtkWidget *widget, if (!view->document) return FALSE; - if (!GTK_WIDGET_HAS_FOCUS (widget)) { + if (!gtk_widget_has_focus (widget)) { /* Forward key events to current focused window child */ if (view->window_child_focus) { GdkEventKey *new_event; @@ -3773,7 +3850,9 @@ ev_view_key_press_event (GtkWidget *widget, 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); + 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); @@ -3842,48 +3921,37 @@ ev_view_style_set (GtkWidget *widget, /*** Drawing ***/ -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; -} - static void -draw_rubberband (GtkWidget *widget, GdkWindow *window, - const GdkRectangle *rect, guchar alpha) +draw_rubberband (EvView *view, + GdkWindow *window, + const GdkRectangle *rect, + gdouble alpha) { - GdkGC *gc; - GdkPixbuf *pixbuf; + GtkStyle *style; GdkColor *fill_color_gdk; - guint fill_color; + gdouble r, g, b; + cairo_t *cr; - 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; + 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.; - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, - rect->width, rect->height); - gdk_pixbuf_fill (pixbuf, fill_color); + cr = gdk_cairo_create (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); + 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); - g_object_unref (pixbuf); + cairo_set_line_width (cr, 0.5); + cairo_set_source_rgb (cr, r, g, b); + cairo_stroke (cr); - 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); + cairo_destroy (cr); gdk_color_free (fill_color_gdk); } @@ -3892,88 +3960,103 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, static void highlight_find_results (EvView *view, int page) { - gint i, n_results = 0; + gint i, n_results = 0; + GdkWindow *bin_window; + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); n_results = ev_view_find_get_n_results (view, page); for (i = 0; i < n_results; i++) { EvRectangle *rectangle; GdkRectangle view_rectangle; - guchar alpha; + gdouble alpha; if (i == view->find_result && page == view->current_page) { - alpha = 0x90; + alpha = 0.6; } else { - alpha = 0x20; + alpha = 0.3; } 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); + draw_rubberband (view, bin_window, &view_rectangle, alpha); } } static void -draw_loading_text (EvView *view, - GdkRectangle *page_area, - GdkRectangle *expose_area) +ev_view_loading_window_move (EvView *view) { - cairo_t *cr; - gint width, height; + GtkWidget *widget = GTK_WIDGET (view); + EvLoadingWindow *window = EV_LOADING_WINDOW (view->loading_window); + gint root_x, root_y; + gint window_width; + GtkAllocation allocation; - if (!view->loading_text) { - const gchar *loading_text = _("Loading…"); - PangoLayout *layout; - PangoFontDescription *font_desc; - PangoRectangle logical_rect; - gint target_width; - gdouble real_scale; + 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); - ev_document_fc_mutex_lock (); + root_x += allocation.width - window_width - 10; + root_y += 10; - 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); + ev_loading_window_move (window, root_x, root_y); +} + +static gboolean +show_loading_window_cb (EvView *view) +{ + if (!view->loading_window) { + GtkWindow *parent; + GdkScreen *screen; + + parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); + view->loading_window = ev_loading_window_new (parent); + + /* 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); + } + + ev_view_loading_window_move (view); + + gtk_widget_show (view->loading_window); + + view->loading_timeout = 0; + + return FALSE; +} + +static void +show_loading_window (EvView *view) +{ + if (view->loading_window && gtk_widget_get_visible (view->loading_window)) { + ev_view_loading_window_move (view); + return; + } + + 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 +hide_loading_window (EvView *view) +{ + if (view->loading_timeout) { + g_source_remove (view->loading_timeout); + view->loading_timeout = 0; + } + + if (view->loading_window && gtk_widget_get_visible (view->loading_window)) { + gtk_widget_hide (view->loading_window); + } } static void @@ -3985,9 +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); @@ -4003,11 +4088,14 @@ draw_one_page (EvView *view, real_page_area.height -= (border->top + border->bottom); *page_ready = TRUE; + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); current_page = ev_document_model_get_page (view->model); - ev_document_misc_paint_one_page (view->layout.bin_window, + 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); + page == current_page, + inverted_colors); if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) { gint width, height; @@ -4019,15 +4107,17 @@ draw_one_page (EvView *view, page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page); if (!page_surface) { - 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); @@ -4142,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; @@ -4162,6 +4247,11 @@ ev_view_destroy (GtkObject *object) view->drag_info.release_timeout_id = 0; } + 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); @@ -4265,9 +4355,9 @@ 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_TYPE_POINTER); signals[SIGNAL_SELECTION_CHANGED] = g_signal_new ("selection-changed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, @@ -4301,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; @@ -4339,6 +4429,8 @@ ev_view_change_page (EvView *view, view->current_page = new_page; view->pending_scroll = SCROLL_TO_PAGE_POSITION; + hide_loading_window (view); + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); ev_view_handle_cursor_over_xy (view, x, y); @@ -4351,8 +4443,10 @@ job_finished_cb (EvPixbufCache *pixbuf_cache, EvView *view) { 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)); } @@ -4382,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; } @@ -4423,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); @@ -4451,7 +4552,7 @@ 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); @@ -4472,10 +4573,37 @@ clear_caches (EvView *view) } } +/** + * 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)); } @@ -4507,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; @@ -4560,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; @@ -4575,6 +4703,7 @@ 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); } @@ -4648,11 +4777,6 @@ 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; - } - view->scale = scale; view->pending_resize = TRUE; @@ -4855,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) { @@ -4871,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 (); @@ -4892,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) { @@ -4907,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 (); @@ -5403,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 @@ -5416,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); } } @@ -5511,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 (); @@ -5524,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); @@ -5661,6 +5781,7 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) { GdkCursor *cursor = NULL; GtkWidget *widget; + GdkWindow *bin_window; if (view->cursor == new_cursor) { return; @@ -5668,9 +5789,10 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) view->cursor = new_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 (view->layout.bin_window, cursor); + gdk_window_set_cursor (bin_window, cursor); gdk_flush (); if (cursor) gdk_cursor_unref (cursor);