X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=fc8cc8dc2ba3838002b529af113903e9fbc0517a;hb=0be3be0d4166be324d628802772e99cacd336f11;hp=cf65611a9aefaa154e7cf0ede3b579167581c228;hpb=75d6ca169171f642ba7438e648b4529638bf90c3;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index cf65611a..fc8cc8dc 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -55,7 +55,6 @@
 #include "ev-document-fonts.h"
 #include "ev-document-images.h"
 #include "ev-document-links.h"
-#include "ev-document-security.h"
 #include "ev-document-thumbnails.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
@@ -167,6 +166,7 @@ struct _EvWindowPrivate {
 	gboolean unlink_temp_file;
 	gboolean in_reload;
 	EvFileMonitor *monitor;
+	guint setup_document_idle;
 	
 	EvDocument *document;
 	EvHistory *history;
@@ -179,6 +179,7 @@ struct _EvWindowPrivate {
 	EvJob            *thumbnail_job;
 	EvJob            *save_job;
 	EvJob            *print_job;
+	EvJob            *find_job;
 
 	/* Printing */
 	gboolean          print_preview;
@@ -275,6 +276,7 @@ static void	ev_window_cmd_view_page_width 		(GtkAction 	  *action,
 static void	view_handle_link_cb 			(EvView           *view, 
 							 EvLink           *link, 
 							 EvWindow         *window);
+static void     ev_window_update_find_status_message    (EvWindow         *ev_window);
 static void     ev_window_cmd_edit_find                 (GtkAction        *action,
 							 EvWindow         *ev_window);
 static void     find_bar_search_changed_cb              (EggFindBar       *find_bar,
@@ -283,6 +285,9 @@ static void     find_bar_search_changed_cb              (EggFindBar       *find_
 static void     ev_window_do_preview_print              (EvWindow         *window);
 static void     ev_window_load_file_remote              (EvWindow         *ev_window,
 							 GFile            *source_file);
+static void     ev_window_media_player_key_pressed      (EvWindow         *window,
+							 const gchar      *key,
+							 gpointer          user_data);
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
@@ -396,6 +401,7 @@ ev_window_update_actions (EvWindow *ev_window)
 	int n_pages = 0, page = -1;
 	gboolean has_pages = FALSE;
 	gboolean presentation_mode;
+	gboolean can_find_in_page = FALSE;
 
 	if (ev_window->priv->document && ev_window->priv->page_cache) {
 		page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
@@ -403,13 +409,16 @@ ev_window_update_actions (EvWindow *ev_window)
 		has_pages = n_pages > 0;
 	}
 
+	can_find_in_page = (ev_window->priv->find_job &&
+			    ev_job_find_has_results (EV_JOB_FIND (ev_window->priv->find_job)));
+
 	ev_window_set_action_sensitive (ev_window, "EditCopy",
 					has_pages &&
 					ev_view_get_has_selection (view));
 	ev_window_set_action_sensitive (ev_window, "EditFindNext",
-					ev_view_can_find_next (view));
+					has_pages && can_find_in_page);
 	ev_window_set_action_sensitive (ev_window, "EditFindPrevious",
-					ev_view_can_find_previous (view));
+					has_pages && can_find_in_page);
 
 	presentation_mode = ev_view_get_presentation (view);
 	
@@ -687,19 +696,15 @@ ev_window_warning_message (GtkWindow *window, const gchar *msg)
 	ev_window_set_message_area (EV_WINDOW (window), area);
 }
 
-static void
-find_changed_cb (EvDocument *document, int page, EvWindow *ev_window)
-{
-	ev_window_update_actions (ev_window);
-}
-
 static void
 page_changed_cb (EvPageCache *page_cache,
 		 gint         page,
 		 EvWindow    *ev_window)
 {
 	ev_window_update_actions (ev_window);
-	
+
+	ev_window_update_find_status_message (ev_window);
+
 	if (!ev_window_is_empty (ev_window))
 		ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);
 }
@@ -1139,13 +1144,8 @@ ev_window_setup_document (EvWindow *ev_window)
 	EvDocument *document = ev_window->priv->document;
 	EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
 	GtkAction *action;
-	
-	if (EV_IS_DOCUMENT_FIND (document)) {
-		g_signal_connect_object (G_OBJECT (document),
-				         "find_changed",
-				         G_CALLBACK (find_changed_cb),	
-				         ev_window, 0);
-	}
+
+	ev_window->priv->setup_document_idle = 0;
 	
 	ev_window_refresh_window_thumbnail (ev_window, 0);
 
@@ -1204,7 +1204,9 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
 					   _("The document contains no pages"));
 	}
 
-	g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
+	if (ev_window->priv->setup_document_idle > 0)
+		g_source_remove (ev_window->priv->setup_document_idle);
+	ev_window->priv->setup_document_idle = g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
 static void
@@ -1219,18 +1221,9 @@ password_dialog_response (GtkWidget *password_dialog,
 			  gint       response_id,
 			  EvWindow  *ev_window)
 {
-	char *password;
-	
 	if (response_id == GTK_RESPONSE_OK) {
-
-		password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog));
-		if (password) {
-			ev_document_doc_mutex_lock ();
-			ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->load_job->document),
-							   password);
-			ev_document_doc_mutex_unlock ();
-		}
-		g_free (password);
+		ev_job_load_set_password (EV_JOB_LOAD (ev_window->priv->load_job),
+					  ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog)));
 
 		ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog));
 
@@ -1351,8 +1344,8 @@ ev_window_clear_temp_file (EvWindow *ev_window)
  * function should _not_ necessarily expect those to exist after being
  * called. */
 static void
-ev_window_load_job_cb  (EvJob *job,
-			gpointer data)
+ev_window_load_job_cb (EvJob *job,
+		       gpointer data)
 {
 	EvWindow *ev_window = EV_WINDOW (data);
 	EvDocument *document = EV_JOB (job)->document;
@@ -1398,16 +1391,7 @@ ev_window_load_job_cb  (EvJob *job,
 				break;
 		}
 
-		/* Restart the search after reloading */
-		if (ev_window->priv->in_reload) {
-			GtkWidget *widget;
-			
-			widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
-			if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
-				find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
-							    NULL, ev_window);
-			}
-		} else if (job_load->search_string && EV_IS_DOCUMENT_FIND (document)) {
+		if (job_load->search_string && EV_IS_DOCUMENT_FIND (document)) {
 			ev_window_cmd_edit_find (NULL, ev_window);
 			egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
 							job_load->search_string);
@@ -1458,7 +1442,7 @@ ev_window_reload_job_cb (EvJob    *job,
 		ev_window->priv->in_reload = FALSE;
 		return;
 	}
-
+	
 	ev_window_set_document (ev_window, job->document);
 
 	/* Restart the search after reloading */
@@ -1467,7 +1451,7 @@ ev_window_reload_job_cb (EvJob    *job,
 		find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
 					    NULL, ev_window);
 	}
-
+	
 	ev_window_clear_reload_job (ev_window);
 	ev_window->priv->in_reload = FALSE;
 }
@@ -2640,13 +2624,13 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 static void
 ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
 {
-	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
+	ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_FORWARD, FALSE);
 }
 
 static void
 ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
 {
-	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD, FALSE);
+	ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_BACKWARD, FALSE);
 }
 
 static void
@@ -3275,12 +3259,6 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 	ev_view_previous_page (EV_VIEW (ev_window->priv->view));
 }
 
-void
-ev_window_go_previous_page (EvWindow *ev_window)
-{
-	ev_window_cmd_go_previous_page (NULL, ev_window);
-}
-
 static void
 ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 {
@@ -3289,12 +3267,6 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window)
 	ev_view_next_page (EV_VIEW (ev_window->priv->view));
 }
 
-void
-ev_window_go_next_page (EvWindow *ev_window)
-{
-	ev_window_cmd_go_next_page (NULL, ev_window);
-}
-
 static void
 ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 {
@@ -3303,12 +3275,6 @@ ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window)
 	ev_page_cache_set_current_page (ev_window->priv->page_cache, 0);
 }
 
-void
-ev_window_go_first_page (EvWindow *ev_window)
-{
-	ev_window_cmd_go_first_page (NULL, ev_window);
-}
-
 static void
 ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 {
@@ -3320,12 +3286,6 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window)
 	ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1);
 }
 
-void
-ev_window_go_last_page (EvWindow *ev_window)
-{
-	ev_window_cmd_go_last_page (NULL, ev_window);
-}
-
 static void
 ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window)
 {
@@ -3426,12 +3386,6 @@ ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
 	ev_window_run_presentation (window);
 }
 
-void
-ev_window_start_presentation (EvWindow *ev_window)
-{
-	ev_window_run_presentation (ev_window);
-}
-
 static gboolean
 ev_window_enumerate_printer_cb (GtkPrinter *printer,
 				EvWindow   *window)
@@ -4033,15 +3987,73 @@ attachment_bar_menu_popup_cb (EvSidebarAttachments *attachbar,
 }
 
 static void
-view_find_status_changed_cb (EvView     *view,
-			     GParamSpec *pspec,
-			     EvWindow   *ev_window)
+ev_window_update_find_status_message (EvWindow *ev_window)
+{
+	gchar *message;
+
+	if (!ev_window->priv->find_job)
+		return;
+	
+	if (ev_job_is_finished (ev_window->priv->find_job)) {
+		gint n_results;
+
+		n_results = ev_job_find_get_n_results (EV_JOB_FIND (ev_window->priv->find_job),
+						       ev_page_cache_get_current_page (ev_window->priv->page_cache));
+		/* TRANS: Sometimes this could be better translated as
+		                      "%d hit(s) on this page".  Therefore this string
+				      contains plural cases. */
+		message = g_strdup_printf (ngettext ("%d found on this page",
+						     "%d found on this page",
+						     n_results),
+					   n_results);
+	} else {
+		gdouble percent;
+
+		percent = ev_job_find_get_progress (EV_JOB_FIND (ev_window->priv->find_job));
+		message = g_strdup_printf (_("%3d%% remaining to search"),
+					   (gint) ((1.0 - percent) * 100));
+	}
+	
+	egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), message);
+	g_free (message);
+}
+
+static void
+ev_window_find_job_finished_cb (EvJobFind *job,
+				EvWindow  *ev_window)
+{
+	ev_window_update_find_status_message (ev_window);
+}
+
+static void
+ev_window_find_job_updated_cb (EvJobFind *job,
+			       gint       page,
+			       EvWindow  *ev_window)
+{
+	ev_window_update_actions (ev_window);
+	
+	ev_view_find_changed (EV_VIEW (ev_window->priv->view),
+			      ev_job_find_get_results (job),
+			      page);
+	ev_window_update_find_status_message (ev_window);
+}
+
+static void
+ev_window_clear_find_job (EvWindow *ev_window)
 {
-	const char *text;
+	if (ev_window->priv->find_job != NULL) {
+		if (!ev_job_is_finished (ev_window->priv->find_job))
+			ev_job_cancel (ev_window->priv->find_job);
 
-	text = ev_view_get_find_status (view);
-	egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
-				      text);
+		g_signal_handlers_disconnect_by_func (ev_window->priv->find_job,
+						      ev_window_find_job_finished_cb,
+						      ev_window);
+		g_signal_handlers_disconnect_by_func (ev_window->priv->find_job,
+						      ev_window_find_job_updated_cb,
+						      ev_window);
+		g_object_unref (ev_window->priv->find_job);
+		ev_window->priv->find_job = NULL;
+	}
 }
 
 static void
@@ -4063,6 +4075,7 @@ find_bar_close_cb (EggFindBar *find_bar,
 		   EvWindow   *ev_window)
 {
 	ev_view_find_cancel (EV_VIEW (ev_window->priv->view));
+	ev_window_clear_find_job (ev_window);
 	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
 	update_chrome_visibility (ev_window);
 }
@@ -4075,39 +4088,42 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 	gboolean case_sensitive;
 	const char *search_string;
 
+	if (!ev_window->priv->document || !EV_IS_DOCUMENT_FIND (ev_window->priv->document))
+		return;
+	
 	/* Either the string or case sensitivity could have changed. */
-
 	case_sensitive = egg_find_bar_get_case_sensitive (find_bar);
 	search_string = egg_find_bar_get_search_string (find_bar);
 
-	ev_view_search_changed (EV_VIEW(ev_window->priv->view));
+	ev_view_find_search_changed (EV_VIEW (ev_window->priv->view));
 
-	if (ev_window->priv->document &&
-	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
-		if (search_string && search_string[0]) {
-			ev_document_doc_mutex_lock ();
-			ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), 
-						ev_page_cache_get_current_page (ev_window->priv->page_cache),
-						search_string,
-						case_sensitive);
-			ev_document_doc_mutex_unlock ();
-		} else {
-			ev_document_doc_mutex_lock ();
-			ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document));
-			ev_document_doc_mutex_unlock ();
-
-		        ev_window_update_actions (ev_window);
-			egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
-						      NULL);
-			gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
-		}
+	ev_window_clear_find_job (ev_window);
+
+	if (search_string && search_string[0]) {
+		ev_window->priv->find_job = ev_job_find_new (ev_window->priv->document,
+							     ev_page_cache_get_current_page (ev_window->priv->page_cache),
+							     ev_page_cache_get_n_pages (ev_window->priv->page_cache),
+							     search_string,
+							     case_sensitive);
+		g_signal_connect (ev_window->priv->find_job, "finished",
+				  G_CALLBACK (ev_window_find_job_finished_cb),
+				  ev_window);
+		g_signal_connect (ev_window->priv->find_job, "updated",
+				  G_CALLBACK (ev_window_find_job_updated_cb),
+				  ev_window);
+		ev_job_scheduler_push_job (ev_window->priv->find_job, EV_JOB_PRIORITY_NONE);
+	} else {
+		ev_window_update_actions (ev_window);
+		egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar),
+					      NULL);
+		gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view));
 	}
 }
 
 static void
 find_bar_visibility_changed_cb (EggFindBar *find_bar,
-			    GParamSpec *param,
-			    EvWindow   *ev_window)
+				GParamSpec *param,
+				EvWindow   *ev_window)
 {
 	gboolean visible;
 
@@ -4115,8 +4131,8 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 
 	if (ev_window->priv->document &&
 	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
-		ev_view_set_highlight_search (EV_VIEW (ev_window->priv->view), visible);
-		ev_view_search_changed (EV_VIEW (ev_window->priv->view));
+		ev_view_find_set_highlight_search (EV_VIEW (ev_window->priv->view), visible);
+		ev_view_find_search_changed (EV_VIEW (ev_window->priv->view));
 		ev_window_update_actions (ev_window);
 
 		if (visible)
@@ -4127,9 +4143,11 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar,
 }
 
 static void
-find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+find_bar_scroll (EggFindBar   *find_bar,
+		 GtkScrollType scroll,
+		 EvWindow     *ev_window)
 {
-	ev_view_scroll(EV_VIEW(ev_window->priv->view), scroll, FALSE);
+	ev_view_scroll (EV_VIEW (ev_window->priv->view), scroll, FALSE);
 }
 
 static void
@@ -4177,16 +4195,19 @@ ev_window_dispose (GObject *object)
 {
 	EvWindow *window = EV_WINDOW (object);
 	EvWindowPrivate *priv = window->priv;
-#ifdef ENABLE_DBUS
-	GObject *keys;
+	GObject *mpkeys = ev_application_get_media_keys (EV_APP);
 
-	keys = ev_application_get_media_keys (EV_APP);
-	if (keys) {
-		ev_media_player_keys_focused (EV_MEDIA_PLAYER_KEYS (keys), NULL);
-		g_object_unref (keys);
+	if (mpkeys) {
+		g_signal_handlers_disconnect_by_func (mpkeys,
+						      ev_window_media_player_key_pressed,
+						      window);
 	}
-#endif /* ENABLE_DBUS */
-
+	
+	if (priv->setup_document_idle > 0) {
+		g_source_remove (priv->setup_document_idle);
+		priv->setup_document_idle = 0;
+	}
+	
 	if (priv->monitor) {
 		g_object_unref (priv->monitor);
 		priv->monitor = NULL;
@@ -4266,12 +4287,16 @@ ev_window_dispose (GObject *object)
 	if (priv->thumbnail_job) {
 		ev_window_clear_thumbnail_job (window);
 	}
+
+	if (priv->find_job) {
+		ev_window_clear_find_job (window);
+	}
 	
 	if (priv->local_uri) {
 		ev_window_clear_local_uri (window);
 		priv->local_uri = NULL;
 	}
-	
+
 	ev_window_close_dialogs (window);
 	ev_window_clear_print_job (window);
 
@@ -4714,10 +4739,7 @@ view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *win
 	GObject *keys;
 
 	keys = ev_application_get_media_keys (EV_APP);
-	if (keys) {
-		ev_media_player_keys_focused (EV_MEDIA_PLAYER_KEYS (keys), window);
-		g_object_unref (keys);
-	}
+	ev_media_player_keys_focused (EV_MEDIA_PLAYER_KEYS (keys));
 #endif /* ENABLE_DBUS */
 
 	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE);
@@ -4862,25 +4884,34 @@ static void
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {
 	const gchar *uri = ev_link_action_get_uri (action);
+	GAppLaunchContext *context = NULL;
 	GError *error = NULL;
 	gboolean ret;
+
+#if GTK_CHECK_VERSION (2, 14, 0)
+	context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
+	gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context),
+					   gtk_window_get_screen (GTK_WINDOW (window)));
+	gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context),
+					      GDK_CURRENT_TIME);
+#endif
+
+	if (!g_strstr_len (uri, strlen (uri), "://")) {
+		gchar *http;
+		
+		/* Not a valid uri, assuming it's http */
+		http = g_strdup_printf ("http://%s", uri);
+		ret = g_app_info_launch_default_for_uri (http, NULL, &error);
+		g_free (http);
+	} else {
+		ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
+	}
 	
-	ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
   	if (ret == FALSE) {
-		GtkWidget *dialog;
-	
-		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
-						 _("Unable to open external link"));
-		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-							  error->message, uri);
-		g_signal_connect (dialog, "response",
-				  G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-		gtk_widget_show (dialog);
-		g_error_free(error);
+		ev_window_error_message (GTK_WINDOW (window),
+					 _("Unable to open external link"),
+					 error);
+		g_error_free (error);
 	}
 }
 
@@ -5043,7 +5074,7 @@ image_save_dialog_response_cb (GtkWidget *fc,
 	}
 
 	extensions = gdk_pixbuf_format_get_extensions (format);
-	if (g_str_has_suffix(uri, extensions[0])) {
+	if (!g_str_has_suffix (uri, extensions[0])) {
 		gchar *uri_extension;
 		
 		uri_extension = g_strconcat (uri, ".", extensions[0], NULL);
@@ -5052,7 +5083,7 @@ image_save_dialog_response_cb (GtkWidget *fc,
 	} else {
 		target_file = g_file_new_for_uri (uri);
 	}
-	g_strfreev(extensions);
+	g_strfreev (extensions);
 	g_free (uri);
 	
 	is_native = g_file_is_native (target_file);
@@ -5150,18 +5181,21 @@ ev_view_popup_cmd_copy_image (GtkAction *action, EvWindow *window)
 static void
 ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window)
 {
-	GList *l;
+	GList     *l;
+	GdkScreen *screen;
 	
 	if (!window->priv->attach_list)
 		return;
 
+	screen = gtk_window_get_screen (GTK_WINDOW (window));
+
 	for (l = window->priv->attach_list; l && l->data; l = g_list_next (l)) {
 		EvAttachment *attachment;
 		GError       *error = NULL;
 		
 		attachment = (EvAttachment *) l->data;
 		
-		ev_attachment_open (attachment, &error);
+		ev_attachment_open (attachment, screen, GDK_CURRENT_TIME, &error);
 
 		if (error) {
 			ev_window_error_message (GTK_WINDOW (window),
@@ -5285,6 +5319,35 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
 	gtk_widget_show (fc);
 }
 
+static void
+ev_window_media_player_key_pressed (EvWindow    *window,
+				    const gchar *key,
+				    gpointer     user_data)
+{
+	if (!gtk_window_is_active (GTK_WINDOW (window))) 
+		return;
+	
+	/* Note how Previous/Next only go to the
+	 * next/previous page despite their icon telling you
+	 * they should go to the beginning/end.
+	 *
+	 * There's very few keyboards with FFW/RWD though,
+	 * so we stick the most useful keybinding on the most
+	 * often seen keys
+	 */
+	if (strcmp (key, "Play") == 0) {
+		ev_window_run_presentation (window);
+	} else if (strcmp (key, "Previous") == 0) {
+		ev_window_cmd_go_previous_page (NULL, window);
+	} else if (strcmp (key, "Next") == 0) {
+		ev_window_cmd_go_next_page (NULL, window);
+	} else if (strcmp (key, "FastForward") == 0) {
+		ev_window_cmd_go_last_page (NULL, window);
+	} else if (strcmp (key, "Rewind") == 0) {
+		ev_window_cmd_go_first_page (NULL, window);
+	}
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -5292,6 +5355,7 @@ ev_window_init (EvWindow *ev_window)
 	GtkAccelGroup *accel_group;
 	GError *error = NULL;
 	GtkWidget *sidebar_widget;
+	GObject *mpkeys;
 
 	g_signal_connect (ev_window, "configure_event",
 			  G_CALLBACK (window_configure_event_cb), NULL);
@@ -5498,10 +5562,6 @@ ev_window_init (EvWindow *ev_window)
 	gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window),
 			   ev_window->priv->view);
 
-	g_signal_connect (ev_window->priv->view,
-			  "notify::find-status",
-			  G_CALLBACK (view_find_status_changed_cb),
-			  ev_window);
 	g_signal_connect (ev_window->priv->view,
 			  "notify::sizing-mode",
 			  G_CALLBACK (ev_window_sizing_mode_changed_cb),
@@ -5576,6 +5636,14 @@ ev_window_init (EvWindow *ev_window)
 								       "/AttachmentPopup");
 	ev_window->priv->attach_list = NULL;
 
+	/* Media player keys */
+	mpkeys = ev_application_get_media_keys (EV_APP);
+	if (mpkeys) {
+		g_signal_connect_swapped (mpkeys, "key_pressed",
+					  G_CALLBACK (ev_window_media_player_key_pressed),
+					  ev_window);
+	}
+	
 	/* Give focus to the document view */
 	gtk_widget_grab_focus (ev_window->priv->view);