X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=dba309b5baf34e19ac46cb99a1dab7f42e690761;hb=2de7c9f04ca0fb4e471c7e0be6a9b332d7df2cd1;hp=80958817a904dd9f49b1f4f7752a22e786f2f18e;hpb=5120e3dbe4ca81eb71136a8cde7c4b17f14f23a8;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 80958817..dba309b5 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -42,7 +43,12 @@ enum { PROP_0, PROP_STATUS, - PROP_FIND_STATUS + PROP_FIND_STATUS, + PROP_CONTINUOUS, + PROP_DUAL_PAGE, + PROP_FULLSCREEN, + PROP_PRESENTATION, + PROP_SIZING_MODE, }; enum { @@ -53,6 +59,11 @@ enum { TARGET_TEXT_BUFFER_CONTENTS }; +enum { + EV_SCROLL_PAGE_FORWARD, + EV_SCROLL_PAGE_BACKWARD +}; + static const GtkTargetEntry targets[] = { { "STRING", 0, TARGET_STRING }, { "TEXT", 0, TARGET_TEXT }, @@ -71,25 +82,25 @@ typedef enum { #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR) #define MIN_SCALE 0.05409 -#define MAX_SCALE 18.4884 +#define MAX_SCALE 6.0 struct _EvView { GtkWidget parent_instance; EvDocument *document; - + GdkWindow *bin_window; char *status; char *find_status; - + int scroll_x; int scroll_y; gboolean pressed_button; gboolean has_selection; GdkPoint selection_start; - GdkRectangle selection; + EvRectangle selection; EvViewCursor cursor; GtkAdjustment *hadjustment; @@ -98,7 +109,10 @@ struct _EvView { EvPageCache *page_cache; EvPixbufCache *pixbuf_cache; + gint start_page; + gint end_page; gint current_page; + EvJobRender *current_job; int find_page; @@ -106,8 +120,13 @@ struct _EvView { int spacing; double scale; - int width; - int height; + GtkBorder border; + + gboolean continuous; + gboolean dual_page; + gboolean fullscreen; + gboolean presentation; + EvSizingMode sizing_mode; }; struct _EvViewClass { @@ -119,24 +138,33 @@ struct _EvViewClass { void (*scroll_view) (EvView *view, GtkScrollType scroll, gboolean horizontal); - + }; -static void ev_view_set_scroll_adjustments (EvView *view, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); - +static void ev_view_set_scroll_adjustments (EvView *view, + GtkAdjustment *hadjustment, + GtkAdjustment *vadjustment); +static void get_bounding_box_size (EvView *view, + int *max_width, + 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) -/*** Helper functions ***/ - +/*** Helper functions ***/ + static void view_update_adjustments (EvView *view) { int old_x = view->scroll_x; int old_y = view->scroll_y; - + if (view->hadjustment) view->scroll_x = view->hadjustment->value; else @@ -146,12 +174,15 @@ view_update_adjustments (EvView *view) view->scroll_y = view->vadjustment->value; else view->scroll_y = 0; - + if (GTK_WIDGET_REALIZED (view) && (view->scroll_x != old_x || view->scroll_y != old_y)) { gdk_window_move (view->bin_window, - view->scroll_x, - view->scroll_y); - gdk_window_process_updates (view->bin_window, TRUE); + // gdk_window_process_updates (view->bin_window, TRUE); } + + if (view->document) + view_update_range_and_current_page (view); } static void @@ -176,7 +207,7 @@ view_set_adjustment_values (EvView *view, if (!adjustment) return; - + adjustment->page_size = allocation; adjustment->step_increment = allocation * 0.1; adjustment->page_increment = allocation * 0.9; @@ -193,8 +224,93 @@ view_set_adjustment_values (EvView *view, gtk_adjustment_value_changed (adjustment); } -/*** Virtual function implementations ***/ - +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; + + get_bounding_box_size (view, &(page_area.width), &(page_area.height)); + page_area.x = view->spacing; + page_area.y = view->spacing; + + if (view->hadjustment) { + current_area.x = view->hadjustment->value; + current_area.width = view->hadjustment->page_size; + } else { + current_area.x = page_area.x; + current_area.width = page_area.width; + } + + if (view->vadjustment) { + current_area.y = view->vadjustment->value; + current_area.height = view->vadjustment->page_size; + } else { + current_area.y = page_area.y; + current_area.height = page_area.height; + } + + for (i = 0; i < ev_page_cache_get_n_pages (view->page_cache); i++) { + if (gdk_rectangle_intersect (¤t_area, &page_area, &unused)) { + if (! found) { + view->start_page = i; + found = TRUE; + + } + view->end_page = i; + } else if (found) { + break; + } + if (view->dual_page) { + if (i % 2 == 0) { + page_area.x += page_area.width + view->spacing; + } else { + page_area.x = view->spacing; + page_area.y += page_area.height + view->spacing; + } + } else { + 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) { + view->start_page = view->current_page; + if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) + view->end_page = view->start_page + 1; + } else { + view->start_page = view->current_page - 1; + view->end_page = view->current_page; + } + } else { + view->start_page = view->current_page; + view->end_page = view->current_page; + } + } + + ev_pixbuf_cache_set_page_range (view->pixbuf_cache, + view->start_page, + view->end_page, + view->scale); +} + +/*** Virtual function implementations ***/ + static void ev_view_finalize (GObject *object) { @@ -202,8 +318,8 @@ ev_view_finalize (GObject *object) LOG ("Finalize"); - - ev_view_set_scroll_adjustments (view, NULL, NULL); + g_free (view->status); + g_free (view->find_status); G_OBJECT_CLASS (ev_view_parent_class)->finalize (object); } @@ -222,7 +338,7 @@ ev_view_destroy (GtkObject *object) view->pixbuf_cache = NULL; } ev_view_set_scroll_adjustments (view, NULL, NULL); - + GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object); } @@ -232,7 +348,6 @@ ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset) EvDocument *document = view->document; GtkWidget *widget = GTK_WIDGET (view); int width, height, target_width, target_height; - GtkBorder border; g_return_if_fail (EV_IS_DOCUMENT (document)); @@ -241,84 +356,218 @@ ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset) view->scale, &width, &height); - ev_document_misc_get_page_border_size (width, height, &border); - *x_offset = view->spacing; *y_offset = view->spacing; - target_width = width + border.left + border.right + view->spacing * 2; - target_height = height + border.top + border.bottom + view->spacing * 2; + target_width = width + view->border.left + + view->border.right + view->spacing * 2; + target_height = height + view->border.top + + view->border.bottom + view->spacing * 2; *x_offset += MAX (0, (widget->allocation.width - target_width) / 2); *y_offset += MAX (0, (widget->allocation.height - target_height) / 2); } static void -view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, GdkRectangle *doc_rect) +view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, EvRectangle *doc_rect) { int x_offset, y_offset; - ev_view_get_offsets (view, &x_offset, &y_offset); - doc_rect->x = (view_rect->x - x_offset) / view->scale; - doc_rect->y = (view_rect->y - y_offset) / view->scale; - doc_rect->width = view_rect->width / view->scale; - doc_rect->height = view_rect->height / view->scale; + ev_view_get_offsets (view, &x_offset, &y_offset); + doc_rect->x1 = (double) (view_rect->x - x_offset) / view->scale; + doc_rect->y1 = (double) (view_rect->y - y_offset) / view->scale; + doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale; + doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale; } static void -doc_rect_to_view_rect (EvView *view, GdkRectangle *doc_rect, GdkRectangle *view_rect) +doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_rect) { int x_offset, y_offset; - ev_view_get_offsets (view, &x_offset, &y_offset); - view_rect->x = doc_rect->x * view->scale + x_offset; - view_rect->y = doc_rect->y * view->scale + y_offset; - view_rect->width = doc_rect->width * view->scale; - view_rect->height = doc_rect->height * view->scale; + ev_view_get_offsets (view, &x_offset, &y_offset); + view_rect->x = floor (doc_rect->x1 * view->scale) + x_offset; + view_rect->y = floor (doc_rect->y1 * view->scale) + y_offset; + view_rect->width = ceil (doc_rect->x2 * view->scale) + x_offset - view_rect->x; + view_rect->height = ceil (doc_rect->y2 * view->scale) + y_offset - view_rect->y; } +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); + } +} -/* Called by size_request to make sure we have appropriate jobs running. - */ static void -ev_view_size_request (GtkWidget *widget, - GtkRequisition *requisition) +get_bounding_box_size (EvView *view, int *max_width, int *max_height) +{ + GtkBorder border; + int width, height; + + if (max_width) { + ev_page_cache_get_max_width_size (view->page_cache, + view->scale, + &width, &height); + compute_border (view, width, height, &border); + *max_width = width + border.left + border.right; + } + + + if (max_height) { + ev_page_cache_get_max_height_size (view->page_cache, + view->scale, + &width, &height); + compute_border (view, width, height, &border); + *max_height = height + border.top + border.bottom; + } +} + + +static void +ev_view_size_request_continuous_and_dual_page (EvView *view, + GtkRequisition *requisition) +{ + int max_width, max_height; + int n_rows; + + get_bounding_box_size (view, &max_width, &max_height); + + n_rows = (1 + ev_page_cache_get_n_pages (view->page_cache)) / 2; + + requisition->width = (max_width * 2) + (view->spacing * 3); + requisition->height = max_height * n_rows + (view->spacing * (n_rows + 1)); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + requisition->width = 1; + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + /* FIXME: This could actually be set on one page docs or docs + * with a strange aspect ratio. */ + /* requisition->height = 1;*/ + } +} + +static void +ev_view_size_request_continuous (EvView *view, + GtkRequisition *requisition) +{ + int max_width, max_height; + int n_pages; + + get_bounding_box_size (view, &max_width, &max_height); + + n_pages = ev_page_cache_get_n_pages (view->page_cache); + + requisition->width = max_width + (view->spacing * 2); + requisition->height = max_height * n_pages + (view->spacing * (n_pages + 1)); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) { + requisition->width = 1; + } else if (view->sizing_mode == EV_SIZING_BEST_FIT) { + requisition->width = 1; + /* FIXME: This could actually be set on one page docs or docs + * with a strange aspect ratio. */ + /* requisition->height = 1;*/ + } +} + +static void +ev_view_size_request_dual_page (EvView *view, + GtkRequisition *requisition) { - EvView *view = EV_VIEW (widget); GtkBorder border; gint width, height; - if (!GTK_WIDGET_REALIZED (widget)) - return; + /* Find the largest of the two. */ + ev_page_cache_get_size (view->page_cache, + view->current_page, + 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->scale, + &width_2, &height_2); + if (width_2 > width) { + width = width_2; + height = height_2; + } + } + 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->document) { + 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; - return; } +} + +static void +ev_view_size_request_single_page (EvView *view, + GtkRequisition *requisition) +{ + GtkBorder border; + gint width, height; ev_page_cache_get_size (view->page_cache, view->current_page, view->scale, &width, &height); + compute_border (view, width, height, &border); - ev_pixbuf_cache_set_page_range (view->pixbuf_cache, - view->current_page, - view->current_page, - view->scale); - ev_document_misc_get_page_border_size (width, height, &border); + requisition->width = width + border.left + border.right + (2 * view->spacing); + requisition->height = height + border.top + border.bottom + (2 * view->spacing); - if (view->width >= 0) { - requisition->width = 0; - } else { - requisition->width = width + border.left + border.right + - view->spacing * 2; + 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; } - - if (view->height >= 0) { - requisition->height = 0; - } else { - requisition->height = height + border.top + border.bottom + - view->spacing * 2; +} + +static void +ev_view_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + EvView *view = EV_VIEW (widget); + + if (!GTK_WIDGET_REALIZED (widget)) + return; + + if (view->document == NULL) { + requisition->width = 1; + requisition->height = 1; + return; + } + + if (view->presentation) { + requisition->width = 1; + requisition->height = 1; + return; } + + if (view->continuous && view->dual_page) + ev_view_size_request_continuous_and_dual_page (view, requisition); + else if (view->continuous) + ev_view_size_request_continuous (view, requisition); + else if (view->dual_page) + ev_view_size_request_dual_page (view, requisition); + else + ev_view_size_request_single_page (view, requisition); } static void @@ -337,6 +586,9 @@ ev_view_size_allocate (GtkWidget *widget, MAX (widget->allocation.width, widget->requisition.width), MAX (widget->allocation.height, widget->requisition.height)); } + + if (view->document) + view_update_range_and_current_page (view); } static void @@ -346,19 +598,19 @@ ev_view_realize (GtkWidget *widget) GdkWindowAttr attributes; GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - + attributes.window_type = GDK_WINDOW_CHILD; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.colormap = gtk_widget_get_colormap (widget); - + attributes.x = widget->allocation.x; attributes.y = widget->allocation.y; attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; attributes.event_mask = 0; - + widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, GDK_WA_X | GDK_WA_Y | @@ -367,7 +619,7 @@ ev_view_realize (GtkWidget *widget) gdk_window_set_user_data (widget->window, widget); widget->style = gtk_style_attach (widget->style, widget->window); gdk_window_set_background (widget->window, &widget->style->mid[widget->state]); - + attributes.x = 0; attributes.y = 0; attributes.width = MAX (widget->allocation.width, widget->requisition.width); @@ -379,7 +631,7 @@ ev_view_realize (GtkWidget *widget) GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK; - + view->bin_window = gdk_window_new (widget->window, &attributes, GDK_WA_X | GDK_WA_Y | @@ -389,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 @@ -413,6 +668,38 @@ 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) { @@ -441,7 +728,7 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, gdk_draw_pixbuf (window, NULL, pixbuf, 0, 0, - rect->x,rect->y, + rect->x, rect->y, rect->width, rect->height, GDK_RGB_DITHER_NONE, 0, 0); @@ -459,6 +746,7 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, gdk_color_free (fill_color_gdk); } + static void highlight_find_results (EvView *view) { @@ -469,64 +757,173 @@ highlight_find_results (EvView *view) find = EV_DOCUMENT_FIND (view->document); -#if 0 - g_mutex_lock (EV_DOC_MUTEX); - results = ev_document_find_get_n_results (find); - g_mutex_unlock (EV_DOC_MUTEX); -#endif - + results = ev_document_find_get_n_results (find, view->current_page); + for (i = 0; i < results; i++) { - GdkRectangle rectangle; + EvRectangle rectangle; + GdkRectangle view_rectangle; guchar alpha; alpha = (i == view->find_result) ? 0x90 : 0x20; - g_mutex_lock (EV_DOC_MUTEX); - ev_document_find_get_result (find, i, &rectangle); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_find_get_result (find, view->current_page, + i, &rectangle); + doc_rect_to_view_rect (view, &rectangle, &view_rectangle); draw_rubberband (GTK_WIDGET (view), view->bin_window, - &rectangle, alpha); + &view_rectangle, alpha); } } +#endif + + +static gboolean +get_page_extents (EvView *view, + gint page, + GdkRectangle *page_area, + GtkBorder *border) +{ + GtkWidget *widget; + int width, height; + + widget = GTK_WIDGET (view); + + /* Quick sanity check */ + if (view->presentation) { + if (view->current_page != page) + return FALSE; + } else if (view->continuous) { + if (page < view->start_page || + page > view->end_page) + return FALSE; + } else if (view->dual_page) { + if (ABS (page - view->current_page) > 1) + return FALSE; + } else { + if (view->current_page != page) + return FALSE; + } + + /* Get the size of the page */ + ev_page_cache_get_size (view->page_cache, page, + view->scale, + &width, &height); + compute_border (view, width, height, border); + 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) { + gint max_width, max_height; + gint x, y; + + get_bounding_box_size (view, &max_width, &max_height); + /* Get the location of the bounding box */ + if (view->dual_page) { + x = view->spacing + (page % 2) * (max_width + view->spacing); + y = view->spacing + (page / 2) * (max_height + view->spacing); + x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3))/2; + } else { + x = view->spacing; + y = view->spacing + page * (max_height + view->spacing); + x = x + MAX (0, widget->allocation.width - (max_width + view->spacing * 2))/2; + } + page_area->x = x; + page_area->y = y; + } else { + gint x, y; + if (view->dual_page) { + gint width_2, height_2; + gint max_width = width; + gint max_height = height; + GtkBorder overall_border; + gint other_page; + + other_page = page ^ 1; + + /* First, we get the bounding box of the two pages */ + if (other_page < ev_page_cache_get_n_pages (view->page_cache)) { + ev_page_cache_get_size (view->page_cache, + page + 1, + view->scale, + &width_2, &height_2); + if (width_2 > width) + max_width = width_2; + if (height_2 > height) + max_height = height_2; + } + compute_border (view, max_width, max_height, &overall_border); + + /* Find the offsets */ + x = view->spacing; + y = view->spacing; + + /* Adjust for being the left or right page */ + if (page % 2 == 0) + x = x + max_width - width; + else + x = x + (max_width + overall_border.left + overall_border.right) + view->spacing; + + y = y + (max_height - height)/2; + + /* Adjust for extra allocation */ + x = x + MAX (0, widget->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; + } else { + x = view->spacing; + y = view->spacing; + + /* Adjust for extra allocation */ + x = x + MAX (0, widget->allocation.width - (width + view->spacing * 2))/2; + y = y + MAX (0, widget->allocation.height - (height + view->spacing * 2))/2; + } + + page_area->x = x; + page_area->y = y; + } + return TRUE; +} static void -expose_bin_window (GtkWidget *widget, - GdkEventExpose *event) +draw_one_page (EvView *view, + gint page, + GdkRectangle *page_area, + GtkBorder *border, + GdkRectangle *expose_area) { - EvView *view = EV_VIEW (widget); - GtkBorder border; gint width, height; - GdkRectangle area; - int x_offset, y_offset; GdkPixbuf *scaled_image; GdkPixbuf *current_pixbuf; + GdkRectangle overlap; + GdkRectangle real_page_area; - if (view->document == NULL) + g_assert (view->document); + + if (! gdk_rectangle_intersect (page_area, expose_area, &overlap)) return; - ev_view_get_offsets (view, &x_offset, &y_offset); ev_page_cache_get_size (view->page_cache, - view->current_page, - view->scale, + page, view->scale, &width, &height); - ev_document_misc_get_page_border_size (width, height, &border); - - /* Paint the frame */ - area.x = x_offset; - area.y = y_offset; - area.width = width + border.left + border.right; - area.height = height + border.top + border.bottom; - ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border); + ev_document_misc_paint_one_page (view->bin_window, + GTK_WIDGET (view), + page_area, border); /* Render the document itself */ - LOG ("Render area %d %d %d %d - Offset %d %d", - event->area.x, event->area.y, - event->area.width, event->area.height, - x_offset, y_offset); + real_page_area = *page_area; + + real_page_area.x += border->left; + real_page_area.y += border->top; + real_page_area.width -= (border->left + border->right); + real_page_area.height -= (border->top + border->bottom); - current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, view->current_page); + if (! gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) + return; + current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, page); if (current_pixbuf == NULL) scaled_image = NULL; else if (width == gdk_pixbuf_get_width (current_pixbuf) && @@ -540,15 +937,35 @@ expose_bin_window (GtkWidget *widget, gdk_draw_pixbuf (view->bin_window, GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL], scaled_image, - 0, 0, - area.x + border.left, - area.y + border.top, - width, height, + overlap.x - real_page_area.x, + overlap.y - real_page_area.y, + overlap.x, overlap.y, + overlap.width, overlap.height, GDK_RGB_DITHER_NORMAL, 0, 0); g_object_unref (scaled_image); } +} + +static void +ev_view_bin_expose (EvView *view, + GdkEventExpose *event) +{ + int i; + + if (view->document == NULL) + 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; + draw_one_page (view, i, &page_area, &border, &(event->area)); + } +#if 0 if (EV_IS_DOCUMENT_FIND (view->document)) { highlight_find_results (view); } @@ -558,10 +975,11 @@ expose_bin_window (GtkWidget *widget, doc_rect_to_view_rect (view, &view->selection, &rubberband); if (rubberband.width > 0 && rubberband.height > 0) { - draw_rubberband (widget, view->bin_window, + draw_rubberband (GTK_WIDGET (view), view->bin_window, &rubberband, 0x40); } } +#endif } static gboolean @@ -571,7 +989,7 @@ ev_view_expose_event (GtkWidget *widget, EvView *view = EV_VIEW (widget); if (event->window == view->bin_window) - expose_bin_window (widget, event); + ev_view_bin_expose (view, event); else return GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event (widget, event); @@ -585,7 +1003,6 @@ ev_view_select_all (EvView *ev_view) GdkRectangle selection; int width, height; int x_offset, y_offset; - GtkBorder border; g_return_if_fail (EV_IS_VIEW (ev_view)); @@ -595,11 +1012,10 @@ ev_view_select_all (EvView *ev_view) ev_view->current_page, ev_view->scale, &width, &height); - ev_document_misc_get_page_border_size (width, height, &border); ev_view->has_selection = TRUE; - selection.x = x_offset + border.left; - selection.y = y_offset + border.top; + selection.x = x_offset + ev_view->border.left; + selection.y = y_offset + ev_view->border.top; selection.width = width; selection.height = height; view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection); @@ -611,13 +1027,17 @@ void ev_view_copy (EvView *ev_view) { GtkClipboard *clipboard; - GdkRectangle selection; char *text; - doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection); - g_mutex_lock (EV_DOC_MUTEX); - text = ev_document_get_text (ev_view->document, &selection); - g_mutex_unlock (EV_DOC_MUTEX); + if (!ev_document_can_get_text (ev_view->document)) { + return; + } + + ev_document_doc_mutex_lock (); + text = ev_document_get_text (ev_view->document, + ev_view->current_page, + &ev_view->selection); + ev_document_doc_mutex_unlock (); clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view), GDK_SELECTION_CLIPBOARD); @@ -632,13 +1052,17 @@ ev_view_primary_get_cb (GtkClipboard *clipboard, gpointer data) { EvView *ev_view = EV_VIEW (data); - GdkRectangle selection; char *text; - doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection); - g_mutex_lock (EV_DOC_MUTEX); - text = ev_document_get_text (ev_view->document, &selection); - g_mutex_unlock (EV_DOC_MUTEX); + if (!ev_document_can_get_text (ev_view->document)) { + return; + } + + ev_document_doc_mutex_lock (); + text = ev_document_get_text (ev_view->document, + ev_view->current_page, + &ev_view->selection); + ev_document_doc_mutex_unlock (); gtk_selection_data_set_text (selection_data, text, -1); } @@ -708,7 +1132,7 @@ status_message_from_link (EvView *view, EvLink *link) char *page_label; type = ev_link_get_link_type (link); - + switch (type) { case EV_LINK_TYPE_TITLE: if (ev_link_get_title (link)) @@ -745,7 +1169,7 @@ static void ev_view_set_find_status (EvView *view, const char *message) { g_return_if_fail (EV_IS_VIEW (view)); - + g_free (view->find_status); view->find_status = g_strdup (message); g_object_notify (G_OBJECT (view), "find-status"); @@ -810,26 +1234,34 @@ find_page_at_location (EvView *view, gint *x_offset, gint *y_offset) { - GtkBorder border; - gint width, height; - - ev_page_cache_get_size (view->page_cache, - view->current_page, - view->scale, - &width, &height); - ev_document_misc_get_page_border_size (width, height, &border); - - x -= (border.left + view->spacing); - y -= (border.top + view->spacing); + int i; - if ((x < 0) || (y < 0) || - (x >= width) || (y >= height)) { - *page = -1; + if (view->document == NULL) return; + + g_assert (page); + g_assert (x_offset); + g_assert (y_offset); + + 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 * @@ -837,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; } @@ -890,11 +1326,36 @@ ev_view_motion_notify_event (GtkWidget *widget, return TRUE; } -static gboolean -ev_view_button_release_event (GtkWidget *widget, - GdkEventButton *event) +/* FIXME: standardize this sometime */ +static void +go_to_link (EvView *view, EvLink *link) { - EvView *view = EV_VIEW (widget); + EvLinkType type; + const char *uri; + int page; + + type = ev_link_get_link_type (link); + + switch (type) { + case EV_LINK_TYPE_TITLE: + break; + case EV_LINK_TYPE_PAGE: + page = ev_link_get_page (link); + ev_page_cache_set_current_page (view->page_cache, page); + break; + case EV_LINK_TYPE_EXTERNAL_URI: + uri = ev_link_get_uri (link); + gnome_vfs_url_show (uri); + break; + } +} + + +static gboolean +ev_view_button_release_event (GtkWidget *widget, + GdkEventButton *event) +{ + EvView *view = EV_VIEW (widget); view->pressed_button = -1; @@ -905,7 +1366,7 @@ ev_view_button_release_event (GtkWidget *widget, link = get_link_at_location (view, event->x, event->y); if (link) { - ev_view_go_to_link (view, link); + go_to_link (view, link); } } @@ -930,7 +1391,7 @@ set_scroll_adjustment (EvView *view, to_set = &view->hadjustment; else to_set = &view->vadjustment; - + if (*to_set != adjustment) { if (*to_set) { g_signal_handlers_disconnect_by_func (*to_set, @@ -962,13 +1423,13 @@ ev_view_set_scroll_adjustments (EvView *view, } static void -add_scroll_binding (GtkBindingSet *binding_set, - guint keyval, - GtkScrollType scroll, - gboolean horizontal) +add_scroll_binding_keypad (GtkBindingSet *binding_set, + guint keyval, + GtkScrollType scroll, + gboolean horizontal) { guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; - + gtk_binding_entry_add_signal (binding_set, keyval, 0, "scroll_view", 2, GTK_TYPE_SCROLL_TYPE, scroll, @@ -979,6 +1440,77 @@ add_scroll_binding (GtkBindingSet *binding_set, G_TYPE_BOOLEAN, horizontal); } +static void +add_scroll_binding_shifted (GtkBindingSet *binding_set, + guint keyval, + GtkScrollType scroll_normal, + GtkScrollType scroll_shifted, + gboolean horizontal) +{ + gtk_binding_entry_add_signal (binding_set, keyval, 0, + "scroll_view", 2, + GTK_TYPE_SCROLL_TYPE, scroll_normal, + G_TYPE_BOOLEAN, horizontal); + gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK, + "scroll_view", 2, + GTK_TYPE_SCROLL_TYPE, scroll_shifted, + G_TYPE_BOOLEAN, horizontal); +} + +static void +ev_view_jump (EvView *view, + GtkScrollType scroll) +{ + GtkAdjustment *adjustment; + double value, increment; + gboolean first_page = FALSE; + gboolean last_page = FALSE; + + /* Assign values for increment and vertical adjustment */ + adjustment = view->vadjustment; + increment = adjustment->page_size * 0.75; + value = adjustment->value; + + /* Assign boolean for first and last page */ + if (view->current_page == 0) + first_page = TRUE; + if (view->current_page == ev_page_cache_get_n_pages (view->page_cache) - 1) + last_page = TRUE; + + switch (scroll) { + case EV_SCROLL_PAGE_BACKWARD: + /* Do not jump backwards if at the first page */ + if (value == (adjustment->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; + ev_page_cache_set_current_page (view->page_cache, view->current_page - 1); + /* Jump to the top */ + } else { + value = MAX (value - increment, adjustment->lower); + } + break; + case EV_SCROLL_PAGE_FORWARD: + /* Do not jump forward if at the last page */ + if (value == (adjustment->upper - adjustment->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)) { + value = 0; + ev_page_cache_set_current_page (view->page_cache, view->current_page + 1); + /* Jump to the bottom */ + } else { + value = MIN (value + increment, adjustment->upper - adjustment->page_size); + } + break; + default: + break; + } + + gtk_adjustment_set_value (adjustment, value); +} + static void ev_view_scroll_view (EvView *view, GtkScrollType scroll, @@ -988,12 +1520,14 @@ ev_view_scroll_view (EvView *view, ev_page_cache_prev_page (view->page_cache); } else if (scroll == GTK_SCROLL_PAGE_FORWARD) { ev_page_cache_next_page (view->page_cache); + } else if (scroll == EV_SCROLL_PAGE_BACKWARD || scroll == EV_SCROLL_PAGE_FORWARD) { + ev_view_jump (view, scroll); } else { GtkAdjustment *adjustment; double value; if (horizontal) { - adjustment = view->hadjustment; + adjustment = view->hadjustment; } else { adjustment = view->vadjustment; } @@ -1001,11 +1535,11 @@ ev_view_scroll_view (EvView *view, value = adjustment->value; switch (scroll) { - case GTK_SCROLL_STEP_BACKWARD: - value -= adjustment->step_increment; + case GTK_SCROLL_STEP_BACKWARD: + value -= adjustment->step_increment; break; case GTK_SCROLL_STEP_FORWARD: - value += adjustment->step_increment; + value += adjustment->step_increment; break; default: break; @@ -1019,17 +1553,32 @@ ev_view_scroll_view (EvView *view, } static void -ev_view_set_property (GObject *object, - guint prop_id, +ev_view_set_property (GObject *object, + guint prop_id, const GValue *value, - GParamSpec *pspec) + GParamSpec *pspec) { + EvView *view = EV_VIEW (object); + switch (prop_id) { - /* Read only */ - case PROP_STATUS: - case PROP_FIND_STATUS: - break; + 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; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } } @@ -1043,12 +1592,29 @@ ev_view_get_property (GObject *object, switch (prop_id) { - case PROP_STATUS: - g_value_set_string (value, view->status); - break; - case PROP_FIND_STATUS: - g_value_set_string (value, view->status); - break; + case PROP_STATUS: + g_value_set_string (value, view->status); + break; + case PROP_FIND_STATUS: + g_value_set_string (value, view->status); + break; + case PROP_CONTINUOUS: + g_value_set_boolean (value, view->continuous); + break; + case PROP_DUAL_PAGE: + g_value_set_boolean (value, view->dual_page); + break; + case PROP_FULLSCREEN: + g_value_set_boolean (value, view->fullscreen); + break; + case PROP_PRESENTATION: + g_value_set_boolean (value, view->presentation); + break; + case PROP_SIZING_MODE: + g_value_set_enum (value, view->sizing_mode); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } } @@ -1072,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; @@ -1113,15 +1680,57 @@ ev_view_class_init (EvViewClass *class) NULL, G_PARAM_READABLE)); + 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)); + binding_set = gtk_binding_set_by_class (class); - add_scroll_binding (binding_set, GDK_Left, GTK_SCROLL_STEP_BACKWARD, TRUE); - add_scroll_binding (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE); - add_scroll_binding (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE); - add_scroll_binding (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Left, GTK_SCROLL_STEP_BACKWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE); - add_scroll_binding (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_BACKWARD, FALSE); - add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_BACKWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD, FALSE); + + add_scroll_binding_shifted (binding_set, GDK_space, EV_SCROLL_PAGE_FORWARD, EV_SCROLL_PAGE_BACKWARD, FALSE); + add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE); } static void @@ -1134,6 +1743,12 @@ ev_view_init (EvView *view) view->current_page = 0; view->pressed_button = -1; view->cursor = EV_VIEW_CURSOR_NORMAL; + + view->continuous = TRUE; + view->dual_page = FALSE; + view->presentation = FALSE; + view->fullscreen = FALSE; + view->sizing_mode = EV_SIZING_FIT_WIDTH; } static void @@ -1141,14 +1756,15 @@ update_find_status_message (EvView *view) { char *message; -// g_mutex_lock (EV_DOC_MUTEX); - if (ev_document_get_page (view->document) == view->find_page) { +// ev_document_doc_mutex_lock (); + if (view->current_page == view->find_page) { int results; -// g_mutex_lock (EV_DOC_MUTEX); +// ev_document_doc_mutex_lock (); results = ev_document_find_get_n_results - (EV_DOCUMENT_FIND (view->document)); -// g_mutex_unlock (EV_DOC_MUTEX); + (EV_DOCUMENT_FIND (view->document), + view->current_page); +// ev_document_doc_mutex_unlock (); /* TRANS: Sometimes this could be better translated as "%d hit(s) on this page". Therefore this string contains plural cases. */ @@ -1159,19 +1775,19 @@ update_find_status_message (EvView *view) } else { double percent; - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); percent = ev_document_find_get_progress (EV_DOCUMENT_FIND (view->document)); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); if (percent >= (1.0 - 1e-10)) { message = g_strdup (_("Not found")); } else { message = g_strdup_printf (_("%3d%% remaining to search"), (int) ((1.0 - percent) * 100)); } - + } -// g_mutex_unlock (EV_DOC_MUTEX); +// ev_document_doc_mutex_unlock (); ev_view_set_find_status (view, message); // g_free (message); @@ -1215,20 +1831,22 @@ static void jump_to_find_result (EvView *view) { EvDocumentFind *find = EV_DOCUMENT_FIND (view->document); - GdkRectangle rect; + EvRectangle rect; + GdkRectangle view_rect; int n_results; - g_mutex_lock (EV_DOC_MUTEX); - n_results = ev_document_find_get_n_results (find); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); + n_results = ev_document_find_get_n_results (find, view->current_page); + ev_document_doc_mutex_unlock (); if (n_results > view->find_result) { - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); ev_document_find_get_result - (find, view->find_result, &rect); - g_mutex_unlock (EV_DOC_MUTEX); + (find, view->current_page, view->find_result, &rect); + ev_document_doc_mutex_unlock (); - ensure_rectangle_is_visible (view, &rect); + doc_rect_to_view_rect (view, &rect, &view_rect); + ensure_rectangle_is_visible (view, &view_rect); } } @@ -1239,16 +1857,16 @@ jump_to_find_page (EvView *view) n_pages = ev_page_cache_get_n_pages (view->page_cache); - for (i = 0; i <= n_pages; i++) { + for (i = 0; i < n_pages; i++) { int has_results; int page; page = i + view->find_page; - if (page > n_pages) { + if (page >= n_pages) { page = page - n_pages; } - g_mutex_lock (EV_DOC_MUTEX); + // ev_document_doc_mutex_lock (); has_results = ev_document_find_page_has_results (EV_DOCUMENT_FIND (view->document), page); if (has_results == -1) { @@ -1269,19 +1887,19 @@ find_changed_cb (EvDocument *document, int page, EvView *view) jump_to_find_result (view); update_find_status_message (view); -#if 0 - /* FIXME: */ - if (ev_document_get_page (document) == page) { + if (view->current_page == page) gtk_widget_queue_draw (GTK_WIDGET (view)); - } -#endif } -/*** Public API ***/ - +/*** Public API ***/ + GtkWidget* ev_view_new (void) { - return g_object_new (EV_TYPE_VIEW, NULL); + GtkWidget *view; + + view = g_object_new (EV_TYPE_VIEW, NULL); + + return view; } static void @@ -1300,6 +1918,7 @@ page_changed_cb (EvPageCache *page_cache, int old_page = view->current_page; int old_width, old_height; int new_width, new_height; + int max_height, n_rows; if (old_page == new_page) return; @@ -1308,36 +1927,44 @@ page_changed_cb (EvPageCache *page_cache, old_page, view->scale, &old_width, &old_height); + + view->current_page = new_page; + view->has_selection = FALSE; + ev_page_cache_get_size (page_cache, new_page, view->scale, &new_width, &new_height); - if (view->cursor != EV_VIEW_CURSOR_HIDDEN) { - //ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT); - } - - view->current_page = new_page; - view->has_selection = FALSE; - - ev_pixbuf_cache_set_page_range (view->pixbuf_cache, - view->current_page, - view->current_page, - view->scale); + compute_border (view, new_width, new_height, &(view->border)); if (new_width != old_width || new_height != old_height) gtk_widget_queue_resize (GTK_WIDGET (view)); else gtk_widget_queue_draw (GTK_WIDGET (view)); - gtk_adjustment_set_value (view->vadjustment, - view->vadjustment->lower); + if (view->continuous) { + + n_rows = view->dual_page ? new_page / 2 : new_page; + + get_bounding_box_size (view, NULL, &max_height); + + gtk_adjustment_clamp_page(view->vadjustment, + (max_height + view->spacing) * n_rows, + (max_height + view->spacing) * n_rows + + view->vadjustment->page_size); + } else { + gtk_adjustment_set_value (view->vadjustment, + view->vadjustment->lower); + } if (EV_IS_DOCUMENT_FIND (view->document)) { view->find_page = new_page; view->find_result = 0; update_find_status_message (view); } + + view_update_range_and_current_page (view); } void @@ -1353,11 +1980,11 @@ ev_view_set_document (EvView *view, view); g_object_unref (view->document); view->page_cache = NULL; - + } view->document = document; - view->find_page = 1; + view->find_page = 0; view->find_result = 0; if (view->document) { @@ -1373,134 +2000,424 @@ ev_view_set_document (EvView *view, view->pixbuf_cache = ev_pixbuf_cache_new (view->document); g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view); } - + gtk_widget_queue_resize (GTK_WIDGET (view)); } } -static void -go_to_link (EvView *view, EvLink *link) +#define EPSILON 0.0000001 +void +ev_view_set_zoom (EvView *view, + double factor, + gboolean relative) { - EvLinkType type; - const char *uri; - int page; + double scale; - type = ev_link_get_link_type (link); - - switch (type) { - case EV_LINK_TYPE_TITLE: - break; - case EV_LINK_TYPE_PAGE: - page = ev_link_get_page (link); - ev_page_cache_set_current_page (view->page_cache, page); - break; - case EV_LINK_TYPE_EXTERNAL_URI: - uri = ev_link_get_uri (link); - gnome_vfs_url_show (uri); - break; + if (relative) + scale = view->scale * factor; + else + scale = factor; + + scale = CLAMP (scale, MIN_SCALE, MAX_SCALE); + + if (ABS (view->scale - scale) < EPSILON) + return; + view->scale = scale; + gtk_widget_queue_resize (GTK_WIDGET (view)); +} + +double +ev_view_get_zoom (EvView *view) +{ + return view->scale; +} + +void +ev_view_set_continuous (EvView *view, + gboolean continuous) +{ + g_return_if_fail (EV_IS_VIEW (view)); + + continuous = continuous != FALSE; + + if (view->continuous != continuous) { + view->continuous = continuous; + gtk_widget_queue_resize (GTK_WIDGET (view)); } + + g_object_notify (G_OBJECT (view), "continuous"); } void -ev_view_go_to_link (EvView *view, EvLink *link) +ev_view_set_dual_page (EvView *view, + gboolean dual_page) { - go_to_link (view, link); + g_return_if_fail (EV_IS_VIEW (view)); + + dual_page = dual_page != FALSE; + + if (view->dual_page == dual_page) + return; + + view->dual_page = dual_page; + /* FIXME: if we're keeping the pixbuf cache around, we should extend the + * preload_cache_size to be 2 if dual_page is set. + */ + gtk_widget_queue_resize (GTK_WIDGET (view)); + + g_object_notify (G_OBJECT (view), "dual-page"); } -static void -ev_view_zoom (EvView *view, - double factor, - gboolean relative) +void +ev_view_set_fullscreen (EvView *view, + gboolean fullscreen) { - double scale; + g_return_if_fail (EV_IS_VIEW (view)); - if (relative) - scale = view->scale * factor; - else - scale = factor; + fullscreen = fullscreen != FALSE; - scale = CLAMP (scale, MIN_SCALE, MAX_SCALE); + if (view->fullscreen != fullscreen) { + view->fullscreen = fullscreen; + gtk_widget_queue_resize (GTK_WIDGET (view)); + } - view->scale = scale; + 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; + + 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) + return; + + view->sizing_mode = sizing_mode; gtk_widget_queue_resize (GTK_WIDGET (view)); + + 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) +{ + return view->scale * ZOOM_IN_FACTOR <= MAX_SCALE; +} + +gboolean +ev_view_can_zoom_out (EvView *view) +{ + return view->scale * ZOOM_OUT_FACTOR >= MIN_SCALE; } void ev_view_zoom_in (EvView *view) { - view->width = view->height = -1; - ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE); + g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); + + ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE); } void ev_view_zoom_out (EvView *view) { - view->width = view->height = -1; - ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE); + g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); + + ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE); } + + static double -size_to_zoom_factor (EvView *view, int width, int height) +zoom_for_size_fit_width (int doc_width, + int doc_height, + int target_width, + int target_height, + int vsb_width) +{ + double scale; + + scale = (double)target_width / doc_width; + + if (doc_height * scale > target_height) + scale = (double) (target_width - vsb_width) / doc_width; + + return scale; +} + +static double +zoom_for_size_best_fit (int doc_width, + int doc_height, + int target_width, + int target_height, + int vsb_width, + int hsb_width) +{ + double w_scale; + double h_scale; + + 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 - vsb_width) / doc_width; + if (doc_width * h_scale > target_width) + h_scale = (double) (target_height - hsb_width) / doc_height; + + 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; - double scale, scale_w, scale_h; - GtkBorder border; + gdouble scale; - doc_width = doc_height = 0; - scale = scale_w = scale_h = 1.0; ev_page_cache_get_size (view->page_cache, view->current_page, - view->scale, + 1.0, &doc_width, &doc_height); + scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, 0, 0); + ev_view_set_zoom (view, scale, FALSE); +} - /* FIXME: The border size isn't constant. Ugh. Still, if we have extra - * space, we just cut it from the border */ - ev_document_misc_get_page_border_size (doc_width, doc_height, &border); +static void +ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, + int width, + int height, + int vsb_width, + int hsb_height) +{ + int doc_width, doc_height; + GtkBorder border; + gdouble scale; + + ev_page_cache_get_max_width_size (view->page_cache, + 1.0, + &doc_width, NULL); + ev_page_cache_get_max_height_size (view->page_cache, + 1.0, + NULL, &doc_height); + compute_border (view, doc_width, doc_height, &border); + + doc_width = doc_width * 2; + width -= (2 * (border.left + border.right) + 3 * 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 - vsb_width, height, 0); + else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height); + else + g_assert_not_reached (); - if (doc_width == 0 && doc_height == 0) { - return 0; - } + ev_view_set_zoom (view, scale, FALSE); +} - if (width >= 0) { - int target_width; +static void +ev_view_zoom_for_size_continuous (EvView *view, + int width, + int height, + int vsb_width, + int hsb_height) +{ + int doc_width, doc_height; + GtkBorder border; + gdouble scale; + + ev_page_cache_get_max_width_size (view->page_cache, + 1.0, + &doc_width, NULL); + ev_page_cache_get_max_height_size (view->page_cache, + 1.0, + NULL, &doc_height); + compute_border (view, doc_width, doc_height, &border); + + width -= (border.left + border.right + 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 - vsb_width, height, 0); + else if (view->sizing_mode == EV_SIZING_BEST_FIT) + scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height); + else + g_assert_not_reached (); - target_width = width - (view->spacing * 2 + border.left + border.right); - scale = scale_w = (double)target_width * view->scale / doc_width; - } + ev_view_set_zoom (view, scale, FALSE); +} - if (height >= 0) { - int target_height; +static void +ev_view_zoom_for_size_dual_page (EvView *view, + int width, + int height, + int vsb_width, + int hsb_height) +{ + GtkBorder border; + gint doc_width, doc_height; + gdouble scale; + gint other_page; - target_height = height - (view->spacing * 2 + border.top + border.bottom); - scale = scale_h = (double)target_height * view->scale / doc_height; - } + other_page = view->current_page ^ 1; - if (width >= 0 && height >= 0) { - scale = (scale_w < scale_h) ? scale_w : scale_h; + /* Find the largest of the two. */ + ev_page_cache_get_size (view->page_cache, + view->current_page, + 1.0, + &doc_width, &doc_height); + + if (other_page < ev_page_cache_get_n_pages (view->page_cache)) { + gint width_2, height_2; + ev_page_cache_get_size (view->page_cache, + other_page, + 1.0, + &width_2, &height_2); + if (width_2 > doc_width) + doc_width = width_2; + if (height_2 > doc_height) + doc_height = height_2; } + compute_border (view, doc_width, doc_height, &border); - return scale; + doc_width = doc_width * 2; + width -= ((border.left + border.right)* 2 + 3 * view->spacing); + height -= (border.top + border.bottom + 2 * view->spacing); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) + scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width); + 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); + else + g_assert_not_reached (); + + ev_view_set_zoom (view, scale, FALSE); +} + +static void +ev_view_zoom_for_size_single_page (EvView *view, + int width, + int height, + int vsb_width, + int hsb_height) +{ + int doc_width, doc_height; + GtkBorder border; + gdouble scale; + + ev_page_cache_get_size (view->page_cache, + view->current_page, + 1.0, + &doc_width, + &doc_height); + /* Get an approximate border */ + compute_border (view, width, height, &border); + + width -= (border.left + border.right + 2 * view->spacing); + height -= (border.top + border.bottom + 2 * view->spacing); + + if (view->sizing_mode == EV_SIZING_FIT_WIDTH) + scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width); + 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); + else + g_assert_not_reached (); + + ev_view_set_zoom (view, scale, FALSE); +} + + +void +ev_view_zoom_normal (EvView *view) +{ + ev_view_set_zoom (view, 1.0, FALSE); } void -ev_view_set_size (EvView *view, - int width, - int height) +ev_view_set_zoom_for_size (EvView *view, + int width, + int height, + int vsb_width, + int hsb_height) { - double factor; + g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH || + view->sizing_mode == EV_SIZING_BEST_FIT); + g_return_if_fail (width >= 0); + g_return_if_fail (height >= 0); - if (!view->document) + if (view->document == NULL) return; - if (view->width != width || - view->height != height) { - view->width = width; - view->height = height; - factor = size_to_zoom_factor (view, width, height); - ev_view_zoom (view, factor, FALSE); - gtk_widget_queue_resize (GTK_WIDGET (view)); - } + 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); + else if (view->dual_page) + ev_view_zoom_for_size_dual_page (view, width, height, vsb_width, hsb_height); + else + ev_view_zoom_for_size_single_page (view, width, height, vsb_width, hsb_height); } const char * @@ -1519,6 +2436,22 @@ ev_view_get_find_status (EvView *view) return view->find_status; } +gboolean +ev_view_can_find_next (EvView *view) +{ + int n_results = 0; + + if (EV_IS_DOCUMENT_FIND (view->document)) { + EvDocumentFind *find = EV_DOCUMENT_FIND (view->document); + + ev_document_doc_mutex_lock (); + n_results = ev_document_find_get_n_results (find, view->current_page); + ev_document_doc_mutex_unlock (); + } + + return n_results > 0; +} + void ev_view_find_next (EvView *view) { @@ -1527,9 +2460,9 @@ ev_view_find_next (EvView *view) EvDocumentFind *find = EV_DOCUMENT_FIND (view->document); page_cache = ev_document_get_page_cache (view->document); - g_mutex_lock (EV_DOC_MUTEX); - n_results = ev_document_find_get_n_results (find); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); + n_results = ev_document_find_get_n_results (find, view->current_page); + ev_document_doc_mutex_unlock (); n_pages = ev_page_cache_get_n_pages (page_cache); @@ -1539,8 +2472,8 @@ ev_view_find_next (EvView *view) view->find_result = 0; view->find_page++; - if (view->find_page > n_pages) { - view->find_page = 1; + if (view->find_page >= n_pages) { + view->find_page = 0; } jump_to_find_page (view); @@ -1559,9 +2492,9 @@ ev_view_find_previous (EvView *view) page_cache = ev_document_get_page_cache (view->document); - g_mutex_lock (EV_DOC_MUTEX); - n_results = ev_document_find_get_n_results (find); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); + n_results = ev_document_find_get_n_results (find, view->current_page); + ev_document_doc_mutex_unlock (); n_pages = ev_page_cache_get_n_pages (page_cache); @@ -1571,8 +2504,8 @@ ev_view_find_previous (EvView *view) view->find_result = 0; view->find_page--; - if (view->find_page < 1) { - view->find_page = n_pages; + if (view->find_page < 0) { + view->find_page = n_pages - 1; } jump_to_find_page (view); @@ -1590,5 +2523,22 @@ ev_view_hide_cursor (EvView *view) void ev_view_show_cursor (EvView *view) { - ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK); + ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); +} + + +GType +ev_sizing_mode_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" }, + { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" }, + { EV_SIZING_FREE, "EV_SIZING_FREE", "free" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static ("EvSizingMode", values); + } + return etype; }