[libview] Move height_to_page cache from EvPageCache to EvView

4 files changed, 179 insertions, 138 deletions

diff --git a/libview/ev-page-cache.c b/libview/ev-page-cache.c
index ab468b9..d6fa538 100644
--- a/libview/ev-page-cache.c
+++ b/libview/ev-page-cache.c
@@ -15,9 +15,6 @@ struct _EvPageCache
 
 	gboolean dual_even_left;
 
-	double* height_to_page;
-	double* dual_height_to_page;
-
 	int rotation;
 };
 
@@ -88,109 +85,9 @@ ev_page_cache_finalize (GObject *object)
 
 	page_cache->document = NULL;
 
-	if (page_cache->height_to_page) {
-		g_free (page_cache->height_to_page);
-		page_cache->height_to_page = NULL;
-	}
-
-	if (page_cache->dual_height_to_page) {
-		g_free (page_cache->dual_height_to_page);
-		page_cache->dual_height_to_page = NULL;
-	}
-
 	G_OBJECT_CLASS (ev_page_cache_parent_class)->finalize (object);
 }
 
-static void
-build_height_to_page (EvPageCache *page_cache)
-{
-	gboolean swap, uniform, dual_even_left;
-	int i;
-	double uniform_height, page_height, next_page_height;
-	double saved_height;
-	gdouble u_width, u_height;
-	gint n_pages;
-
-	swap = (page_cache->rotation == 90 ||
-		page_cache->rotation == 270);
-
-	uniform = ev_document_is_page_size_uniform (page_cache->document);
-	n_pages = ev_document_get_n_pages (page_cache->document);
-	dual_even_left = (n_pages > 2);
-
-	g_free (page_cache->height_to_page);
-	g_free (page_cache->dual_height_to_page);
-
-	page_cache->height_to_page = g_new0 (double, n_pages + 1);
-	page_cache->dual_height_to_page = g_new0 (double, n_pages + 2);
-
-	if (uniform)
-		ev_document_get_page_size (page_cache->document, 0, &u_width, &u_height);
-
-	saved_height = 0;
-	for (i = 0; i <= n_pages; i++) {
-		if (uniform) {
-			uniform_height = swap ? u_width : u_height;
-			page_cache->height_to_page[i] = i * uniform_height;
-		} else {
-			if (i < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (page_cache->document, i, &w, &h);
-				page_height = swap ? w : h;
-			} else {
-				page_height = 0;
-			}
-			page_cache->height_to_page[i] = saved_height;
-			saved_height += page_height;
-		}
-	}
-
-	if (dual_even_left && !uniform) {
-		gdouble w, h;
-
-		ev_document_get_page_size (page_cache->document, 0, &w, &h);
-		saved_height = swap ? w : h;
-	} else {
-		saved_height = 0;
-	}
-
-	for (i = dual_even_left; i < n_pages + 2; i += 2) {
-    		if (uniform) {
-			uniform_height = swap ? u_width : u_height;
-			page_cache->dual_height_to_page[i] = ((i + dual_even_left) / 2) * uniform_height;
-			if (i + 1 < n_pages + 2)
-				page_cache->dual_height_to_page[i + 1] = ((i + dual_even_left) / 2) * uniform_height;
-		} else {
-			if (i + 1 < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (page_cache->document, i + 1, &w, &h);
-				next_page_height = swap ? w : h;
-			} else {
-				next_page_height = 0;
-			}
-
-			if (i < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (page_cache->document, i, &w, &h);
-				page_height = swap ? w : h;
-			} else {
-				page_height = 0;
-			}
-
-			if (i + 1 < 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;
-			}
-		}
-	}
-}
-
 static EvPageCache *
 ev_page_cache_new (EvDocument *document)
 {
@@ -199,8 +96,6 @@ ev_page_cache_new (EvDocument *document)
 	page_cache = (EvPageCache *) g_object_new (EV_TYPE_PAGE_CACHE, NULL);
 	page_cache->document = document;
 
-	build_height_to_page (page_cache);
-
 	if (ev_document_get_n_pages (page_cache->document) > 0)
 		ev_page_cache_set_current_page (page_cache, 0);
 
@@ -314,29 +209,6 @@ ev_page_cache_get_max_height (EvPageCache   *page_cache,
 	*height = (rotation == 0 || rotation == 180) ? h * scale : w * scale;
 }
 
-void
-ev_page_cache_get_height_to_page (EvPageCache   *page_cache,
-				  gint           page,
-				  gint           rotation,
-				  gfloat         scale,
-				  gint          *height,
-				  gint 	        *dual_height)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (page >= 0);
-
-	if (page_cache->rotation != rotation) {
-		page_cache->rotation = rotation;
-		build_height_to_page (page_cache);
-	}
-
-	if (height)
-		*height = page_cache->height_to_page[page] * scale;
-
-	if (dual_height)
-		*dual_height = page_cache->dual_height_to_page[page] * scale;
-}
-
 gboolean
 ev_page_cache_get_dual_even_left (EvPageCache *page_cache)
 {
diff --git a/libview/ev-page-cache.h b/libview/ev-page-cache.h
index 1c3629d..4d952e1 100644
--- a/libview/ev-page-cache.h
+++ b/libview/ev-page-cache.h
@@ -49,12 +49,6 @@ void           ev_page_cache_get_max_height      (EvPageCache   *page_cache,
 						  gint           rotation,
 						  gfloat         scale,
 						  gint          *height);
-void           ev_page_cache_get_height_to_page  (EvPageCache   *page_cache,
-						  gint           page,
-						  gint           rotation,
-						  gfloat         scale,
-						  gint          *height,
-						  gint	        *dual_height);
 gboolean       ev_page_cache_get_dual_even_left  (EvPageCache *page_cache);
 
 /* Navigation */
diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 4bec7bd..d0519d7 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -117,6 +117,12 @@ typedef enum {
 	EV_PRESENTATION_END
 } EvPresentationState;
 
+typedef struct _EvHeightToPageCache {
+	gint rotation;
+	gdouble *height_to_page;
+	gdouble *dual_height_to_page;
+} EvHeightToPageCache;
+
 struct _EvView {
 	GtkLayout layout;
 
@@ -130,6 +136,7 @@ struct _EvView {
 	
 	EvPageCache *page_cache;
 	EvPixbufCache *pixbuf_cache;
+	EvHeightToPageCache *height_to_page_cache;
 	EvViewCursor cursor;
 	EvJobRender *current_job;
 
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 7ee2e54..48b1081 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -323,6 +323,175 @@ static void       ev_view_presentation_transition_stop       (EvView
 
 G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT)
 
+/* HeightToPage cache */
+#define EV_HEIGHT_TO_PAGE_CACHE_KEY "ev-height-to-page-cache"
+
+static void
+build_height_to_page (EvHeightToPageCache *cache,
+		      EvDocument          *document,
+		      gint                 rotation)
+{
+	gboolean swap, uniform, dual_even_left;
+	int i;
+	double uniform_height, page_height, next_page_height;
+	double saved_height;
+	gdouble u_width, u_height;
+	gint n_pages;
+
+	swap = (rotation == 90 || rotation == 270);
+
+	uniform = ev_document_is_page_size_uniform (document);
+	n_pages = ev_document_get_n_pages (document);
+	dual_even_left = (n_pages > 2);
+
+	g_free (cache->height_to_page);
+	g_free (cache->dual_height_to_page);
+
+	cache->rotation = rotation;
+	cache->height_to_page = g_new0 (gdouble, n_pages + 1);
+	cache->dual_height_to_page = g_new0 (gdouble, n_pages + 2);
+
+	if (uniform)
+		ev_document_get_page_size (document, 0, &u_width, &u_height);
+
+	saved_height = 0;
+	for (i = 0; i <= n_pages; i++) {
+		if (uniform) {
+			uniform_height = swap ? u_width : u_height;
+			cache->height_to_page[i] = i * uniform_height;
+		} else {
+			if (i < n_pages) {
+				gdouble w, h;
+
+				ev_document_get_page_size (document, i, &w, &h);
+				page_height = swap ? w : h;
+			} else {
+				page_height = 0;
+			}
+			cache->height_to_page[i] = saved_height;
+			saved_height += page_height;
+		}
+	}
+
+	if (dual_even_left && !uniform) {
+		gdouble w, h;
+
+		ev_document_get_page_size (document, 0, &w, &h);
+		saved_height = swap ? w : h;
+	} else {
+		saved_height = 0;
+	}
+
+	for (i = dual_even_left; i < n_pages + 2; i += 2) {
+    		if (uniform) {
+			uniform_height = swap ? u_width : u_height;
+			cache->dual_height_to_page[i] = ((i + dual_even_left) / 2) * uniform_height;
+			if (i + 1 < n_pages + 2)
+				cache->dual_height_to_page[i + 1] = ((i + dual_even_left) / 2) * uniform_height;
+		} else {
+			if (i + 1 < n_pages) {
+				gdouble w, h;
+
+				ev_document_get_page_size (document, i + 1, &w, &h);
+				next_page_height = swap ? w : h;
+			} else {
+				next_page_height = 0;
+			}
+
+			if (i < n_pages) {
+				gdouble w, h;
+
+				ev_document_get_page_size (document, i, &w, &h);
+				page_height = swap ? w : h;
+			} else {
+				page_height = 0;
+			}
+
+			if (i + 1 < n_pages + 2) {
+				cache->dual_height_to_page[i] = saved_height;
+				cache->dual_height_to_page[i + 1] = saved_height;
+				saved_height += MAX(page_height, next_page_height);
+			} else {
+				cache->dual_height_to_page[i] = saved_height;
+			}
+		}
+	}
+}
+
+static void
+ev_height_to_page_cache_get_height (EvHeightToPageCache *cache,
+				    EvDocument          *document,
+				    gint                 page,
+				    gint                 rotation,
+				    gdouble             *height,
+				    gdouble             *dual_height)
+{
+	if (cache->rotation != rotation)
+		build_height_to_page (cache, document, rotation);
+
+	*height = cache->height_to_page[page];
+	*dual_height = cache->dual_height_to_page[page];
+}
+
+static void
+ev_height_to_page_cache_free (EvHeightToPageCache *cache)
+{
+	if (cache->height_to_page) {
+		g_free (cache->height_to_page);
+		cache->height_to_page = NULL;
+	}
+
+	if (cache->dual_height_to_page) {
+		g_free (cache->dual_height_to_page);
+		cache->dual_height_to_page = NULL;
+	}
+	g_free (cache);
+}
+
+static EvHeightToPageCache *
+ev_view_get_height_to_page_cache (EvView *view)
+{
+	EvHeightToPageCache *cache;
+
+	if (!view->document)
+		return NULL;
+
+	cache = g_object_get_data (G_OBJECT (view->document), EV_HEIGHT_TO_PAGE_CACHE_KEY);
+	if (!cache) {
+		cache = g_new0 (EvHeightToPageCache, 1);
+		build_height_to_page (cache, view->document, view->rotation);
+		g_object_set_data_full (G_OBJECT (view->document),
+					EV_HEIGHT_TO_PAGE_CACHE_KEY,
+					cache,
+					(GDestroyNotify)ev_height_to_page_cache_free);
+	}
+
+	return cache;
+}
+
+static void
+ev_view_get_height_to_page (EvView *view,
+			    gint    page,
+			    gint   *height,
+			    gint   *dual_height)
+{
+	gdouble h, dh;
+
+	if (!view->height_to_page_cache)
+		return;
+
+	ev_height_to_page_cache_get_height (view->height_to_page_cache,
+					    view->document,
+					    page,
+					    view->rotation,
+					    &h, &dh);
+	if (height)
+		*height = (gint)(h * view->scale + 0.5);
+
+	if (dual_height)
+		*dual_height = (gint)(dh * view->scale + 0.5);
+}
+
 static void
 scroll_to_current_page (EvView *view, GtkOrientation orientation)
 {
@@ -748,12 +917,10 @@ get_page_y_offset (EvView *view, int page, double zoom, int *y_offset)
 	compute_border (view, max_width, max_width, &border);
 
 	if (view->dual_page) {
-		ev_page_cache_get_height_to_page (view->page_cache, page,
-						  view->rotation, zoom, NULL, &offset);
+		ev_view_get_height_to_page (view, page, NULL, &offset);
 		offset += ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 + 1) * view->spacing + ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 ) * (border.top + border.bottom);
 	} else {
-		ev_page_cache_get_height_to_page (view->page_cache, page,
-						  view->rotation, zoom, &offset, NULL);
+		ev_view_get_height_to_page (view, page, &offset, NULL);
 		offset += (page + 1) * view->spacing + page * (border.top + border.bottom);
 	}
 
@@ -4758,6 +4925,7 @@ static void
 setup_caches (EvView *view)
 {
 	view->page_cache = ev_page_cache_get (view->document);
+	view->height_to_page_cache = ev_view_get_height_to_page_cache (view);
 	g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
 	view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
 	g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);