X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-page-cache.c;h=3dd8c9a7f1c1c9c29174d0f0079f452a35938b89;hb=09d209d90da09650cc2a71d8caf21477e2d85568;hp=d7aa03db8f1d815120e9050c00670c3e2a844866;hpb=41229e9ef5135c93176acb6320f96abc7d624b0a;p=evince.git

diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
index d7aa03db..3dd8c9a7 100644
--- a/shell/ev-page-cache.c
+++ b/shell/ev-page-cache.c
@@ -23,6 +23,7 @@ struct _EvPageCache
 	gint max_label_chars;
 	gboolean has_labels;
 	gboolean uniform;
+	gboolean dual_even_left;
 	
 	double uniform_width;
 	double uniform_height;
@@ -117,54 +118,73 @@ build_height_to_page (EvPageCache *page_cache)
 	g_free (page_cache->height_to_page);
 	g_free (page_cache->dual_height_to_page);
 
-	page_cache->height_to_page = g_new0(double, page_cache->n_pages);
-	page_cache->dual_height_to_page = g_new0(double, page_cache->n_pages / 2 + 1);
+	page_cache->height_to_page = g_new0(double, page_cache->n_pages + 1);
+	page_cache->dual_height_to_page = g_new0(double, page_cache->n_pages + 2);
 	
 	saved_height = 0;
-	for (i = 0; i < page_cache->n_pages; i++) {
+	for (i = 0; i <= page_cache->n_pages; i++) {
 		if (page_cache->uniform) {
 			if (!swap) {
 				uniform_height = page_cache->uniform_height;
 			} else {
 				uniform_height = page_cache->uniform_width;
 			}
-			page_cache->height_to_page [i] = (i + 1) * uniform_height;
+			page_cache->height_to_page [i] = i * uniform_height;
 		} else {
 			if (!swap) {
 				page_height = page_cache->size_cache [i].height;
 			} else {
 				page_height = page_cache->size_cache [i].width;
 			}
-			page_cache->height_to_page [i] = saved_height + page_height;
-			saved_height = page_cache->height_to_page [i];
+			page_cache->height_to_page [i] = saved_height;
+			saved_height += page_height;
 		}
 	}
-	
-	saved_height = 0;
-	for (i = 0; i < page_cache->n_pages; i += 2) {
+
+	if (page_cache->dual_even_left && !page_cache->uniform) {
+		if (!swap) {
+			saved_height = page_cache->size_cache [0].height;
+		} else {
+			saved_height = page_cache->size_cache [0].width;
+		}
+	} else {
+		saved_height = 0;
+	}
+	for (i = page_cache->dual_even_left; i < page_cache->n_pages + 2; i += 2) {
     		if (page_cache->uniform) {
 			if (!swap) {
 				uniform_height = page_cache->uniform_height;
 			} else {
 				uniform_height = page_cache->uniform_width;
 			}
-			page_cache->dual_height_to_page [i / 2] = (i / 2 + 1) * uniform_height;
+			page_cache->dual_height_to_page [i] = ((i + page_cache->dual_even_left) / 2) * uniform_height;
+			if (i + 1 < page_cache->n_pages + 2)
+				page_cache->dual_height_to_page [i + 1] = ((i + page_cache->dual_even_left) / 2) * uniform_height;
 		} else {
-			if (!swap) {
-				page_height = page_cache->size_cache [i].height;
-				next_page_height = page_cache->size_cache [i + 1].height;
+			if (i + 1 < page_cache->n_pages) {
+				if (!swap) {
+					next_page_height = page_cache->size_cache [i + 1].height;
+				} else {
+					next_page_height = page_cache->size_cache [i + 1].width;
+				}
 			} else {
-				page_height = page_cache->size_cache [i].width;
-				next_page_height = page_cache->size_cache [i + 1].width;
+				next_page_height = 0;
 			}
-			if (i == page_cache->n_pages - 1) {
-				page_cache->dual_height_to_page [i / 2] =
-					saved_height + page_height;
+			if (i < page_cache->n_pages) {
+				if (!swap) {
+					page_height = page_cache->size_cache [i].height;
+				} else {
+					page_height = page_cache->size_cache [i].width;
+				}
+			} else {
+				page_height = 0;
 			}
-			else {
-				page_cache->dual_height_to_page [i / 2] = saved_height +
-				       MAX(page_height, next_page_height);			    	    
-				saved_height = page_cache->dual_height_to_page [i / 2];
+			if (i + 1 < page_cache->n_pages + 2) {
+				page_cache->dual_height_to_page [i] = saved_height;
+				page_cache->dual_height_to_page [i + 1] = saved_height;
+				saved_height += MAX(page_height, next_page_height);
+			} else {
+				page_cache->dual_height_to_page [i] = saved_height;
 			}
 		}
 	}
@@ -187,6 +207,7 @@ ev_page_cache_new (EvDocument *document)
 	page_cache->uniform = TRUE;
 	page_cache->has_labels = FALSE;
 	page_cache->n_pages = ev_document_get_n_pages (document);
+	page_cache->dual_even_left = (page_cache->n_pages > 2);
 	page_cache->page_labels = g_new0 (char *, page_cache->n_pages);
 	page_cache->max_width = 0;
 	page_cache->max_height = 0;
@@ -261,7 +282,7 @@ 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)
+	if (page_cache->uniform && page_cache->n_pages > 0)
 		g_assert (page_cache->uniform_width > 0 && page_cache->uniform_height > 0);
 
 	ev_document_doc_mutex_unlock ();
@@ -341,16 +362,6 @@ ev_page_cache_set_page_label (EvPageCache *page_cache,
 	return FALSE;
 }
 
-void
-ev_page_cache_set_link (EvPageCache *page_cache,
-			EvLink      *link)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (EV_IS_LINK (link));
-
-	ev_page_cache_set_current_page (page_cache, ev_link_get_page (link));
-}
-
 const char *
 ev_page_cache_get_title (EvPageCache *page_cache)
 {
@@ -367,35 +378,32 @@ ev_page_cache_get_size (EvPageCache  *page_cache,
 			gint         *width,
 			gint         *height)
 {
+	double w, h;
+
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 	g_return_if_fail (page >= 0 && page < page_cache->n_pages);
 
 	if (page_cache->uniform) {
-		if (width)
-			*width = page_cache->uniform_width;
-		if (height)
-			*height = page_cache->uniform_height;
+		w = page_cache->uniform_width;
+		h = page_cache->uniform_height;
 	} else {
 		EvPageCacheInfo *info;
 
 		info = &(page_cache->size_cache [page]);
 		
-		if (width)
-			*width = info->width;
-		if (height)
-			*height = info->height;
+		w = info->width;
+		h = info->height;
 	}
 
+	w = w * scale + 0.5;
+	h = h * scale + 0.5;
+
 	if (rotation == 0 || rotation == 180) {
-		if (width)
-			*width = (int) ((*width) * scale + 0.5);
-		if (height)
-			*height = (int) ((*height) * scale + 0.5);
+		if (width) *width = (int)w;
+		if (height) *height = (int)h;
 	} else {
-		if (width)
-			*width = (int) ((*height) * scale + 0.5);
-		if (height)
-			*height = (int) ((*width) * scale + 0.5);
+		if (width) *width = (int)h;
+		if (height) *height = (int)w;
 	}
 }
 
@@ -441,27 +449,18 @@ ev_page_cache_get_height_to_page (EvPageCache   *page_cache,
 				  gint          *height,
 				  gint 	        *dual_height)
 {
-	double result = 0.0;
-	double dual_result = 0.0;
-	
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 
 	if (page_cache->rotation != rotation) {
 		page_cache->rotation = rotation;
 		build_height_to_page (page_cache);
 	}
-
-	if (page > 0)
-		result = page_cache->height_to_page [page - 1];	
 	
 	if (height)
-		*height = result * scale;
+		*height = page_cache->height_to_page [page] * scale;
 
-	if (page > 1)
-		dual_result = page_cache->dual_height_to_page [page / 2 - 1];	
-	
 	if (dual_height)
-		*dual_height = dual_result * scale;
+		*dual_height = page_cache->dual_height_to_page [page] * scale;
 }
 
 gint
@@ -472,6 +471,14 @@ ev_page_cache_get_max_label_chars (EvPageCache *page_cache)
 	return page_cache->max_label_chars;
 }
 
+gboolean
+ev_page_cache_get_dual_even_left (EvPageCache *page_cache)
+{
+	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
+	
+	return page_cache->dual_even_left;
+}
+
 gchar *
 ev_page_cache_get_page_label (EvPageCache *page_cache,
 			      gint         page)
@@ -500,32 +507,6 @@ ev_page_cache_get_info (EvPageCache *page_cache)
 	return page_cache->page_info;
 }
 
-
-gboolean
-ev_page_cache_next_page (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), FALSE);
-
-	if (page_cache->current_page >= page_cache->n_pages - 1)
-		return FALSE;
-
-	ev_page_cache_set_current_page (page_cache, page_cache->current_page + 1);
-	return TRUE;
-
-}
-
-gboolean
-ev_page_cache_prev_page (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), FALSE);
-
-	if (page_cache->current_page <= 0)
-		return FALSE;
-
-	ev_page_cache_set_current_page (page_cache, page_cache->current_page - 1);
-	return TRUE;
-}
-
 #define PAGE_CACHE_STRING "ev-page-cache"
 
 EvPageCache *