X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=backend%2Fev-page-cache.c;h=6302c42e03b973fcc8b79bdd8cdaf62d3b6d1346;hb=174a8bc98d92b1123ec70fef51e0f64181cc8ab6;hp=491e0742a7b706f2b0c77161afa829928b1c23a4;hpb=7b093b9c4ed0f6ff0ad54c6447f64a823e90cecb;p=evince.git

diff --git a/backend/ev-page-cache.c b/backend/ev-page-cache.c
index 491e0742..6302c42e 100644
--- a/backend/ev-page-cache.c
+++ b/backend/ev-page-cache.c
@@ -19,11 +19,18 @@ struct _EvPageCache
 	int n_pages;
 	char *title;
 	char **page_labels;
-
+	
+	gboolean has_labels;
 	gboolean uniform;
+	
 	double uniform_width;
 	double uniform_height;
 
+	double max_width_page_width;
+	double max_width_page_height;
+	double max_height_page_width;
+	double max_height_page_height;
+
 	EvPageCacheInfo *size_cache;
 };
 
@@ -89,28 +96,61 @@ ev_page_cache_finalize (GObject *object)
 EvPageCache *
 _ev_page_cache_new (EvDocument *document)
 {
+	EvDocumentInfo *doc_info;
 	EvPageCache *page_cache;
 	EvPageCacheInfo *info;
 	gint i;
 
 	page_cache = (EvPageCache *) g_object_new (EV_TYPE_PAGE_CACHE, NULL);
 
-	g_mutex_lock (EV_DOC_MUTEX);
+	ev_document_doc_mutex_lock ();
 
 	/* We read page information out of the document */
 
 	/* Assume all pages are the same size until proven otherwise */
 	page_cache->uniform = TRUE;
+	page_cache->has_labels = FALSE;
 	page_cache->n_pages = ev_document_get_n_pages (document);
-	page_cache->title = ev_document_get_title (document);
 	page_cache->page_labels = g_new0 (char *, page_cache->n_pages);
+	page_cache->max_width_page_width = 0;
+	page_cache->max_width_page_height = 0;
+	page_cache->max_height_page_width = 0;
+	page_cache->max_height_page_height = 0;
+
+	doc_info = ev_document_get_info (document);
+	if (doc_info->fields_mask & EV_DOCUMENT_INFO_TITLE) {
+		page_cache->title = g_strdup (doc_info->title);
+	} else {
+		page_cache->title = NULL;
+	}
+	g_free (doc_info);
 
 	for (i = 0; i < page_cache->n_pages; i++) {
 		double page_width = 0;
 		double page_height = 0;
-
+		
 		ev_document_get_page_size (document, i, &page_width, &page_height);
-		page_cache->page_labels[i] = ev_document_get_page_label (document, i);
+
+	    	page_cache->page_labels[i] = ev_document_get_page_label (document, i);
+
+		if (!page_cache->has_labels && page_cache->page_labels[i] != NULL) {
+			gchar *expected_label;
+			
+			expected_label = g_strdup_printf ("%d", i + 1);
+			if (strcmp (expected_label, page_cache->page_labels[i]))  
+				page_cache->has_labels = TRUE;
+			g_free (expected_label);
+		}
+
+		if (page_width > page_cache->max_width_page_width) {
+			page_cache->max_width_page_width = page_width;
+			page_cache->max_width_page_height = page_height;
+		}
+
+		if (page_height > page_cache->max_height_page_height) {
+			page_cache->max_height_page_width = page_width;
+			page_cache->max_height_page_height = page_height;
+		}
 
 		if (i == 0) {
 			page_cache->uniform_width = page_width;
@@ -143,8 +183,10 @@ _ev_page_cache_new (EvDocument *document)
 	/* make some sanity check assertions */
 	if (! page_cache->uniform)
 		g_assert (page_cache->size_cache != NULL);
+	if (page_cache->uniform)
+		g_assert (page_cache->uniform_width > 0 && page_cache->uniform_height > 0);
 
-	g_mutex_unlock (EV_DOC_MUTEX);
+	ev_document_doc_mutex_unlock ();
 
 	if (page_cache->n_pages > 0)
 		ev_page_cache_set_current_page (page_cache, 0);
@@ -266,11 +308,44 @@ ev_page_cache_get_size (EvPageCache *page_cache,
 	}
 
 	if (width)
-		*width = (*width) * scale;
+		*width = (int) ((*width) * scale + 0.5);
+	if (width)
+		*height = (int) ((*height) * scale + 0.5);
+
+}
+
+
+/* Note that these aren't necessarily from the same page.
+ */
+void
+ev_page_cache_get_max_width_size (EvPageCache *page_cache,
+				  gfloat       scale,
+				  gint        *width,
+				  gint        *height)
+{
+	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
+
 	if (width)
-		*height = (*height) * scale;
+		*width = page_cache->max_width_page_width * scale;
+	if (height)
+		*height = page_cache->max_width_page_height * scale;
+}
+
+void
+ev_page_cache_get_max_height_size (EvPageCache *page_cache,
+				   gfloat       scale,
+				   gint        *width,
+				   gint        *height)
+{
+	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 
+	if (width)
+		*width = page_cache->max_height_page_width * scale;
+	if (height)
+		*height = page_cache->max_height_page_height * scale;
 }
+
+
 gchar *
 ev_page_cache_get_page_label (EvPageCache *page_cache,
 			      gint         page)
@@ -284,6 +359,12 @@ ev_page_cache_get_page_label (EvPageCache *page_cache,
 	return g_strdup (page_cache->page_labels[page]);
 }
 
+gboolean
+ev_page_cache_has_nonnumeric_page_labels (EvPageCache *page_cache)
+{
+	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), FALSE);
+	return page_cache->has_labels;
+}
 
 gboolean
 ev_page_cache_next_page (EvPageCache *page_cache)