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=ebf0de7f9b69f8d2409e51d69f75dabb0438d4aa;hb=4f6105d3df2cbf07bccd7de156693aab7e71bc31;hp=389bafca8bd03012e66ed1e38bbb490d99871a75;hpb=eb3d8c8e3df570e32e2591eeb650de55dba2f613;p=evince.git

diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
index 389bafca..ebf0de7f 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;
@@ -44,11 +45,13 @@ struct _EvPageCacheClass
 	GObjectClass parent_class;
 
 	void (* page_changed) (EvPageCache *page_cache, gint page);
+	void (* history_changed) (EvPageCache *page_cache, gint page);
 };
 
 enum
 {
 	PAGE_CHANGED,
+	HISTORY_CHANGED,
 	N_SIGNALS,
 };
 
@@ -86,6 +89,16 @@ ev_page_cache_class_init (EvPageCacheClass *class)
 			      G_TYPE_NONE, 1,
 			      G_TYPE_INT);
 
+	signals [HISTORY_CHANGED] =
+		g_signal_new ("history-changed",
+			      EV_TYPE_PAGE_CACHE,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EvPageCacheClass, history_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__INT,
+			      G_TYPE_NONE, 1,
+			      G_TYPE_INT);
+
 }
 
 static void
@@ -95,12 +108,43 @@ ev_page_cache_finalize (GObject *object)
 
 	page_cache = EV_PAGE_CACHE (object);
 
-	g_free (page_cache->title);
-	g_free (page_cache->size_cache);
-	g_free (page_cache->height_to_page);
-	g_free (page_cache->dual_height_to_page);
+	if (page_cache->title) {
+		g_free (page_cache->title);
+		page_cache->title = NULL;
+	}
+
+	if (page_cache->size_cache) {
+		g_free (page_cache->size_cache);
+		page_cache->size_cache = 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;
+	}
 
-	ev_document_info_free (page_cache->page_info);
+	if (page_cache->page_labels) {
+		gint i;
+
+		for (i = 0; i < page_cache->n_pages; i++) {
+			if (page_cache->page_labels[i])
+				g_free (page_cache->page_labels[i]);
+		}
+		g_free (page_cache->page_labels);
+		page_cache->page_labels = NULL;
+	}
+
+	if (page_cache->page_info) {
+		ev_document_info_free (page_cache->page_info);
+		page_cache->page_info = NULL;
+	}
+
+	G_OBJECT_CLASS (ev_page_cache_parent_class)->finalize (object);
 }
 
 static void
@@ -140,7 +184,7 @@ build_height_to_page (EvPageCache *page_cache)
 		}
 	}
 
-	if (DUAL_EVEN_LEFT && !page_cache->uniform) {
+	if (page_cache->dual_even_left && !page_cache->uniform) {
 		if (!swap) {
 			saved_height = page_cache->size_cache [0].height;
 		} else {
@@ -149,16 +193,16 @@ build_height_to_page (EvPageCache *page_cache)
 	} else {
 		saved_height = 0;
 	}
-	for (i = DUAL_EVEN_LEFT; i < page_cache->n_pages + 2; i += 2) {
+	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] = ((i + DUAL_EVEN_LEFT) / 2) * 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 + DUAL_EVEN_LEFT) / 2) * uniform_height;
+				page_cache->dual_height_to_page [i + 1] = ((i + page_cache->dual_even_left) / 2) * uniform_height;
 		} else {
 			if (i + 1 < page_cache->n_pages) {
 				if (!swap) {
@@ -206,6 +250,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;
@@ -321,6 +366,16 @@ ev_page_cache_set_current_page (EvPageCache *page_cache,
 	g_signal_emit (page_cache, signals[PAGE_CHANGED], 0, page);
 }
 
+void
+ev_page_cache_set_current_page_history (EvPageCache *page_cache,
+					int          page)
+{
+	if (abs (page - page_cache->current_page) > 1)
+		g_signal_emit (page_cache, signals [HISTORY_CHANGED], 0, page);
+	
+	ev_page_cache_set_current_page (page_cache, page);
+}
+
 gboolean
 ev_page_cache_set_page_label (EvPageCache *page_cache,
 			      const char  *page_label)
@@ -350,8 +405,7 @@ ev_page_cache_set_page_label (EvPageCache *page_cache,
 		/* convert from a page label to a page offset */
 		page --;
 		if (page >= 0 &&
-		    page < page_cache->n_pages &&
-		    page_cache->page_labels[page] == NULL) {
+		    page < page_cache->n_pages) {
 			ev_page_cache_set_current_page (page_cache, page);
 			return TRUE;
 		}
@@ -469,6 +523,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)