X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=722c8716eb958da7975a223ecb150f9cd72bf155;hb=57df208de1acaf93c60bd8401ec72a7d39f6ad9a;hp=2556b62fcb2efd92564e0c792aabc3a5ab0c6a8b;hpb=82f0c287b85ccb54a8761718c1ba95f32168d89f;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 2556b62f..722c8716 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -94,6 +94,8 @@
 
 #include <string.h>
 
+char *xdg_user_dir_lookup (char *type);
+
 typedef enum {
 	PAGE_MODE_DOCUMENT,
 	PAGE_MODE_PASSWORD
@@ -177,6 +179,7 @@ struct _EvWindowPrivate {
 #endif
 
 	EvJob *load_job;
+	EvJob *thumbnail_job;
 #ifdef WITH_GNOME_PRINT
 	GnomePrintJob *print_job;
 #endif
@@ -217,6 +220,8 @@ static void     ev_window_set_page_mode                 (EvWindow         *windo
 							 EvWindowPageMode  page_mode);
 static void	ev_window_load_job_cb  			(EvJobLoad        *job,
 							 gpointer          data);
+static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
+							 EvWindow         *ev_window);
 #ifdef WITH_GTK_PRINT
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
 							 EvWindow         *window);
@@ -428,13 +433,6 @@ ev_window_update_actions (EvWindow *ev_window)
 					ev_view_can_zoom_out (view) &&
 					!presentation_mode);
 	
-	ev_window_set_action_sensitive (ev_window, "Plus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "Minus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "KpPlus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "KpMinus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "CtrlKpPlus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "CtrlKpMinus", !presentation_mode);
-
         /* Go menu */
 	if (has_pages) {
 		ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
@@ -661,8 +659,8 @@ page_changed_cb (EvPageCache *page_cache,
 }
 
 typedef struct _FindTask {
-    const gchar *page_label;
-    gchar *chapter;
+	const gchar *page_label;
+	gchar *chapter;
 } FindTask;
 
 static gboolean
@@ -671,26 +669,26 @@ ev_window_find_chapter (GtkTreeModel *tree_model,
 		        GtkTreeIter  *iter,
 		        gpointer      data)
 {
-    FindTask *task = (FindTask *)data;
-    gchar *page_string;
-    
-    gtk_tree_model_get (tree_model, iter,
-			EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, 
-			-1);
-			
-    if (!page_string)
-	    return FALSE;
-	    
-    if (!strcmp (page_string, task->page_label)) {
-	    gtk_tree_model_get (tree_model, iter,
-		    		EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, 
-				-1);
-	    g_free (page_string);
-	    return TRUE;
-    }
-    
-    g_free (page_string);
-    return FALSE;
+	FindTask *task = (FindTask *)data;
+	gchar *page_string;
+	
+	gtk_tree_model_get (tree_model, iter,
+			    EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, 
+			    -1);
+	
+	if (!page_string)
+		return FALSE;
+	
+	if (!strcmp (page_string, task->page_label)) {
+		gtk_tree_model_get (tree_model, iter,
+				    EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, 
+				    -1);
+		g_free (page_string);
+		return TRUE;
+	}
+	
+	g_free (page_string);
+	return FALSE;
 }
 
 static void
@@ -702,6 +700,9 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
 	EvLink *real_link;
 	EvLinkAction *action;
 	EvLinkDest *dest;
+
+	if (window->priv->history == NULL)
+		return;
 	
 	if (link) {
 		action = g_object_ref (ev_link_get_action (link));
@@ -846,7 +847,7 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 		} else if (strcmp (page_id, THUMBNAILS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) {
 			ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
 		} else if (strcmp (page_id, ATTACHMENTS_SIDEBAR_ID) && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (attachments), document)) {
-			ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs);
+			ev_sidebar_set_page (EV_SIDEBAR (sidebar), attachments);
 		}
 		g_value_unset (&sidebar_page);
 	} else if (document && ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) {
@@ -902,8 +903,14 @@ setup_size_from_metadata (EvWindow *window)
         if (window->priv->page_cache &&
     	    ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
 	    ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {
+		
 		gint document_width;
 		gint document_height;
+		
+		GdkScreen *screen;
+		
+		gint request_width;
+		gint request_height;
 
 		ev_page_cache_get_max_width (window->priv->page_cache, 
 					     0, 1.0,
@@ -912,13 +919,22 @@ setup_size_from_metadata (EvWindow *window)
 					     0, 1.0,
 					     &document_height);			
 		
+		request_width = g_value_get_double (&width_ratio) * document_width;
+		request_height = g_value_get_double (&height_ratio) * document_height;
+		
+		screen = gtk_window_get_screen (GTK_WINDOW (window));
+		
+		if (screen) {
+			request_width = MIN (request_width, gdk_screen_get_width (screen));
+			request_height = MIN (request_width, gdk_screen_get_height (screen));
+		}
+			        
 		gtk_window_resize (GTK_WINDOW (window),
-				   g_value_get_double (&width_ratio) * document_width,
-				   g_value_get_double (&height_ratio) * document_height);
+				   request_width,
+				   request_height);
 	    	g_value_unset (&width_ratio);
 		g_value_unset (&height_ratio);
 	}
-
 }
 
 static void
@@ -1015,19 +1031,39 @@ setup_view_from_metadata (EvWindow *window)
 }
 
 static void
+ev_window_clear_thumbnail_job (EvWindow *ev_window)
+{
+	if (ev_window->priv->thumbnail_job != NULL) {
+		ev_job_queue_remove_job (ev_window->priv->thumbnail_job);
+
+		g_signal_handlers_disconnect_by_func (ev_window->priv->thumbnail_job,
+						      ev_window_set_icon_from_thumbnail,
+						      ev_window);
+		g_object_unref (ev_window->priv->thumbnail_job);
+		ev_window->priv->thumbnail_job = NULL;
+	}
+}
+
+static void
+ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
+				   EvWindow       *ev_window)
+{
+	if (job->thumbnail) {
+		gtk_window_set_icon (GTK_WINDOW (ev_window),
+				     job->thumbnail);
+	}
+
+	ev_window_clear_thumbnail_job (ev_window);
+}
+
+static gboolean
 ev_window_setup_document (EvWindow *ev_window)
 {
 	const EvDocumentInfo *info;
-	EvDocument *document;
-	EvView *view = EV_VIEW (ev_window->priv->view);
+	EvDocument *document = ev_window->priv->document;
 	EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar);
 	GtkAction *action;
-
-	document = ev_window->priv->document;
-	ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
-	g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window);
-	g_signal_connect (ev_window->priv->page_cache, "history-changed", G_CALLBACK (history_changed_cb), ev_window);
-
+	
 	if (EV_IS_DOCUMENT_FIND (document)) {
 		g_signal_connect_object (G_OBJECT (document),
 				         "find_changed",
@@ -1035,16 +1071,33 @@ ev_window_setup_document (EvWindow *ev_window)
 				         ev_window, 0);
 	}
 
-	ev_sidebar_set_document (sidebar, document);
+	if (EV_IS_DOCUMENT_THUMBNAILS (document)) {
+		EvRenderContext *rc;
+		gint page_width, page_height;
+		gdouble scale;
 
-	if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-		ev_view_set_document (view, document);
+		ev_window_clear_thumbnail_job (ev_window);
+		
+		ev_page_cache_get_size (ev_window->priv->page_cache,
+					0, 0, 1.0,
+					&page_width, &page_height);
+		scale = (gdouble)128 / (gdouble)page_width;
+		
+		rc = ev_render_context_new (0, 0, scale);
+		ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
+		g_signal_connect (ev_window->priv->thumbnail_job, "finished",
+				  G_CALLBACK (ev_window_set_icon_from_thumbnail),
+				  ev_window);
+		ev_job_queue_add_job (EV_JOB (ev_window->priv->thumbnail_job), EV_JOB_PRIORITY_LOW);
+		g_object_unref (rc);
 	}
-	ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 
+	ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
 	ev_window_title_set_document (ev_window->priv->title, document);
 	ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri);
 
+	ev_sidebar_set_document (sidebar, document);
+
 	action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION);
 	ev_page_action_set_document (EV_PAGE_ACTION (action), document);
 	ev_window_setup_action_sensitivity (ev_window);
@@ -1060,12 +1113,36 @@ ev_window_setup_document (EvWindow *ev_window)
 					           ev_window->priv->document);
 	}
 	
+	info = ev_page_cache_get_info (ev_window->priv->page_cache);
+	update_document_mode (ev_window, info->mode);
+
+	return FALSE;
+}
+
+static void
+ev_window_set_document (EvWindow *ev_window, EvDocument *document)
+{
+	EvView *view = EV_VIEW (ev_window->priv->view);
+
+	if (ev_window->priv->document)
+		g_object_unref (ev_window->priv->document);
+	ev_window->priv->document = g_object_ref (document);
+	
+	ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
+	g_signal_connect (ev_window->priv->page_cache, "page-changed",
+			  G_CALLBACK (page_changed_cb), ev_window);
+	g_signal_connect (ev_window->priv->page_cache, "history-changed",
+			  G_CALLBACK (history_changed_cb), ev_window);
+
 	setup_size_from_metadata (ev_window);
-	setup_document_from_metadata (ev_window);
 	setup_sidebar_from_metadata (ev_window, document);
+	setup_document_from_metadata (ev_window);
 
-	info = ev_page_cache_get_info (ev_window->priv->page_cache);
-	update_document_mode (ev_window, info->mode);
+	if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
+		ev_view_set_document (view, document);
+	}
+
+	g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
 static void
@@ -1120,7 +1197,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 		gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
-					   (gpointer *) &(ev_window->priv->password_dialog));
+					   (gpointer) &(ev_window->priv->password_dialog));
 		g_signal_connect (ev_window->priv->password_dialog,
 				  "response",
 				  G_CALLBACK (password_dialog_response),
@@ -1211,17 +1288,16 @@ ev_window_load_job_cb  (EvJobLoad *job,
 
 	/* Success! */
 	if (job->error == NULL) {
-		if (ev_window->priv->document)
-			g_object_unref (ev_window->priv->document);
-		ev_window->priv->document = g_object_ref (document);
+		ev_window_set_document (ev_window, document);
+		
+		if (job->mode != EV_WINDOW_MODE_PREVIEW) {
+			setup_view_from_metadata (ev_window);
+		}
 
 		if (!ev_window->priv->unlink_temp_file) {
-			setup_view_from_metadata (ev_window);
 			ev_window_add_recent (ev_window, ev_window->priv->uri);
 		}
 
-		ev_window_setup_document (ev_window);
-
 		if (job->dest) {
 			EvLink *link;
 			EvLinkAction *link_action;
@@ -1348,6 +1424,8 @@ ev_window_open_uri (EvWindow       *ev_window,
 	if (ev_window->priv->uri)
 		g_free (ev_window->priv->uri);
 	ev_window->priv->uri = g_strdup (uri);
+
+	setup_size_from_metadata (ev_window);
 	
 	ev_window->priv->load_job = ev_job_load_new (uri, dest, mode);
 	g_signal_connect (ev_window->priv->load_job,
@@ -1445,6 +1523,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 		gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
 					  window->priv->uri);
 	}
+	else {
+		char *folder;
+		folder = xdg_user_dir_lookup ("DOCUMENTS");
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
+						     folder);
+		free (folder);
+	}
 	
 	g_signal_connect (chooser, "response",
 			  G_CALLBACK (file_open_dialog_response_cb),
@@ -1497,12 +1582,16 @@ ev_window_create_tmp_symlink (const gchar *filename, GError **error)
 static void
 ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
 {
-	GError *error = NULL;
-	gchar *symlink_uri;
-	gchar *old_filename;
-	gchar *new_filename;
-
-	old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+	GError      *error = NULL;
+	gchar       *symlink_uri;
+	gchar       *old_filename;
+	gchar       *new_filename;
+	const gchar *uri_unc;
+
+	uri_unc = g_object_get_data (G_OBJECT (window->priv->document),
+				     "uri-uncompressed");
+	old_filename = g_filename_from_uri (uri_unc ? uri_unc : window->priv->uri,
+					    NULL, NULL);
 	new_filename = ev_window_create_tmp_symlink (old_filename, &error);
 
 	if (error) {
@@ -1646,13 +1735,11 @@ ev_window_get_recent_file_label (gint index, const gchar *filename)
 	p = filename;
 	end = filename + length;
  
-	while (p != end)
-	{
+	while (p != end) {
 		const gchar *next;
 		next = g_utf8_next_char (p);
  
-		switch (*p)
-		{
+		switch (*p) {
 			case '_':
 				g_string_append (str, "__");
 				break;
@@ -1768,63 +1855,100 @@ file_save_dialog_response_cb (GtkWidget *fc,
 			      gint       response_id,
 			      EvWindow  *ev_window)
 {
-	gboolean success;
+	const gchar *uri_unc;
+	gint         fd;
+	gchar       *filename;
+	gchar       *tmp_filename;
+	GError      *error = NULL;
 
-	if (response_id == GTK_RESPONSE_OK) {
-		gint    fd;
-		gchar  *filename;
-		gchar  *tmp_filename;
-		GError *error = NULL;
+	if (response_id != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (fc);
+		return;
+	}
+	
 
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fc));
-		tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
+	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fc));
+	tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
+	
+	fd = g_mkstemp (tmp_filename);
+	if (fd == -1) {
+		gchar *display_name;
+		gint   save_errno = errno;
 		
-		fd = g_mkstemp (tmp_filename);
-		if (fd == -1) {
-			gchar *display_name;
-			gint   save_errno = errno;
-			
-			display_name = g_filename_display_name (tmp_filename);
-			g_set_error (&error,
-				     G_FILE_ERROR,
-				     g_file_error_from_errno (save_errno),
-				     _("Failed to create file “%s”: %s"),
-				     display_name, g_strerror (save_errno));
-			g_free (display_name);
-		} else {
-			gchar *uri;
+		display_name = g_filename_display_name (tmp_filename);
+		g_set_error (&error,
+			     G_FILE_ERROR,
+			     g_file_error_from_errno (save_errno),
+			     _("Failed to create file “%s”: %s"),
+			     display_name, g_strerror (save_errno));
+		g_free (display_name);
+	} else {
+		gchar *uri;
+		
+		uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+		
+		ev_document_doc_mutex_lock ();
+		ev_document_save (ev_window->priv->document, uri, &error);
+		ev_document_doc_mutex_unlock ();
+		
+		g_free (uri);
+		close (fd);
+	}
 
-			uri = g_filename_to_uri (tmp_filename, NULL, NULL);
-			
-			ev_document_doc_mutex_lock ();
-			success = ev_document_save (ev_window->priv->document,
-						    uri,
-						    &error);
-			ev_document_doc_mutex_unlock ();
+	if (!error) {
+		uri_unc = g_object_get_data (G_OBJECT (ev_window->priv->document),
+					     "uri-uncompressed");
+		if (uri_unc) {
+			EvCompressionType ctype;
+			gchar            *uri_comp;
+			gchar            *uri;
+			const gchar      *ext;
 
+			ctype = EV_COMPRESSION_NONE;
+			
+			ext = g_strrstr (ev_window->priv->uri, ".gz");
+			if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
+				ctype = EV_COMPRESSION_GZIP;
+			
+			ext = g_strrstr (ev_window->priv->uri, ".bz2");
+			if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0)
+				ctype = EV_COMPRESSION_BZIP2;
+			
+			uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+			uri_comp = ev_file_compress (uri, ctype, &error);
 			g_free (uri);
-			close (fd);
-		}
+			g_unlink (tmp_filename);
+			g_free (tmp_filename);
 
-		if (!error) {
-			if (g_rename (tmp_filename, filename) == -1) {
-				g_unlink (tmp_filename);
+			if (!uri_comp || error) {
+				tmp_filename = NULL;
+			} else {
+				tmp_filename = g_filename_from_uri (uri_comp,
+								    NULL, NULL);
 			}
-		} else {
-			gchar *msg;
-			gchar *uri;
-
-			uri = g_filename_to_uri (filename, NULL, NULL);
-			msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
-			ev_window_error_dialog (GTK_WINDOW (ev_window), msg, error);
-			g_free (msg);
-			g_free (uri);
-			g_error_free (error);
+			
+			g_free (uri_comp);
 		}
+	}
+
+	if (tmp_filename && g_rename (tmp_filename, filename) == -1) {
+		g_unlink (tmp_filename);
+	}
+	
+	if (error) {
+		gchar *msg;
+		gchar *uri;
 		
-		g_free (tmp_filename);
-		g_free (filename);
+		uri = g_filename_to_uri (filename, NULL, NULL);
+		msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri);
+		ev_window_error_dialog (GTK_WINDOW (ev_window), msg, error);
+		g_free (msg);
+		g_free (uri);
+		g_error_free (error);
 	}
+	
+	g_free (tmp_filename);
+	g_free (filename);
 
 	gtk_widget_destroy (fc);
 }
@@ -1835,6 +1959,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	GtkWidget *fc;
 	gchar *base_name;
 	gchar *file_name;
+	gchar *folder;
 
 	fc = gtk_file_chooser_dialog_new (
 		_("Save a Copy"),
@@ -1849,10 +1974,13 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);	
 	file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
 	base_name = g_path_get_basename (file_name);
+        folder = xdg_user_dir_lookup ("DOCUMENTS");
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder);
 	g_free (file_name);
 	g_free (base_name);
-
+        free (folder);
+        
 	g_signal_connect (fc, "response",
 			  G_CALLBACK (file_save_dialog_response_cb),
 			  ev_window);
@@ -2329,7 +2457,7 @@ ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
 		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
 					           ev_window->priv->document);
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
-					   (gpointer *) &(ev_window->priv->properties));
+					   (gpointer) &(ev_window->priv->properties));
 		gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
 					      GTK_WINDOW (ev_window));
 	}
@@ -3132,14 +3260,10 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
-	char *uri;
-
-	g_return_if_fail (EV_IS_WINDOW (ev_window));
+	gchar *uri;
 
 	uri = g_strdup (ev_window->priv->uri);
-
 	ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);
-
 	g_free (uri);
 }
 
@@ -3704,8 +3828,6 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 	gboolean visible;
 	const char *search_string;
 
-	g_return_if_fail (EV_IS_WINDOW (ev_window));
-
 	/* Either the string or case sensitivity could have changed,
 	 * we connect this callback to both. We also connect it
 	 * to ::visible so when the find bar is hidden, we should
@@ -3861,9 +3983,14 @@ ev_window_dispose (GObject *object)
 	if (priv->load_job) {
 		ev_window_clear_load_job (window);
 	}
+
+	if (priv->thumbnail_job) {
+		ev_window_clear_thumbnail_job (window);
+	}
 	
 	if (priv->local_uri) {
 		ev_window_clear_local_uri (window);
+		priv->local_uri = NULL;
 	}
 	
 	ev_window_close_dialogs (window);
@@ -4351,12 +4478,15 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
 			ev_page_cache_get_max_height (window->priv->page_cache, 
 						      0, 1.0,
 						      &document_height);			
-			ev_metadata_manager_set_int (uri, "window_x", x);
-			ev_metadata_manager_set_int (uri, "window_y", y);
 			ev_metadata_manager_set_double (uri, "window_width_ratio", 
-							(double)width/document_width);
+							(double)width / document_width);
 			ev_metadata_manager_set_double (uri, "window_height_ratio", 
-							(double)height/document_height);
+							(double)height / document_height);
+			
+			ev_metadata_manager_set_int (uri, "window_x", x);
+			ev_metadata_manager_set_int (uri, "window_y", y);
+			ev_metadata_manager_set_int (uri, "window_width", width);
+			ev_metadata_manager_set_int (uri, "window_height", height);
 		}
 	}