gint max_label_chars;
gboolean has_labels;
gboolean uniform;
+ gboolean dual_even_left;
double uniform_width;
double uniform_height;
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,
};
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
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;
+ }
- ev_document_info_free (page_cache->page_info);
+ 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;
+ }
+
+ 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
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;
}
}
}
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;
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)
/* 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;
}
gint *width,
gint *height)
{
- int w, h;
+ double w, h;
g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
g_return_if_fail (page >= 0 && page < page_cache->n_pages);
h = info->height;
}
- w = (int) (w * scale + 0.5);
- h = (int) (h * scale + 0.5);
+ w = w * scale + 0.5;
+ h = h * scale + 0.5;
if (rotation == 0 || rotation == 180) {
- if (width) *width = w;
- if (height) *height = h;
+ if (width) *width = (int)w;
+ if (height) *height = (int)h;
} else {
- if (width) *width = h;
- if (height) *height = w;
+ if (width) *width = (int)h;
+ if (height) *height = (int)w;
}
}
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
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)