X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-view.c;h=cf60e36b9e0b7969d42076e4c3244e5f74142577;hb=ba33ad17ac72e6383eae5fec2974480e4ae892f7;hp=8a3dd2657fe97d1179d20d435c33b15fcb157e9e;hpb=d90349e5e8acdb07bb56e22fd7923206465ae47b;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 8a3dd265..cf60e36b 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, }; @@ -59,11 +59,6 @@ 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 }, @@ -75,7 +70,8 @@ typedef enum { EV_VIEW_CURSOR_NORMAL, EV_VIEW_CURSOR_LINK, EV_VIEW_CURSOR_WAIT, - EV_VIEW_CURSOR_HIDDEN + EV_VIEW_CURSOR_HIDDEN, + EV_VIEW_CURSOR_DRAG } EvViewCursor; #define ZOOM_IN_FACTOR 1.2 @@ -84,6 +80,18 @@ typedef enum { #define MIN_SCALE 0.05409 #define MAX_SCALE 6.0 +typedef struct { + EvRectangle rect; + int page; +} EvViewSelection; + +typedef struct { + gboolean dragging; + GdkPoint start; + gdouble hadj; + gdouble vadj; +} DragInfo; + struct _EvView { GtkWidget parent_instance; @@ -97,10 +105,10 @@ struct _EvView { int scroll_x; int scroll_y; + DragInfo drag_info; gboolean pressed_button; - gboolean has_selection; GdkPoint selection_start; - EvRectangle selection; + GList *selections; EvViewCursor cursor; GtkAdjustment *hadjustment; @@ -121,11 +129,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 +158,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 +235,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 +270,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 +287,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 +314,14 @@ 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); +} + +static void +clear_selection (EvView *view) +{ + g_list_foreach (view->selections, (GFunc)g_free, NULL); + view->selections = NULL; } /*** Virtual function implementations ***/ @@ -309,6 +336,8 @@ ev_view_finalize (GObject *object) g_free (view->status); g_free (view->find_status); + clear_selection (view); + G_OBJECT_CLASS (ev_view_parent_class)->finalize (object); } @@ -331,64 +360,189 @@ ev_view_destroy (GtkObject *object) } static void -ev_view_get_offsets (EvView *view, int *x_offset, int *y_offset) +compute_border (EvView *view, int width, int height, GtkBorder *border) { - EvDocument *document = view->document; - GtkWidget *widget = GTK_WIDGET (view); - int width, height, target_width, target_height; + 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); + } +} + +static gboolean +get_page_extents (EvView *view, + gint page, + GdkRectangle *page_area, + GtkBorder *border) +{ + GtkWidget *widget; + int width, height; - g_return_if_fail (EV_IS_DOCUMENT (document)); + widget = GTK_WIDGET (view); - ev_page_cache_get_size (view->page_cache, - view->current_page, + /* 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; - *x_offset = view->spacing; - *y_offset = view->spacing; - 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); + /* 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 -view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, EvRectangle *doc_rect) +view_rect_to_doc_rect (EvView *view, + GdkRectangle *view_rect, + GdkRectangle *page_area, + EvRectangle *doc_rect) { - int x_offset, y_offset; - - 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; + doc_rect->x1 = floor ((view_rect->x - page_area->x) / view->scale); + doc_rect->y1 = floor ((view_rect->y - page_area->y) / view->scale); + doc_rect->x2 = doc_rect->x1 + ceil (view_rect->width / view->scale); + doc_rect->y2 = doc_rect->y1 + ceil (view_rect->height / view->scale); } static void -doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_rect) +compute_selections (EvView *view, GdkRectangle *view_rect) { - int x_offset, y_offset; + int n_pages, i; - 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; + clear_selection (view); + + n_pages = ev_page_cache_get_n_pages (view->page_cache); + for (i = 0; i < n_pages; i++) { + GdkRectangle page_area; + GtkBorder border; + + if (get_page_extents (view, i, &page_area, &border)) { + GdkRectangle overlap; + + if (gdk_rectangle_intersect (&page_area, view_rect, &overlap)) { + EvViewSelection *selection; + + selection = g_new0 (EvViewSelection, 1); + selection->page = i; + view_rect_to_doc_rect (view, &overlap, &page_area, + &(selection->rect)); + + view->selections = g_list_append + (view->selections, selection); + } + } + } } static void -compute_border (EvView *view, int width, int height, GtkBorder *border) +doc_rect_to_view_rect (EvView *view, + int page, + EvRectangle *doc_rect, + GdkRectangle *view_rect) { - if (view->show_border) { - ev_document_misc_get_page_border_size (width, height, border); - } else { - border->left = 0; - border->right = 0; - border->top = 0; - border->bottom = 0; - } + GdkRectangle page_area; + GtkBorder border; + int width, height; + + get_page_extents (view, page, &page_area, &border); + + width = doc_rect->x2 - doc_rect->x1; + height = doc_rect->y2 - doc_rect->y1; + view_rect->x = floor (doc_rect->x1 * view->scale) + page_area.x; + view_rect->y = floor (doc_rect->y1 * view->scale) + page_area.y; + view_rect->width = ceil (width * view->scale); + view_rect->height = ceil (height * view->scale); } static void @@ -629,7 +783,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,7 +810,36 @@ ev_view_unrealize (GtkWidget *widget) GTK_WIDGET_CLASS (ev_view_parent_class)->unrealize (widget); } -#if 0 +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; +} + static guint32 ev_gdk_color_to_rgb (const GdkColor *color) { @@ -702,7 +888,7 @@ draw_rubberband (GtkWidget *widget, GdkWindow *window, static void -highlight_find_results (EvView *view) +highlight_find_results (EvView *view, int page) { EvDocumentFind *find; int i, results = 0; @@ -711,134 +897,26 @@ highlight_find_results (EvView *view) find = EV_DOCUMENT_FIND (view->document); - results = ev_document_find_get_n_results (find, view->current_page); + results = ev_document_find_get_n_results (find, page); for (i = 0; i < results; i++) { EvRectangle rectangle; GdkRectangle view_rectangle; guchar alpha; - alpha = (i == view->find_result) ? 0x90 : 0x20; - ev_document_find_get_result (find, view->current_page, + if (i == view->find_result && page == view->find_page) { + alpha = 0x90; + } else { + alpha = 0x20; + } + + ev_document_find_get_result (find, page, i, &rectangle); - doc_rect_to_view_rect (view, &rectangle, &view_rectangle); + doc_rect_to_view_rect (view, page, &rectangle, &view_rectangle); draw_rubberband (GTK_WIDGET (view), view->bin_window, &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 draw_one_page (EvView *view, @@ -862,11 +940,6 @@ 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); - /* Render the document itself */ real_page_area = *page_area; @@ -878,7 +951,12 @@ draw_one_page (EvView *view, if (! gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) return; + ev_document_misc_paint_one_page (view->bin_window, + GTK_WIDGET (view), + page_area, border); + 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) && @@ -907,6 +985,8 @@ static void ev_view_bin_expose (EvView *view, GdkEventExpose *event) { + GdkRectangle rubberband; + GList *l; int i; if (view->document == NULL) @@ -918,24 +998,24 @@ ev_view_bin_expose (EvView *view, 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); + if (EV_IS_DOCUMENT_FIND (view->document)) { + highlight_find_results (view, i); + } } - if (view->has_selection) { - GdkRectangle rubberband; + for (l = view->selections; l != NULL; l = l->next) { + EvViewSelection *selection = (EvViewSelection *)l->data; - doc_rect_to_view_rect (view, &view->selection, &rubberband); + doc_rect_to_view_rect (view, selection->page, + &selection->rect, &rubberband); if (rubberband.width > 0 && rubberband.height > 0) { draw_rubberband (GTK_WIDGET (view), view->bin_window, &rubberband, 0x40); } } -#endif } static gboolean @@ -953,30 +1033,56 @@ ev_view_expose_event (GtkWidget *widget, } void -ev_view_select_all (EvView *ev_view) +ev_view_select_all (EvView *view) { - GtkWidget *widget = GTK_WIDGET (ev_view); - GdkRectangle selection; - int width, height; - int x_offset, y_offset; + int n_pages, i; + + clear_selection (view); - g_return_if_fail (EV_IS_VIEW (ev_view)); + n_pages = ev_page_cache_get_n_pages (view->page_cache); + for (i = 0; i < n_pages; i++) { + int width, height; + EvViewSelection *selection; + ev_page_cache_get_size (view->page_cache, + i, 1.0, &width, &height); - ev_view_get_offsets (ev_view, &x_offset, &y_offset); - ev_page_cache_get_size (ev_view->page_cache, - ev_view->current_page, - ev_view->scale, - &width, &height); + selection = g_new0 (EvViewSelection, 1); + selection->page = i; + selection->rect.x1 = selection->rect.y1 = 0; + selection->rect.x2 = width; + selection->rect.y2 = height; + + view->selections = g_list_append (view->selections, selection); + } + + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + +static char * +get_selected_text (EvView *ev_view) +{ + GString *text; + GList *l; + + text = g_string_new (NULL); + + ev_document_doc_mutex_lock (); - ev_view->has_selection = TRUE; - 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); + for (l = ev_view->selections; l != NULL; l = l->next) { + EvViewSelection *selection = (EvViewSelection *)l->data; + char *tmp; + + tmp = ev_document_get_text (ev_view->document, + selection->page, + &selection->rect); + g_string_append (text, tmp); + g_free (tmp); + } + + ev_document_doc_mutex_unlock (); - gtk_widget_queue_draw (widget); + return g_string_free (text, FALSE); } void @@ -989,12 +1095,7 @@ ev_view_copy (EvView *ev_view) 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 (); - + text = get_selected_text (ev_view); clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view), GDK_SELECTION_CLIPBOARD); gtk_clipboard_set_text (clipboard, text, -1); @@ -1014,21 +1115,18 @@ ev_view_primary_get_cb (GtkClipboard *clipboard, 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 (); + text = get_selected_text (ev_view); gtk_selection_data_set_text (selection_data, text, -1); + g_free (text); } static void ev_view_primary_clear_cb (GtkClipboard *clipboard, gpointer data) { - EvView *ev_view = EV_VIEW (data); + EvView *view = EV_VIEW (data); - ev_view->has_selection = FALSE; + clear_selection (view); } static void @@ -1039,7 +1137,7 @@ ev_view_update_primary_selection (EvView *ev_view) clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view), GDK_SELECTION_PRIMARY); - if (ev_view->has_selection) { + if (ev_view->selections) { if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets), @@ -1053,6 +1151,58 @@ ev_view_update_primary_selection (EvView *ev_view) } } +static GdkCursor * +ev_view_create_invisible_cursor(void) +{ + GdkBitmap *empty; + GdkColor black = { 0, 0, 0, 0 }; + static char bits[] = { 0x00 }; + + empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1); + + return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0); +} + +static void +ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) +{ + GdkCursor *cursor = NULL; + GdkDisplay *display; + GtkWidget *widget; + + if (view->cursor == new_cursor) { + return; + } + + widget = gtk_widget_get_toplevel (GTK_WIDGET (view)); + display = gtk_widget_get_display (widget); + view->cursor = new_cursor; + + switch (new_cursor) { + case EV_VIEW_CURSOR_NORMAL: + gdk_window_set_cursor (widget->window, NULL); + break; + case EV_VIEW_CURSOR_LINK: + cursor = gdk_cursor_new_for_display (display, GDK_HAND2); + break; + case EV_VIEW_CURSOR_WAIT: + cursor = gdk_cursor_new_for_display (display, GDK_WATCH); + break; + case EV_VIEW_CURSOR_HIDDEN: + cursor = ev_view_create_invisible_cursor (); + break; + case EV_VIEW_CURSOR_DRAG: + cursor = gdk_cursor_new_for_display (display, GDK_FLEUR); + break; + } + + if (cursor) { + gdk_window_set_cursor (widget->window, cursor); + gdk_cursor_unref (cursor); + gdk_flush(); + } +} + static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event) @@ -1067,17 +1217,28 @@ ev_view_button_press_event (GtkWidget *widget, switch (event->button) { case 1: - if (view->has_selection) { - view->has_selection = FALSE; + if (view->selections) { + clear_selection (view); gtk_widget_queue_draw (widget); } view->selection_start.x = event->x; view->selection_start.y = event->y; - break; + return TRUE; + case 2: + /* use root coordinates as reference point because + * scrolling changes window relative coordinates */ + view->drag_info.start.x = event->x_root; + view->drag_info.start.y = event->y_root; + view->drag_info.hadj = gtk_adjustment_get_value (view->hadjustment); + view->drag_info.vadj = gtk_adjustment_get_value (view->vadjustment); + + ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG); + + return TRUE; } - return TRUE; + return FALSE; } static char * @@ -1131,57 +1292,6 @@ ev_view_set_find_status (EvView *view, const char *message) g_object_notify (G_OBJECT (view), "find-status"); } -static GdkCursor * -ev_view_create_invisible_cursor(void) -{ - GdkBitmap *empty; - GdkColor black = { 0, 0, 0, 0 }; - static char bits[] = { 0x00 }; - - empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1); - - return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0); -} - -static void -ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) -{ - GdkCursor *cursor = NULL; - GdkDisplay *display; - GtkWidget *widget; - - if (view->cursor == new_cursor) { - return; - } - - widget = gtk_widget_get_toplevel (GTK_WIDGET (view)); - display = gtk_widget_get_display (widget); - view->cursor = new_cursor; - - switch (new_cursor) { - case EV_VIEW_CURSOR_NORMAL: - gdk_window_set_cursor (widget->window, NULL); - break; - case EV_VIEW_CURSOR_LINK: - cursor = gdk_cursor_new_for_display (display, GDK_HAND2); - break; - case EV_VIEW_CURSOR_WAIT: - cursor = gdk_cursor_new_for_display (display, GDK_WATCH); - break; - case EV_VIEW_CURSOR_HIDDEN: - cursor = ev_view_create_invisible_cursor (); - break; - - } - - if (cursor) { - gdk_window_set_cursor (widget->window, cursor); - gdk_cursor_unref (cursor); - gdk_flush(); - } -} - - static void find_page_at_location (EvView *view, gdouble x, @@ -1249,18 +1359,56 @@ ev_view_motion_notify_event (GtkWidget *widget, { EvView *view = EV_VIEW (widget); - if (view->pressed_button > 0) { + if (view->pressed_button == 1) { GdkRectangle selection; - view->has_selection = TRUE; selection.x = MIN (view->selection_start.x, event->x); selection.y = MIN (view->selection_start.y, event->y); selection.width = ABS (view->selection_start.x - event->x) + 1; selection.height = ABS (view->selection_start.y - event->y) + 1; - view_rect_to_doc_rect (view, &selection, &view->selection); + + compute_selections (view, &selection); gtk_widget_queue_draw (widget); - } else if (view->document) { + + return TRUE; + } else if (view->pressed_button == 2) { + if (!view->drag_info.dragging) { + gboolean start; + + start = gtk_drag_check_threshold (widget, + view->drag_info.start.x, + view->drag_info.start.y, + event->x_root, + event->y_root); + view->drag_info.dragging = start; + } + + if (view->drag_info.dragging) { + int dx, dy; + gdouble dhadj_value, dvadj_value; + + 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; + + /* 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)); + gtk_adjustment_set_value (view->vadjustment, + MIN(view->drag_info.vadj - dvadj_value, + view->vadjustment->upper - + view->vadjustment->page_size)); + + return TRUE; + } + } else if (view->pressed_button <= 0 && view->document) { EvLink *link; link = get_link_at_location (view, event->x, event->y); @@ -1277,9 +1425,10 @@ ev_view_motion_notify_event (GtkWidget *widget, ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } } + return TRUE; } - return TRUE; + return FALSE; } /* FIXME: standardize this sometime */ @@ -1313,9 +1462,14 @@ ev_view_button_release_event (GtkWidget *widget, { EvView *view = EV_VIEW (widget); + if (view->pressed_button == 2) { + ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); + } + view->pressed_button = -1; + view->drag_info.dragging = FALSE; - if (view->has_selection) { + if (view->selections) { ev_view_update_primary_selection (view); } else if (view->document) { EvLink *link; @@ -1396,26 +1550,9 @@ add_scroll_binding_keypad (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) +void +ev_view_scroll (EvView *view, + EvScrollType scroll) { GtkAdjustment *adjustment; double value, increment; @@ -1476,8 +1613,6 @@ 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; @@ -1524,8 +1659,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)); @@ -1560,8 +1695,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); @@ -1594,6 +1729,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; @@ -1651,10 +1787,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, @@ -1683,9 +1819,6 @@ ev_view_class_init (EvViewClass *class) 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 @@ -1693,17 +1826,17 @@ 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->drag_info.dragging = FALSE; view->continuous = TRUE; view->dual_page = FALSE; view->presentation = FALSE; - view->full_screen = FALSE; + view->fullscreen = FALSE; view->sizing_mode = EV_SIZING_FIT_WIDTH; } @@ -1712,15 +1845,12 @@ update_find_status_message (EvView *view) { char *message; -// ev_document_doc_mutex_lock (); if (view->current_page == view->find_page) { int results; -// ev_document_doc_mutex_lock (); results = ev_document_find_get_n_results (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. */ @@ -1790,18 +1920,19 @@ jump_to_find_result (EvView *view) EvRectangle rect; GdkRectangle view_rect; int n_results; + int page = view->find_page; ev_document_doc_mutex_lock (); - n_results = ev_document_find_get_n_results (find, view->current_page); + n_results = ev_document_find_get_n_results (find, page); ev_document_doc_mutex_unlock (); if (n_results > view->find_result) { ev_document_doc_mutex_lock (); ev_document_find_get_result - (find, view->current_page, view->find_result, &rect); + (find, page, view->find_result, &rect); ev_document_doc_mutex_unlock (); - doc_rect_to_view_rect (view, &rect, &view_rect); + doc_rect_to_view_rect (view, page, &rect, &view_rect); ensure_rectangle_is_visible (view, &view_rect); } } @@ -1822,7 +1953,6 @@ jump_to_find_page (EvView *view) page = page - n_pages; } - // ev_document_doc_mutex_lock (); has_results = ev_document_find_page_has_results (EV_DOCUMENT_FIND (view->document), page); if (has_results == -1) { @@ -1885,7 +2015,6 @@ page_changed_cb (EvPageCache *page_cache, &old_width, &old_height); view->current_page = new_page; - view->has_selection = FALSE; ev_page_cache_get_size (page_cache, new_page, @@ -1962,10 +2091,10 @@ ev_view_set_document (EvView *view, } #define EPSILON 0.0000001 -static void -ev_view_zoom (EvView *view, - double factor, - gboolean relative) +void +ev_view_set_zoom (EvView *view, + double factor, + gboolean relative) { double scale; @@ -1982,6 +2111,11 @@ ev_view_zoom (EvView *view, gtk_widget_queue_resize (GTK_WIDGET (view)); } +double +ev_view_get_zoom (EvView *view) +{ + return view->scale; +} void ev_view_set_continuous (EvView *view, @@ -2020,19 +2154,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 @@ -2043,28 +2185,54 @@ 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"); } +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) @@ -2083,7 +2251,7 @@ ev_view_zoom_in (EvView *view) { g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); - ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE); + ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE); } void @@ -2091,7 +2259,7 @@ ev_view_zoom_out (EvView *view) { g_return_if_fail (view->sizing_mode == EV_SIZING_FREE); - ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE); + ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE); } @@ -2135,6 +2303,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_set_zoom (view, scale, FALSE); +} + static void ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, int width, @@ -2156,7 +2342,7 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, doc_width = doc_width * 2; width -= (2 * (border.left + border.right) + 3 * 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 @@ -2168,7 +2354,7 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view, else g_assert_not_reached (); - ev_view_zoom (view, scale, FALSE); + ev_view_set_zoom (view, scale, FALSE); } static void @@ -2191,7 +2377,7 @@ 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 @@ -2203,7 +2389,7 @@ ev_view_zoom_for_size_continuous (EvView *view, else g_assert_not_reached (); - ev_view_zoom (view, scale, FALSE); + ev_view_set_zoom (view, scale, FALSE); } static void @@ -2250,7 +2436,7 @@ ev_view_zoom_for_size_dual_page (EvView *view, else g_assert_not_reached (); - ev_view_zoom (view, scale, FALSE); + ev_view_set_zoom (view, scale, FALSE); } static void @@ -2282,14 +2468,14 @@ ev_view_zoom_for_size_single_page (EvView *view, else g_assert_not_reached (); - ev_view_zoom (view, scale, FALSE); + ev_view_set_zoom (view, scale, FALSE); } void ev_view_zoom_normal (EvView *view) { - ev_view_zoom (view, 1.0, FALSE); + ev_view_set_zoom (view, 1.0, FALSE); } void @@ -2307,7 +2493,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); @@ -2411,6 +2599,7 @@ ev_view_find_previous (EvView *view) gtk_widget_queue_draw (GTK_WIDGET (view)); } } + void ev_view_hide_cursor (EvView *view) {