X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=2469dcadf405a0ad0e2d46937c413d5e4b228ad8;hb=2df8e54f39de7e26c981bbc5cae892230c65f3bd;hp=07a71ead20aca43ec66f1d267df493ab3d398b30;hpb=143fa3ca281c0e28f72532f12581992746224857;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 07a71ead..2469dcad 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -46,7 +46,7 @@ enum { PROP_FIND_STATUS, PROP_CONTINUOUS, PROP_DUAL_PAGE, - PROP_FULL_SCREEN, + PROP_FULLSCREEN, PROP_PRESENTATION, PROP_SIZING_MODE, }; @@ -121,11 +121,10 @@ struct _EvView { double scale; GtkBorder border; - gboolean show_border; gboolean continuous; gboolean dual_page; - gboolean full_screen; + gboolean fullscreen; gboolean presentation; EvSizingMode sizing_mode; }; @@ -151,6 +150,10 @@ static void get_bounding_box_size (EvView *view, int *max_height); static void view_update_range_and_current_page (EvView *view); +static void page_changed_cb (EvPageCache *page_cache, + int new_page, + EvView *view); + G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET) @@ -224,13 +227,13 @@ view_set_adjustment_values (EvView *view, static void view_update_range_and_current_page (EvView *view) { - /* Presentation trumps all other modes */ if (view->presentation) { view->start_page = view->current_page; view->end_page = view->current_page; } else if (view->continuous) { GdkRectangle current_area, unused, page_area; + gint current_page; gboolean found = FALSE; int i; @@ -259,6 +262,7 @@ view_update_range_and_current_page (EvView *view) if (! found) { view->start_page = i; found = TRUE; + } view->end_page = i; } else if (found) { @@ -275,6 +279,14 @@ view_update_range_and_current_page (EvView *view) page_area.y += page_area.height + view->spacing; } } + + current_page = ev_page_cache_get_current_page (view->page_cache); + + if (current_page < view->start_page || current_page > view->end_page) { + g_signal_handlers_block_by_func (view->page_cache, page_changed_cb, view); + ev_page_cache_set_current_page (view->page_cache, view->start_page); + g_signal_handlers_unblock_by_func (view->page_cache, page_changed_cb, view); + } } else { if (view->dual_page) { if (view->current_page % 2 == 0) { @@ -294,7 +306,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->scale); + view->scale); } /*** Virtual function implementations ***/ @@ -381,13 +393,13 @@ doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_r static void compute_border (EvView *view, int width, int height, GtkBorder *border) { - if (view->show_border) { - ev_document_misc_get_page_border_size (width, height, border); - } else { + 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); } } @@ -629,7 +641,10 @@ ev_view_realize (GtkWidget *widget) gdk_window_show (view->bin_window); widget->style = gtk_style_attach (widget->style, view->bin_window); - gdk_window_set_background (view->bin_window, &widget->style->mid[widget->state]); + if (view->presentation) + gdk_window_set_background (view->bin_window, &widget->style->black); + else + gdk_window_set_background (view->bin_window, &widget->style->mid [GTK_STATE_NORMAL]); if (view->document) { /* We can't get page size without a target, so we have to @@ -653,6 +668,37 @@ ev_view_unrealize (GtkWidget *widget) GTK_WIDGET_CLASS (ev_view_parent_class)->unrealize (widget); } +static gboolean +ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) +{ + EvView *view = EV_VIEW (widget); + + if ((event->state & GDK_CONTROL_MASK) != 0) { + + ev_view_set_sizing_mode (view, EV_SIZING_FREE); + + if ((event->direction == GDK_SCROLL_UP || + event->direction == GDK_SCROLL_LEFT) && + ev_view_can_zoom_in (view)) { + ev_view_zoom_in (view); + } else if (ev_view_can_zoom_out (view)) { + ev_view_zoom_out (view); + } + + return TRUE; + } + + if ((event->state & GDK_SHIFT_MASK) != 0) { + if (event->direction == GDK_SCROLL_UP) + event->direction = GDK_SCROLL_LEFT; + if (event->direction == GDK_SCROLL_DOWN) + event->direction = GDK_SCROLL_RIGHT; + } + + return FALSE; +} + + #if 0 static guint32 ev_gdk_color_to_rgb (const GdkColor *color) @@ -862,10 +908,9 @@ draw_one_page (EvView *view, page, view->scale, &width, &height); - if (view->show_border) - ev_document_misc_paint_one_page (view->bin_window, - GTK_WIDGET (view), - page_area, border); + ev_document_misc_paint_one_page (view->bin_window, + GTK_WIDGET (view), + page_area, border); /* Render the document itself */ real_page_area = *page_area; @@ -888,7 +933,6 @@ draw_one_page (EvView *view, scaled_image = gdk_pixbuf_scale_simple (current_pixbuf, width, height, GDK_INTERP_NEAREST); - if (scaled_image) { gdk_draw_pixbuf (view->bin_window, GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL], @@ -1001,16 +1045,6 @@ ev_view_copy (EvView *ev_view) g_free (text); } -void -ev_view_set_show_border (EvView *view, gboolean show_border) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - view->show_border = show_border; - - gtk_widget_queue_resize (GTK_WIDGET (view)); -} - static void ev_view_primary_get_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -1200,24 +1234,34 @@ find_page_at_location (EvView *view, gint *x_offset, gint *y_offset) { - gint width, height; + int i; - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->scale, - &width, &height); + if (view->document == NULL) + return; - x -= (view->border.left + view->spacing); - y -= (view->border.top + view->spacing); + g_assert (page); + g_assert (x_offset); + g_assert (y_offset); - if ((x < 0) || (y < 0) || - (x >= width) || (y >= height)) { - *page = -1; - return; + for (i = view->start_page; i <= view->end_page; i++) { + GdkRectangle page_area; + GtkBorder border; + + if (! get_page_extents (view, i, &page_area, &border)) + continue; + + if ((x >= page_area.x + border.left) && + (x < page_area.x + page_area.width - border.right) && + (y >= page_area.y + border.top) && + (y < page_area.y + page_area.height - border.bottom)) { + *page = i; + *x_offset = x - (page_area.x + border.left); + *y_offset = y - (page_area.y + border.top); + return; + } } - *page = view->current_page; - *x_offset = (gint) x; - *y_offset = (gint) y; + + *page = -1; } static EvLink * @@ -1225,17 +1269,21 @@ get_link_at_location (EvView *view, gdouble x, gdouble y) { - gint page; - gint x_offset, y_offset; + gint page = -1; + gint x_offset = 0, y_offset = 0; GList *link_mapping; find_page_at_location (view, x, y, &page, &x_offset, &y_offset); + if (page == -1) return NULL; link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); - return ev_link_mapping_find (link_mapping, x_offset /view->scale, y_offset /view->scale); + if (link_mapping) + return ev_link_mapping_find (link_mapping, x_offset / view->scale, y_offset / view->scale); + else + return NULL; } @@ -1520,8 +1568,8 @@ ev_view_set_property (GObject *object, case PROP_DUAL_PAGE: ev_view_set_dual_page (view, g_value_get_boolean (value)); break; - case PROP_FULL_SCREEN: - ev_view_set_full_screen (view, g_value_get_boolean (value)); + 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)); @@ -1556,8 +1604,8 @@ ev_view_get_property (GObject *object, case PROP_DUAL_PAGE: g_value_set_boolean (value, view->dual_page); break; - case PROP_FULL_SCREEN: - g_value_set_boolean (value, view->full_screen); + case PROP_FULLSCREEN: + g_value_set_boolean (value, view->fullscreen); break; case PROP_PRESENTATION: g_value_set_boolean (value, view->presentation); @@ -1590,6 +1638,7 @@ ev_view_class_init (EvViewClass *class) widget_class->size_allocate = ev_view_size_allocate; widget_class->realize = ev_view_realize; widget_class->unrealize = ev_view_unrealize; + widget_class->scroll_event = ev_view_scroll_event; gtk_object_class->destroy = ev_view_destroy; class->set_scroll_adjustments = ev_view_set_scroll_adjustments; @@ -1647,10 +1696,10 @@ ev_view_class_init (EvViewClass *class) FALSE, G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_FULL_SCREEN, - g_param_spec_boolean ("full-screen", + PROP_FULLSCREEN, + g_param_spec_boolean ("fullscreen", "Full Screen", - "Draw page in a full-screen fashion", + "Draw page in a fullscreen fashion", FALSE, G_PARAM_READWRITE)); g_object_class_install_property (object_class, @@ -1684,35 +1733,21 @@ ev_view_class_init (EvViewClass *class) add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE); } -void -ev_view_set_spacing (EvView *view, - int spacing) -{ - g_return_if_fail (EV_IS_VIEW (view)); - - view->spacing = spacing; - - if (view->document) { - gtk_widget_queue_resize (GTK_WIDGET (view)); - } -} - static void ev_view_init (EvView *view) { GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); - view->spacing = 0; + view->spacing = 10; view->scale = 1.0; view->current_page = 0; view->pressed_button = -1; view->cursor = EV_VIEW_CURSOR_NORMAL; - view->show_border = TRUE; view->continuous = TRUE; view->dual_page = FALSE; view->presentation = FALSE; - view->full_screen = FALSE; + view->fullscreen = FALSE; view->sizing_mode = EV_SIZING_FIT_WIDTH; } @@ -2029,19 +2064,27 @@ ev_view_set_dual_page (EvView *view, } void -ev_view_set_full_screen (EvView *view, - gboolean full_screen) +ev_view_set_fullscreen (EvView *view, + gboolean fullscreen) { g_return_if_fail (EV_IS_VIEW (view)); - full_screen = full_screen != FALSE; + fullscreen = fullscreen != FALSE; - if (view->full_screen != full_screen) { - view->full_screen = full_screen; + if (view->fullscreen != fullscreen) { + view->fullscreen = fullscreen; gtk_widget_queue_resize (GTK_WIDGET (view)); } - g_object_notify (G_OBJECT (view), "full-screen"); + 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 @@ -2052,25 +2095,44 @@ ev_view_set_presentation (EvView *view, presentation = presentation != FALSE; - if (view->presentation != presentation) { - view->presentation = presentation; - gtk_widget_queue_resize (GTK_WIDGET (view)); + if (view->presentation == presentation) + return; + + view->presentation = presentation; + gtk_widget_queue_resize (GTK_WIDGET (view)); + if (GTK_WIDGET_REALIZED (view)) { + if (view->presentation) + gdk_window_set_background (view->bin_window, + >K_WIDGET (view)->style->black); + else + gdk_window_set_background (view->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; +} + void ev_view_set_sizing_mode (EvView *view, EvSizingMode sizing_mode) { g_return_if_fail (EV_IS_VIEW (view)); - if (view->sizing_mode != sizing_mode) { - view->sizing_mode = sizing_mode; - gtk_widget_queue_resize (GTK_WIDGET (view)); - } + if (view->sizing_mode == sizing_mode) + return; + view->sizing_mode = sizing_mode; + gtk_widget_queue_resize (GTK_WIDGET (view)); + g_object_notify (G_OBJECT (view), "sizing-mode"); } @@ -2144,6 +2206,24 @@ zoom_for_size_best_fit (int doc_width, return MIN (w_scale, h_scale); } + +static void +ev_view_zoom_for_size_presentation (EvView *view, + int width, + int height) +{ + int doc_width, doc_height; + gdouble scale; + + ev_page_cache_get_size (view->page_cache, + view->current_page, + 1.0, + &doc_width, + &doc_height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, 0, 0); + ev_view_zoom (view, scale, FALSE); +} + static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, int width, @@ -2164,10 +2244,10 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, compute_border (view, doc_width, doc_height, &border); doc_width = doc_width * 2; - width -= ((border.left + border.right)* 2 + 3 * view->spacing); - height -= (border.top + border.bottom + 2 * view->spacing); + width -= (2 * (border.left + border.right) + 3 * view->spacing); + height -= (border.top + border.bottom + 2 * view->spacing - 1); - /* FIXME: We really need to calculat the overall height here, not the + /* FIXME: We really need to calculate the overall height here, not the * page height. We assume there's always a vertical scrollbar for * now. We need to fix this. */ if (view->sizing_mode == EV_SIZING_FIT_WIDTH) @@ -2200,12 +2280,15 @@ ev_view_zoom_for_size_continuous (EvView *view, compute_border (view, doc_width, doc_height, &border); width -= (border.left + border.right + 2 * view->spacing); - height -= (border.top + border.bottom + 2 * view->spacing); + height -= (border.top + border.bottom + 2 * view->spacing - 1); + /* FIXME: We really need to calculate the overall height here, not the + * page height. We assume there's always a vertical scrollbar for + * now. We need to fix this. */ if (view->sizing_mode == EV_SIZING_FIT_WIDTH) - scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width); + scale = zoom_for_size_fit_width (doc_width, doc_height, width - vsb_width, height, 0); else if (view->sizing_mode == EV_SIZING_BEST_FIT) - scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height); else g_assert_not_reached (); @@ -2313,7 +2396,9 @@ ev_view_set_zoom_for_size (EvView *view, if (view->document == NULL) return; - if (view->continuous && view->dual_page) + if (view->presentation) + ev_view_zoom_for_size_presentation (view, width, height); + else if (view->continuous && view->dual_page) ev_view_zoom_for_size_continuous_and_dual_page (view, width, height, vsb_width, hsb_height); else if (view->continuous) ev_view_zoom_for_size_continuous (view, width, height, vsb_width, hsb_height);