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=98be15fd92d90f85b4a66e6bc7be82099bf10b7c;hb=d09bf63180e0fd1ef51c5e537fff9c4a556aa6e4;hp=04f052af5a199a28dcd5981199bc80d17cbddefc;hpb=5e2fe6124f89d26435a4ae3cc3de882f5082609d;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 04f052af..98be15fd 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 @@ -34,13 +35,15 @@ #include "ev-utils.h" #include "ev-selection.h" #include "ev-document-links.h" +#include "ev-document-images.h" #include "ev-document-find.h" +#include "ev-document-transition.h" #include "ev-document-misc.h" -#include "ev-debug.h" #include "ev-job-queue.h" #include "ev-page-cache.h" #include "ev-pixbuf-cache.h" #include "ev-tooltip.h" +#include "ev-application.h" #define EV_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass)) #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW)) @@ -69,6 +72,12 @@ enum { N_SIGNALS, }; +enum { + TARGET_DND_URI, + TARGET_DND_TEXT, + TARGET_DND_IMAGE +}; + enum { TARGET_STRING, TARGET_TEXT, @@ -77,13 +86,17 @@ enum { TARGET_TEXT_BUFFER_CONTENTS }; -static const GtkTargetEntry targets[] = { +static const GtkTargetEntry clipboard_targets[] = { { "STRING", 0, TARGET_STRING }, { "TEXT", 0, TARGET_TEXT }, { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, { "UTF8_STRING", 0, TARGET_UTF8_STRING }, }; +static const GtkTargetEntry view_drop_targets[] = { + { "text/uri-list", 0, 0 } +}; + static guint signals[N_SIGNALS]; typedef enum { @@ -109,9 +122,6 @@ static void view_update_range_and_current_page (EvView static void set_scroll_adjustment (EvView *view, GtkOrientation orientation, GtkAdjustment *adjustment); -static void ev_view_set_scroll_adjustments (EvView *view, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); static void add_scroll_binding_keypad (GtkBindingSet *binding_set, guint keyval, GdkModifierType modifiers, @@ -311,6 +321,10 @@ static void ev_view_primary_clear_cb (GtkClipboard gpointer data); static void ev_view_update_primary_selection (EvView *ev_view); +/*** Presentation ***/ +static void ev_view_presentation_transition_start (EvView *ev_view); +static void ev_view_presentation_transition_stop (EvView *ev_view); + G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET) @@ -1051,6 +1065,47 @@ location_in_selected_text (EvView *view, return FALSE; } +static gboolean +get_doc_point_from_offset (EvView *view, + gint page, + gint x_offset, + gint y_offset, + gint *x_new, + gint *y_new) +{ + int width, height; + double x, y; + + ev_page_cache_get_size (view->page_cache, page, + view->rotation, + 1.0, + &width, &height); + + x_offset = x_offset / view->scale; + y_offset = y_offset / view->scale; + + if (view->rotation == 0) { + x = x_offset; + y = y_offset; + } else if (view->rotation == 90) { + x = y_offset; + y = width - x_offset; + } else if (view->rotation == 180) { + x = width - x_offset; + y = height - y_offset; + } else if (view->rotation == 270) { + x = height - y_offset; + y = x_offset; + } else { + g_assert_not_reached (); + } + + *x_new = x; + *y_new = y; + + return TRUE; +} + /*** Hyperref ***/ static EvLink * ev_view_get_link_at_location (EvView *view, @@ -1059,7 +1114,11 @@ ev_view_get_link_at_location (EvView *view, { gint page = -1; gint x_offset = 0, y_offset = 0; + gint x_new = 0, y_new = 0; GList *link_mapping; + + if (!EV_IS_DOCUMENT_LINKS (view->document)) + return NULL; x += view->scroll_x; y += view->scroll_y; @@ -1069,10 +1128,15 @@ ev_view_get_link_at_location (EvView *view, if (page == -1) return NULL; + + if (get_doc_point_from_offset (view, page, x_offset, + y_offset, &x_new, &y_new) == FALSE) + return NULL; + link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page); if (link_mapping) - return ev_link_mapping_find (link_mapping, x_offset / view->scale, y_offset / view->scale); + return ev_link_mapping_find (link_mapping, x_new, y_new); else return NULL; } @@ -1206,13 +1270,15 @@ static void goto_dest (EvView *view, EvLinkDest *dest) { EvLinkDestType type; - int page, n_pages; + int page, n_pages, current_page; page = ev_link_dest_get_page (dest); n_pages = ev_page_cache_get_n_pages (view->page_cache); if (page < 0 || page >= n_pages) return; + + current_page = view->current_page; type = ev_link_dest_get_dest_type (dest); @@ -1241,6 +1307,10 @@ goto_dest (EvView *view, EvLinkDest *dest) default: g_assert_not_reached (); } + + if (current_page != view->current_page) + ev_page_cache_set_current_page (view->page_cache, + view->current_page); } void @@ -1444,6 +1514,40 @@ handle_link_over_xy (EvView *view, gint x, gint y) return; } +/*** Images ***/ +static EvImage * +ev_view_get_image_at_location (EvView *view, + gdouble x, + gdouble y) +{ + gint page = -1; + gint x_offset = 0, y_offset = 0; + gint x_new = 0, y_new = 0; + GList *image_mapping; + + if (!EV_IS_DOCUMENT_IMAGES (view->document)) + return NULL; + + x += view->scroll_x; + y += view->scroll_y; + + find_page_at_location (view, x, y, &page, &x_offset, &y_offset); + + if (page == -1) + return NULL; + + if (get_doc_point_from_offset (view, page, x_offset, + y_offset, &x_new, &y_new) == FALSE) + return NULL; + + image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page); + + if (image_mapping) + return ev_image_mapping_find (image_mapping, x_new, y_new); + else + return NULL; +} + /*** GtkWidget implementation ***/ static void @@ -1600,6 +1704,8 @@ ev_view_size_allocate (GtkWidget *widget, { EvView *view = EV_VIEW (widget); + GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); + if (view->sizing_mode == EV_SIZING_FIT_WIDTH || view->sizing_mode == EV_SIZING_BEST_FIT) { @@ -1616,8 +1722,6 @@ ev_view_size_allocate (GtkWidget *widget, view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->pending_resize = FALSE; - - GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); } static void @@ -1628,7 +1732,6 @@ ev_view_realize (GtkWidget *widget) 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); @@ -1746,9 +1849,9 @@ draw_end_presentation_page (EvView *view, PangoLayout *layout; PangoFontDescription *font_desc; gchar *markup; - const gchar *text = _("End of presentation, press Escape to exit."); + const gchar *text = _("End of presentation. Press Escape to exit."); - if (!view->end_presentation) + if (view->presentation_state != EV_PRESENTATION_END) return; layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL); @@ -1782,15 +1885,24 @@ ev_view_expose_event (GtkWidget *widget, EvView *view = EV_VIEW (widget); int i; - if (view->end_presentation) { - GdkRectangle area = {0}; - - area.width = widget->allocation.width; - area.height = widget->allocation.height; - - draw_end_presentation_page (view, &area); + if (view->presentation) { + switch (view->presentation_state) { + case EV_PRESENTATION_END: { + GdkRectangle area = {0}; - return FALSE; + area.width = widget->allocation.width; + area.height = widget->allocation.height; + + draw_end_presentation_page (view, &area); + } + return FALSE; + case EV_PRESENTATION_BLACK: + case EV_PRESENTATION_WHITE: + return FALSE; + case EV_PRESENTATION_NORMAL: + default: + break; + } } if (view->loading) { @@ -1827,17 +1939,38 @@ ev_view_expose_event (GtkWidget *widget, return FALSE; } +static gboolean +ev_view_do_popup_menu (EvView *view, + gdouble x, + gdouble y) +{ + EvLink *link; + EvImage *image; + + image = ev_view_get_image_at_location (view, x, y); + if (image) { + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image); + return TRUE; + } + + link = ev_view_get_link_at_location (view, x, y); + if (link) { + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); + return TRUE; + } + + g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL); + + return TRUE; +} + static gboolean ev_view_popup_menu (GtkWidget *widget) { - gint x, y; - EvLink *link; - EvView *view = EV_VIEW (widget); - - gtk_widget_get_pointer (widget, &x, &y); - link = ev_view_get_link_at_location (view, x, y); - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); - return TRUE; + gint x, y; + + gtk_widget_get_pointer (widget, &x, &y); + return ev_view_do_popup_menu (EV_VIEW (widget), x, y); } static gboolean @@ -1845,7 +1978,6 @@ ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event) { EvView *view = EV_VIEW (widget); - EvLink *link; if (!GTK_WIDGET_HAS_FOCUS (widget)) { gtk_widget_grab_focus (widget); @@ -1855,7 +1987,9 @@ ev_view_button_press_event (GtkWidget *widget, view->selection_info.in_drag = FALSE; switch (event->button) { - case 1: + case 1: { + EvImage *image; + if (view->selection_info.selections) { if (location_in_selected_text (view, event->x + view->scroll_x, @@ -1866,11 +2000,19 @@ ev_view_button_press_event (GtkWidget *widget, } gtk_widget_queue_draw (widget); + } else if ((image = ev_view_get_image_at_location (view, event->x, event->y))) { + if (view->image_dnd_info.image) + g_object_unref (view->image_dnd_info.image); + view->image_dnd_info.image = g_object_ref (image); + view->image_dnd_info.in_drag = TRUE; + + view->image_dnd_info.start.x = event->x + view->scroll_x; + view->image_dnd_info.start.y = event->y + view->scroll_y; } view->selection_info.start.x = event->x + view->scroll_x; view->selection_info.start.y = event->y + view->scroll_y; - + } return TRUE; case 2: /* use root coordinates as reference point because @@ -1884,14 +2026,13 @@ ev_view_button_press_event (GtkWidget *widget, return TRUE; case 3: - link = ev_view_get_link_at_location (view, event->x, event->y); - g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link); - return TRUE; + return ev_view_do_popup_menu (view, event->x, event->y); } return FALSE; } +/*** Drag and Drop ***/ static void ev_view_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -1901,18 +2042,95 @@ ev_view_drag_data_get (GtkWidget *widget, { EvView *view = EV_VIEW (widget); - if (view->selection_info.selections && - ev_document_can_get_text (view->document)) { - gchar *text; + switch (info) { + case TARGET_DND_TEXT: + if (view->selection_info.selections && + ev_document_can_get_text (view->document)) { + gchar *text; - text = get_selected_text (view); + text = get_selected_text (view); + + gtk_selection_data_set_text (selection_data, + text, + strlen (text)); + + g_free (text); + } + break; + case TARGET_DND_IMAGE: + if (view->image_dnd_info.image) { + GdkPixbuf *pixbuf; - gtk_selection_data_set_text (selection_data, text, strlen (text)); + pixbuf = ev_image_get_pixbuf (view->image_dnd_info.image); + gtk_selection_data_set_pixbuf (selection_data, pixbuf); + } + break; + case TARGET_DND_URI: + if (view->image_dnd_info.image) { + const gchar *tmp_uri; + gchar **uris; + + tmp_uri = ev_image_save_tmp (view->image_dnd_info.image); + + uris = g_new0 (gchar *, 2); + uris[0] = (gchar *)tmp_uri; + + gtk_selection_data_set_uris (selection_data, uris); - g_free (text); + /* g_free instead of g_strfreev since tmp_uri is const */ + g_free (uris); + } } } +static gboolean +ev_view_drag_motion (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time) +{ + if (gtk_drag_get_source_widget (context) == widget) + gdk_drag_status (context, 0, time); + else + gdk_drag_status (context, context->suggested_action, time); + + return TRUE; +} + +static void +ev_view_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time) +{ + gchar **uris; + gint i = 0; + GSList *uri_list = NULL; + + uris = gtk_selection_data_get_uris (selection_data); + if (!uris) { + gtk_drag_finish (context, FALSE, FALSE, time); + return; + } + + for (i = 0; uris[i]; i++) { + uri_list = g_slist_prepend (uri_list, (gpointer) uris[i]); + } + + ev_application_open_uri_list (EV_APP, uri_list, + gtk_widget_get_screen (widget), + 0); + gtk_drag_finish (context, TRUE, FALSE, time); + + g_strfreev (uris); + g_slist_free (uri_list); +} + + static gboolean selection_update_idle_cb (EvView *view) { @@ -1980,19 +2198,38 @@ ev_view_motion_notify_event (GtkWidget *widget, view->selection_info.start.x, view->selection_info.start.y, x, y)) { - GdkDragContext *context; GtkTargetList *target_list = gtk_target_list_new (NULL, 0); - gtk_target_list_add_text_targets (target_list, 0); + gtk_target_list_add_text_targets (target_list, TARGET_DND_TEXT); - context = gtk_drag_begin (widget, target_list, - GDK_ACTION_COPY, - 1, (GdkEvent *)event); + gtk_drag_begin (widget, target_list, + GDK_ACTION_COPY, + 1, (GdkEvent *)event); view->selection_info.in_drag = FALSE; gtk_target_list_unref (target_list); + return TRUE; + } + } else if (view->image_dnd_info.in_drag) { + if (gtk_drag_check_threshold (widget, + view->selection_info.start.x, + view->selection_info.start.y, + x, y)) { + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); + + gtk_target_list_add_uri_targets (target_list, TARGET_DND_URI); + gtk_target_list_add_image_targets (target_list, TARGET_DND_IMAGE, TRUE); + + gtk_drag_begin (widget, target_list, + GDK_ACTION_COPY, + 1, (GdkEvent *)event); + + view->image_dnd_info.in_drag = FALSE; + + gtk_target_list_unref (target_list); + return TRUE; } } @@ -2058,11 +2295,7 @@ ev_view_motion_notify_event (GtkWidget *widget, return TRUE; } - /* For the Evince 0.4.x release, we limit links to un-rotated documents - * only. - */ - } else if (view->pressed_button <= 0 && - view->rotation == 0) { + } else if (view->pressed_button <= 0) { handle_link_over_xy (view, x, y); return TRUE; } @@ -2089,6 +2322,7 @@ ev_view_button_release_event (GtkWidget *widget, view->pressed_button = -1; view->drag_info.in_drag = FALSE; + view->image_dnd_info.in_drag = FALSE; if (view->selection_scroll_id) { g_source_remove (view->selection_scroll_id); @@ -2124,6 +2358,274 @@ ev_view_button_release_event (GtkWidget *widget, return FALSE; } +/* Goto Window */ +/* Cut and paste from gtkwindow.c */ +static void +send_focus_change (GtkWidget *widget, + gboolean in) +{ + GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); + + g_object_ref (widget); + + if (in) + GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); + else + GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); + + fevent->focus_change.type = GDK_FOCUS_CHANGE; + fevent->focus_change.window = g_object_ref (widget->window); + fevent->focus_change.in = in; + + gtk_widget_event (widget, fevent); + + g_object_notify (G_OBJECT (widget), "has-focus"); + + g_object_unref (widget); + gdk_event_free (fevent); +} + +static void +ev_view_goto_window_hide (EvView *view) +{ + /* send focus-in event */ + send_focus_change (view->goto_entry, FALSE); + gtk_widget_hide (view->goto_window); + gtk_entry_set_text (GTK_ENTRY (view->goto_entry), ""); +} + +static gboolean +ev_view_goto_window_delete_event (GtkWidget *widget, + GdkEventAny *event, + EvView *view) +{ + ev_view_goto_window_hide (view); + + return TRUE; +} + +static gboolean +key_is_numeric (guint keyval) +{ + return ((keyval >= GDK_0 && keyval <= GDK_9) || + (keyval >= GDK_KP_0 && keyval <= GDK_KP_9)); +} + +static gboolean +ev_view_goto_window_key_press_event (GtkWidget *widget, + GdkEventKey *event, + EvView *view) +{ + switch (event->keyval) { + case GDK_Escape: + case GDK_Tab: + case GDK_KP_Tab: + case GDK_ISO_Left_Tab: + ev_view_goto_window_hide (view); + return TRUE; + case GDK_Return: + case GDK_KP_Enter: + case GDK_ISO_Enter: + return FALSE; + default: + if (!key_is_numeric (event->keyval)) + return TRUE; + } + + return FALSE; +} + +static gboolean +ev_view_goto_window_button_press_event (GtkWidget *widget, + GdkEventButton *event, + EvView *view) +{ + ev_view_goto_window_hide (view); + + return TRUE; +} + +static void +ev_view_goto_entry_activate (GtkEntry *entry, + EvView *view) +{ + const gchar *text; + gint page; + + text = gtk_entry_get_text (entry); + page = atoi (text) - 1; + + ev_view_goto_window_hide (view); + + if (page >= 0 && + page < ev_page_cache_get_n_pages (view->page_cache)) + ev_page_cache_set_current_page (view->page_cache, page); +} + +static void +ev_view_goto_window_create (EvView *view) +{ + GtkWidget *frame, *hbox, *toplevel, *label; + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); + + if (view->goto_window) { + if (GTK_WINDOW (toplevel)->group) + gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, + GTK_WINDOW (view->goto_window)); + else if (GTK_WINDOW (view->goto_window)->group) + gtk_window_group_remove_window (GTK_WINDOW (view->goto_window)->group, + GTK_WINDOW (view->goto_window)); + return; + } + + view->goto_window = gtk_window_new (GTK_WINDOW_POPUP); + + if (GTK_WINDOW (toplevel)->group) + gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, + GTK_WINDOW (view->goto_window)); + + gtk_window_set_modal (GTK_WINDOW (view->goto_window), TRUE); + + g_signal_connect (view->goto_window, "delete_event", + G_CALLBACK (ev_view_goto_window_delete_event), + view); + g_signal_connect (view->goto_window, "key_press_event", + G_CALLBACK (ev_view_goto_window_key_press_event), + view); + g_signal_connect (view->goto_window, "button_press_event", + G_CALLBACK (ev_view_goto_window_button_press_event), + view); + + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add (GTK_CONTAINER (view->goto_window), frame); + gtk_widget_show (frame); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 3); + gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_widget_show (hbox); + + label = gtk_label_new(_("Jump to page:")); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 3); + gtk_widget_show (label); + gtk_widget_realize (label); + + view->goto_entry = gtk_entry_new (); + g_signal_connect (view->goto_entry, "activate", + G_CALLBACK (ev_view_goto_entry_activate), + view); + gtk_box_pack_start_defaults (GTK_BOX (hbox), view->goto_entry); + gtk_widget_show (view->goto_entry); + gtk_widget_realize (view->goto_entry); +} + +static void +ev_view_goto_entry_grab_focus (EvView *view) +{ + GtkWidgetClass *entry_parent_class; + + entry_parent_class = g_type_class_peek_parent (GTK_ENTRY_GET_CLASS (view->goto_entry)); + (entry_parent_class->grab_focus) (view->goto_entry); + + send_focus_change (view->goto_entry, TRUE); +} + +static void +ev_view_goto_window_send_key_event (EvView *view, + GdkEvent *event) +{ + GdkEventKey *new_event; + GdkScreen *screen; + + /* Move goto window off screen */ + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + gtk_window_move (GTK_WINDOW (view->goto_window), + gdk_screen_get_width (screen) + 1, + gdk_screen_get_height (screen) + 1); + gtk_widget_show (view->goto_window); + + new_event = (GdkEventKey *) gdk_event_copy (event); + g_object_unref (new_event->window); + new_event->window = g_object_ref (view->goto_window->window); + gtk_widget_realize (view->goto_window); + + gtk_widget_event (view->goto_window, (GdkEvent *)new_event); + gdk_event_free ((GdkEvent *)new_event); + gtk_widget_hide (view->goto_window); +} + +static gboolean +ev_view_key_press_event (GtkWidget *widget, + GdkEventKey *event) +{ + EvView *view = EV_VIEW (widget); + EvPresentationState current; + + if (!view->presentation || + view->presentation_state == EV_PRESENTATION_END) + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + + + current = view->presentation_state; + + switch (event->keyval) { + case GDK_b: + case GDK_B: + view->presentation_state = + (view->presentation_state == EV_PRESENTATION_BLACK) ? + EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK; + break; + case GDK_w: + case GDK_W: + view->presentation_state = + (view->presentation_state == EV_PRESENTATION_WHITE) ? + EV_PRESENTATION_NORMAL : EV_PRESENTATION_WHITE; + break; + default: + if (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE) { + view->presentation_state = EV_PRESENTATION_NORMAL; + } + } + + if (current == view->presentation_state) { + if (ev_page_cache_get_n_pages (view->page_cache) > 1 && + key_is_numeric (event->keyval)) { + gint x, y; + + ev_view_goto_window_create (view); + ev_view_goto_window_send_key_event (view, (GdkEvent *)event); + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + gtk_window_move (GTK_WINDOW (view->goto_window), x, y); + gtk_widget_show (view->goto_window); + ev_view_goto_entry_grab_focus (view); + + return TRUE; + } + + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + } + + switch (view->presentation_state) { + case EV_PRESENTATION_NORMAL: + case EV_PRESENTATION_BLACK: + gdk_window_set_background (widget->window, + &widget->style->black); + break; + case EV_PRESENTATION_WHITE: + gdk_window_set_background (widget->window, + &widget->style->white); + break; + default: + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + } + + gtk_widget_queue_draw (widget); + return TRUE; +} + static gint ev_view_focus_in (GtkWidget *widget, GdkEventFocus *event) @@ -2139,6 +2641,9 @@ static gint ev_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { + if (EV_VIEW (widget)->goto_window) + ev_view_goto_window_hide (EV_VIEW (widget)); + if (EV_VIEW (widget)->pixbuf_cache) ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); gtk_widget_queue_draw (widget); @@ -2269,6 +2774,7 @@ draw_loading_text (EvView *view, GdkRectangle *page_area, GdkRectangle *expose_area) { + const char *loading_text; PangoLayout *layout; PangoFontDescription *font_desc; PangoRectangle logical_rect; @@ -2281,8 +2787,10 @@ draw_loading_text (EvView *view, if (view->presentation) return; - const char *loading_text = _("Loading..."); + loading_text = _("Loading..."); + ev_document_fc_mutex_lock (); + layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text); font_desc = pango_font_description_new (); @@ -2313,6 +2821,8 @@ draw_loading_text (EvView *view, pango_font_description_free (font_desc); g_object_unref (layout); + + ev_document_fc_mutex_unlock (); } static void @@ -2433,13 +2943,15 @@ ev_view_finalize (GObject *object) { EvView *view = EV_VIEW (object); - LOG ("Finalize"); - g_free (view->status); g_free (view->find_status); clear_selection (view); + if (view->image_dnd_info.image) + g_object_unref (view->image_dnd_info.image); + view->image_dnd_info.image = NULL; + G_OBJECT_CLASS (ev_view_parent_class)->finalize (object); } @@ -2463,6 +2975,12 @@ ev_view_destroy (GtkObject *object) view->link_tooltip = NULL; } + if (view->goto_window) { + gtk_widget_destroy (view->goto_window); + view->goto_window = NULL; + view->goto_entry = NULL; + } + if (view->selection_scroll_id) { g_source_remove (view->selection_scroll_id); view->selection_scroll_id = 0; @@ -2473,6 +2991,8 @@ ev_view_destroy (GtkObject *object) view->selection_update_id = 0; } + ev_view_presentation_transition_stop (view); + ev_view_set_scroll_adjustments (view, NULL, NULL); GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object); @@ -2605,6 +3125,7 @@ ev_view_class_init (EvViewClass *class) widget_class->button_press_event = ev_view_button_press_event; widget_class->motion_notify_event = ev_view_motion_notify_event; widget_class->button_release_event = ev_view_button_release_event; + widget_class->key_press_event = ev_view_key_press_event; widget_class->focus_in_event = ev_view_focus_in; widget_class->focus_out_event = ev_view_focus_out; widget_class->get_accessible = ev_view_get_accessible; @@ -2616,6 +3137,8 @@ ev_view_class_init (EvViewClass *class) widget_class->leave_notify_event = ev_view_leave_notify_event; widget_class->style_set = ev_view_style_set; widget_class->drag_data_get = ev_view_drag_data_get; + widget_class->drag_motion = ev_view_drag_motion; + widget_class->drag_data_received = ev_view_drag_data_received; widget_class->popup_menu = ev_view_popup_menu; gtk_object_class->destroy = ev_view_destroy; @@ -2726,20 +3249,20 @@ ev_view_class_init (EvViewClass *class) PROP_ZOOM, g_param_spec_double ("zoom", "Zoom factor", - "Zoom factor", - MIN_SCALE, - MAX_SCALE, - 1.0, - G_PARAM_READWRITE)); + "Zoom factor", + 0, + G_MAXDOUBLE, + 1.0, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_ROTATION, g_param_spec_double ("rotation", "Rotation", - "Rotation", - 0, - 360, - 0, - G_PARAM_READWRITE)); + "Rotation", + 0, + 360, + 0, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_HAS_SELECTION, g_param_spec_boolean ("has-selection", @@ -2778,11 +3301,17 @@ ev_view_init (EvView *view) view->continuous = TRUE; view->dual_page = FALSE; view->presentation = FALSE; - view->end_presentation = FALSE; + view->presentation_state = EV_PRESENTATION_NORMAL; view->fullscreen = FALSE; view->sizing_mode = EV_SIZING_FIT_WIDTH; view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->jump_to_find_result = TRUE; + + gtk_drag_dest_set (GTK_WIDGET (view), + GTK_DEST_DEFAULT_ALL, + view_drop_targets, + G_N_ELEMENTS (view_drop_targets), + GDK_ACTION_COPY); } /*** Callbacks ***/ @@ -2821,6 +3350,8 @@ page_changed_cb (EvPageCache *page_cache, if (view->current_page != new_page) { view->current_page = new_page; view->pending_scroll = SCROLL_TO_PAGE_POSITION; + if (view->presentation) + ev_view_presentation_transition_start (view); gtk_widget_queue_resize (GTK_WIDGET (view)); } else { gtk_widget_queue_draw (GTK_WIDGET (view)); @@ -2959,7 +3490,7 @@ ev_view_set_zoom (EvView *view, else scale = factor; - scale = CLAMP (scale, MIN_SCALE, MAX_SCALE); + scale = CLAMP (scale, view->min_scale, view->max_scale); if (ABS (view->scale - scale) < EPSILON) return; @@ -2978,6 +3509,18 @@ ev_view_get_zoom (EvView *view) return view->scale; } +void +ev_view_set_screen_dpi (EvView *view, + gdouble dpi) +{ + g_return_if_fail (EV_IS_VIEW (view)); + g_return_if_fail (dpi > 0); + + view->dpi = dpi; + view->min_scale = MIN_SCALE * dpi / 72.0; + view->max_scale = MAX_SCALE * dpi / 72.0; +} + gboolean ev_view_get_continuous (EvView *view) { @@ -3069,12 +3612,27 @@ ev_view_set_presentation (EvView *view, return; if (!presentation) - view->end_presentation = FALSE; + view->presentation_state = EV_PRESENTATION_NORMAL; view->presentation = presentation; view->pending_scroll = SCROLL_TO_PAGE_POSITION; + + if (presentation) { + view->sizing_mode_saved = view->sizing_mode; + view->scale_saved = view->scale; + ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); + } else { + ev_view_set_sizing_mode (view, view->sizing_mode_saved); + ev_view_set_zoom (view, view->scale_saved, FALSE); + } + gtk_widget_queue_resize (GTK_WIDGET (view)); + if (presentation) + ev_view_presentation_transition_start (view); + else + ev_view_presentation_transition_stop (view); + if (GTK_WIDGET_REALIZED (view)) { if (view->presentation) gdk_window_set_background (GTK_WIDGET(view)->window, @@ -3095,6 +3653,40 @@ ev_view_get_presentation (EvView *view) return view->presentation; } +static gboolean +transition_next_page (EvView *view) +{ + ev_view_next_page (view); + + return FALSE; +} + +static void +ev_view_presentation_transition_stop (EvView *view) +{ + if (view->trans_timeout_id > 0) + g_source_remove (view->trans_timeout_id); + view->trans_timeout_id = 0; +} + +static void +ev_view_presentation_transition_start (EvView *view) +{ + gdouble duration; + + if (!EV_IS_DOCUMENT_TRANSITION (view->document)) + return; + + ev_view_presentation_transition_stop (view); + + duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document), + view->current_page); + if (duration > 0) + view->trans_timeout_id = g_timeout_add (duration * 1000, + (GSourceFunc) transition_next_page, + view); +} + void ev_view_set_sizing_mode (EvView *view, EvSizingMode sizing_mode) @@ -3121,13 +3713,13 @@ ev_view_get_sizing_mode (EvView *view) gboolean ev_view_can_zoom_in (EvView *view) { - return view->scale * ZOOM_IN_FACTOR <= MAX_SCALE; + return view->scale * ZOOM_IN_FACTOR <= view->max_scale; } gboolean ev_view_can_zoom_out (EvView *view) { - return view->scale * ZOOM_OUT_FACTOR >= MIN_SCALE; + return view->scale * ZOOM_OUT_FACTOR >= view->min_scale; } void @@ -3975,6 +4567,8 @@ clear_selection (EvView *view) g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL); view->selection_info.selections = NULL; view->selection_info.in_selection = FALSE; + if (view->pixbuf_cache) + ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, NULL); g_object_notify (G_OBJECT (view), "has-selection"); } @@ -4100,8 +4694,8 @@ ev_view_update_primary_selection (EvView *ev_view) if (ev_view->selection_info.selections) { if (!gtk_clipboard_set_with_owner (clipboard, - targets, - G_N_ELEMENTS (targets), + clipboard_targets, + G_N_ELEMENTS (clipboard_targets), ev_view_primary_get_cb, ev_view_primary_clear_cb, G_OBJECT (ev_view))) @@ -4181,6 +4775,19 @@ ev_view_show_cursor (EvView *view) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } +static void +ev_view_reset_presentation_state (EvView *view) +{ + if (!view->presentation || + view->presentation_state == EV_PRESENTATION_NORMAL) + return; + + view->presentation_state = EV_PRESENTATION_NORMAL; + gdk_window_set_background (GTK_WIDGET (view)->window, + >K_WIDGET (view)->style->black); + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + gboolean ev_view_next_page (EvView *view) { @@ -4191,6 +4798,9 @@ ev_view_next_page (EvView *view) if (!view->page_cache) return FALSE; + ev_view_presentation_transition_stop (view); + ev_view_reset_presentation_state (view); + page = ev_page_cache_get_current_page (view->page_cache); n_pages = ev_page_cache_get_n_pages (view->page_cache); @@ -4203,7 +4813,7 @@ ev_view_next_page (EvView *view) ev_page_cache_set_current_page (view->page_cache, page); return TRUE; } else if (view->presentation && page == n_pages) { - view->end_presentation = TRUE; + view->presentation_state = EV_PRESENTATION_END; gtk_widget_queue_draw (GTK_WIDGET (view)); return TRUE; } else if (view->dual_page && page == n_pages) { @@ -4224,12 +4834,14 @@ ev_view_previous_page (EvView *view) if (!view->page_cache) return FALSE; - if (view->end_presentation) { - view->end_presentation = FALSE; - gtk_widget_queue_draw (GTK_WIDGET (view)); + if (view->presentation && + view->presentation_state == EV_PRESENTATION_END) { + ev_view_reset_presentation_state (view); return TRUE; } + ev_view_reset_presentation_state (view); + page = ev_page_cache_get_current_page (view->page_cache); if (view->dual_page && !view->presentation)