X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=f353f4739862440afea1867b4fda71bff77bf03d;hb=a6b906afdaaf66cef8c7ababc5e89a5c26c49ed1;hp=8d65fb49407824b5de9b1763c32e89daad8f4551;hpb=69e9b806bc1420056bcd4d21d81aba0e74f3afdf;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index 8d65fb49..f353f473 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -36,12 +36,14 @@ #include "ev-selection.h" #include "ev-document-links.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)) @@ -78,13 +80,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 { @@ -312,6 +318,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) @@ -1254,13 +1264,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); @@ -1289,6 +1301,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 @@ -1676,7 +1692,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); @@ -1949,6 +1964,7 @@ ev_view_button_press_event (GtkWidget *widget, return FALSE; } +/*** Drag and Drop ***/ static void ev_view_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -1970,6 +1986,39 @@ ev_view_drag_data_get (GtkWidget *widget, } } +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) { @@ -2808,6 +2857,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); @@ -2952,6 +3003,7 @@ 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_data_received = ev_view_drag_data_received; widget_class->popup_menu = ev_view_popup_menu; gtk_object_class->destroy = ev_view_destroy; @@ -3119,6 +3171,12 @@ ev_view_init (EvView *view) 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 ***/ @@ -3157,6 +3215,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)); @@ -3421,6 +3481,11 @@ ev_view_set_presentation (EvView *view, 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, @@ -3441,6 +3506,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) @@ -4321,6 +4420,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"); } @@ -4446,8 +4547,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))) @@ -4550,6 +4651,7 @@ 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);