X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view.c;h=09539990f65a072191bc2455a5b780de1dddb63a;hb=646b17b09453da438218e6b86a2b8b830e5b73c0;hp=8e494adedc1a527007b1860ddb634a725c1dc06a;hpb=938636d838432d71cd8ed1c2aa1604faa6f8d083;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 8e494ade..09539990 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -149,6 +149,7 @@ struct _EvView { int find_result; int spacing; + EvOrientation orientation; double scale; gboolean continuous; @@ -258,6 +259,8 @@ static gboolean ev_view_motion_notify_event (GtkWidget GdkEventMotion *event); static gboolean ev_view_button_release_event (GtkWidget *widget, GdkEventButton *event); +static gboolean ev_view_leave_notify_event (GtkWidget *widget, + GdkEventCrossing *event); /*** Drawing ***/ static guint32 ev_gdk_color_to_rgb (const GdkColor *color); @@ -529,6 +532,7 @@ view_update_range_and_current_page (EvView *view) ev_pixbuf_cache_set_page_range (view->pixbuf_cache, view->start_page, view->end_page, + view->orientation, view->scale, view->selection_info.selections); } @@ -703,6 +707,8 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) GtkAdjustment *adjustment; int value; + view->pending_scroll = SCROLL_TO_KEEP_POSITION; + adjustment = view->vadjustment; if (rect->y < adjustment->value) { @@ -743,25 +749,25 @@ compute_border (EvView *view, int width, int height, GtkBorder *border) } } -static void get_page_y_offset (EvView *view, - int page, - double zoom, - int *y_offset) +static void +get_page_y_offset (EvView *view, int page, double zoom, int *y_offset) { int max_width, offset; GtkBorder border; g_return_if_fail (y_offset != NULL); - ev_page_cache_get_max_width (view->page_cache, zoom, &max_width); + ev_page_cache_get_max_width (view->page_cache, view->orientation, zoom, &max_width); compute_border (view, max_width, max_width, &border); if (view->dual_page) { - ev_page_cache_get_height_to_page (view->page_cache, page, zoom, NULL, &offset); + ev_page_cache_get_height_to_page (view->page_cache, page, + view->orientation, zoom, NULL, &offset); offset += (page / 2 + 1) * view->spacing + (page / 2) * (border.top + border.bottom); } else { - ev_page_cache_get_height_to_page (view->page_cache, page, zoom, &offset, NULL); + ev_page_cache_get_height_to_page (view->page_cache, page, + view->orientation, zoom, &offset, NULL); offset += (page + 1) * view->spacing + page * (border.top + border.bottom); } @@ -782,6 +788,7 @@ get_page_extents (EvView *view, /* Get the size of the page */ ev_page_cache_get_size (view->page_cache, page, + view->orientation, view->scale, &width, &height); compute_border (view, width, height, border); @@ -795,7 +802,8 @@ get_page_extents (EvView *view, gint max_width; gint x, y; - ev_page_cache_get_max_width (view->page_cache, view->scale, &max_width); + ev_page_cache_get_max_width (view->page_cache, view->scale, + view->orientation, &max_width); max_width = max_width + border->left + border->right; /* Get the location of the bounding box */ if (view->dual_page) { @@ -827,6 +835,7 @@ get_page_extents (EvView *view, if (other_page < ev_page_cache_get_n_pages (view->page_cache)) { ev_page_cache_get_size (view->page_cache, other_page, + view->orientation, view->scale, &width_2, &height_2); if (width_2 > width) @@ -1058,7 +1067,8 @@ ev_view_size_request_continuous_dual_page (EvView *view, gint n_pages; GtkBorder border; - ev_page_cache_get_max_width (view->page_cache, view->scale, &max_width); + ev_page_cache_get_max_width (view->page_cache, view->orientation, + view->scale, &max_width); compute_border (view, max_width, max_width, &border); n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1; @@ -1085,7 +1095,8 @@ ev_view_size_request_continuous (EvView *view, GtkBorder border; - ev_page_cache_get_max_width (view->page_cache, view->scale, &max_width); + ev_page_cache_get_max_width (view->page_cache, view->orientation, + view->scale, &max_width); n_pages = ev_page_cache_get_n_pages (view->page_cache); compute_border (view, max_width, max_width, &border); @@ -1112,12 +1123,14 @@ ev_view_size_request_dual_page (EvView *view, /* Find the largest of the two. */ ev_page_cache_get_size (view->page_cache, view->current_page, + view->orientation, view->scale, &width, &height); if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) { gint width_2, height_2; ev_page_cache_get_size (view->page_cache, view->current_page + 1, + view->orientation, view->scale, &width_2, &height_2); if (width_2 > width) { @@ -1149,6 +1162,7 @@ ev_view_size_request_single_page (EvView *view, ev_page_cache_get_size (view->page_cache, view->current_page, + view->orientation, view->scale, &width, &height); compute_border (view, width, height, &border); @@ -1488,6 +1502,20 @@ ev_view_button_release_event (GtkWidget *widget, return FALSE; } +static gboolean +ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) +{ + EvView *view = EV_VIEW (widget); + + ev_view_set_status (view, NULL); + + if (view->cursor == EV_VIEW_CURSOR_LINK || + view->cursor == EV_VIEW_CURSOR_IBEAM) + ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); + + return FALSE; +} + /*** Drawing ***/ static guint32 @@ -1587,7 +1615,8 @@ draw_one_page (EvView *view, selection = find_selection_for_page (view, page); ev_page_cache_get_size (view->page_cache, - page, view->scale, + page, view->orientation, + view->scale, &width, &height); /* Render the document itself */ real_page_area = *page_area; @@ -1794,6 +1823,7 @@ ev_view_class_init (EvViewClass *class) widget_class->realize = ev_view_realize; widget_class->unrealize = ev_view_unrealize; widget_class->scroll_event = ev_view_scroll_event; + widget_class->leave_notify_event = ev_view_leave_notify_event; gtk_object_class->destroy = ev_view_destroy; class->set_scroll_adjustments = ev_view_set_scroll_adjustments; @@ -2022,8 +2052,9 @@ clear_caches (EvView *view) view->pixbuf_cache = NULL; } - if (view->document) { - ev_page_cache_clear (view->document); + if (view->page_cache) { + g_object_unref (view->page_cache); + view->page_cache = NULL; } } @@ -2271,10 +2302,7 @@ static void ev_view_set_orientation (EvView *view, EvOrientation orientation) { - ev_document_set_orientation (view->document, orientation); - - clear_caches (view); - setup_caches (view); + view->orientation = orientation; gtk_widget_queue_resize (GTK_WIDGET (view)); } @@ -2282,37 +2310,37 @@ ev_view_set_orientation (EvView *view, void ev_view_rotate_right (EvView *view) { - EvOrientation orientation, new_orientation; + EvOrientation orientation; - orientation = ev_document_get_orientation (view->document); - if (orientation == EV_ORIENTATION_PORTRAIT) { - new_orientation = EV_ORIENTATION_LANDSCAPE; - } else if (orientation == EV_ORIENTATION_LANDSCAPE) { - new_orientation = EV_ORIENTATION_UPSIDEDOWN; - } else if (orientation == EV_ORIENTATION_UPSIDEDOWN) { - new_orientation = EV_ORIENTATION_SEASCAPE; + if (view->orientation == EV_ORIENTATION_PORTRAIT) { + orientation = EV_ORIENTATION_LANDSCAPE; + } else if (view->orientation == EV_ORIENTATION_LANDSCAPE) { + orientation = EV_ORIENTATION_UPSIDEDOWN; + } else if (view->orientation == EV_ORIENTATION_UPSIDEDOWN) { + orientation = EV_ORIENTATION_SEASCAPE; } else { - new_orientation = EV_ORIENTATION_PORTRAIT; + orientation = EV_ORIENTATION_PORTRAIT; } - ev_view_set_orientation (view, new_orientation); + + ev_view_set_orientation (view, orientation); } void ev_view_rotate_left (EvView *view) { - EvOrientation orientation, new_orientation; + EvOrientation orientation; - orientation = ev_document_get_orientation (view->document); - if (orientation == EV_ORIENTATION_PORTRAIT) { - new_orientation = EV_ORIENTATION_SEASCAPE; - } else if (orientation == EV_ORIENTATION_SEASCAPE) { - new_orientation = EV_ORIENTATION_UPSIDEDOWN; - } else if (orientation == EV_ORIENTATION_UPSIDEDOWN) { - new_orientation = EV_ORIENTATION_LANDSCAPE; + if (view->orientation == EV_ORIENTATION_PORTRAIT) { + orientation = EV_ORIENTATION_SEASCAPE; + } else if (view->orientation == EV_ORIENTATION_SEASCAPE) { + orientation = EV_ORIENTATION_UPSIDEDOWN; + } else if (view->orientation == EV_ORIENTATION_UPSIDEDOWN) { + orientation = EV_ORIENTATION_LANDSCAPE; } else { - new_orientation = EV_ORIENTATION_PORTRAIT; + orientation = EV_ORIENTATION_PORTRAIT; } - ev_view_set_orientation (view, new_orientation); + + ev_view_set_orientation (view, orientation); } static double @@ -2365,6 +2393,7 @@ ev_view_zoom_for_size_presentation (EvView *view, ev_page_cache_get_size (view->page_cache, view->current_page, + view->orientation, 1.0, &doc_width, &doc_height); @@ -2384,9 +2413,11 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, gdouble scale; ev_page_cache_get_max_width (view->page_cache, + view->orientation, 1.0, &doc_width); ev_page_cache_get_max_height (view->page_cache, + view->orientation, 1.0, &doc_height); compute_border (view, doc_width, doc_height, &border); @@ -2420,9 +2451,11 @@ ev_view_zoom_for_size_continuous (EvView *view, gdouble scale; ev_page_cache_get_max_width (view->page_cache, + view->orientation, 1.0, &doc_width); ev_page_cache_get_max_height (view->page_cache, + view->orientation, 1.0, &doc_height); compute_border (view, doc_width, doc_height, &border); @@ -2460,6 +2493,7 @@ ev_view_zoom_for_size_dual_page (EvView *view, /* Find the largest of the two. */ ev_page_cache_get_size (view->page_cache, view->current_page, + view->orientation, 1.0, &doc_width, &doc_height); @@ -2467,6 +2501,7 @@ ev_view_zoom_for_size_dual_page (EvView *view, gint width_2, height_2; ev_page_cache_get_size (view->page_cache, other_page, + view->orientation, 1.0, &width_2, &height_2); if (width_2 > doc_width) @@ -2503,6 +2538,7 @@ ev_view_zoom_for_size_single_page (EvView *view, ev_page_cache_get_size (view->page_cache, view->current_page, + view->orientation, 1.0, &doc_width, &doc_height); @@ -2847,6 +2883,7 @@ compute_new_selection_text (EvView *view, GdkPoint *point; ev_page_cache_get_size (view->page_cache, i, + view->orientation, 1.0, &width, &height); selection = g_new0 (EvViewSelection, 1); @@ -2944,6 +2981,7 @@ ev_view_select_all (EvView *view) EvViewSelection *selection; ev_page_cache_get_size (view->page_cache, + view->orientation, i, 1.0, &width, &height); selection = g_new0 (EvViewSelection, 1);