More compact EvView layout in documents with different page sizes

[evince.git] / backend / ev-page-cache.c

diff --git a/backend/ev-page-cache.c b/backend/ev-page-cache.c
index 4d64ee2e53740a30e2221421506d7350654c841a..17cd641437eaead3c315ab730b0e1c5470cffbc6 100644 (file)
--- a/backend/ev-page-cache.c
+++ b/backend/ev-page-cache.c
@@ -19,12 +19,21 @@ struct _EvPageCache
        int n_pages;
        char *title;
        char **page_labels;
        int n_pages;
        char *title;
        char **page_labels;

-
+       
+       gint max_label_chars;
+       gboolean has_labels;

        gboolean uniform;
        gboolean uniform;

+       

        double uniform_width;
        double uniform_height;
 
        double uniform_width;
        double uniform_height;
 

+       double  max_width;
+       double  max_height;
+       double* height_to_page;
+       double* dual_height_to_page;
+

        EvPageCacheInfo *size_cache;
        EvPageCacheInfo *size_cache;

+       EvDocumentInfo *page_info;

 };
 
 struct _EvPageCacheClass
 };
 
 struct _EvPageCacheClass


@@ -51,7 +60,8 @@ G_DEFINE_TYPE (EvPageCache, ev_page_cache, G_TYPE_OBJECT)
 static void
 ev_page_cache_init (EvPageCache *page_cache)
 {
 static void
 ev_page_cache_init (EvPageCache *page_cache)
 {

-       page_cache->current_page = 0;
+       page_cache->current_page = -1;
+       page_cache->max_label_chars = 0;

 }
 
 static void
 }
 
 static void


@@ -84,34 +94,73 @@ ev_page_cache_finalize (GObject *object)
 
        g_free (page_cache->title);
        g_free (page_cache->size_cache);
 
        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);
+
+       ev_document_info_free (page_cache->page_info);

 }
 
 EvPageCache *
 _ev_page_cache_new (EvDocument *document)
 {
 }
 
 EvPageCache *
 _ev_page_cache_new (EvDocument *document)
 {

+       EvDocumentInfo *doc_info;

        EvPageCache *page_cache;
        EvPageCacheInfo *info;
        gint i;
        EvPageCache *page_cache;
        EvPageCacheInfo *info;
        gint i;

+       double saved_height;

 
        page_cache = (EvPageCache *) g_object_new (EV_TYPE_PAGE_CACHE, NULL);
 
 
        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;
 
        /* 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->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->page_labels = g_new0 (char *, page_cache->n_pages);

+       page_cache->max_width = 0;
+       page_cache->max_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;
 
        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);
                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->page_labels[i] != NULL) {
+               
+                       page_cache->max_label_chars = MAX(page_cache->max_label_chars, 
+                                                           g_utf8_strlen (page_cache->page_labels[i], 256));
+                       if (!page_cache->has_labels) {
+                               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_cache->max_width = page_width;
+               }
+
+               if (page_height > page_cache->max_height) {
+                       page_cache->max_height = page_height;
+               }
+                       

                if (i == 0) {
                        page_cache->uniform_width = page_width;
                        page_cache->uniform_height = page_height;
                if (i == 0) {
                        page_cache->uniform_width = page_width;
                        page_cache->uniform_height = page_height;


@@ -123,31 +172,68 @@ _ev_page_cache_new (EvDocument *document)
 
                        page_cache->size_cache = g_new0 (EvPageCacheInfo, page_cache->n_pages);
 
 
                        page_cache->size_cache = g_new0 (EvPageCacheInfo, page_cache->n_pages);
 

-                       for (j = 1; j < i; j++) {
-                               info = &(page_cache->size_cache [j - 1]);
-                               info->width = page_width;
-                               info->height = page_height;
+                       for (j = 0; j < i; j++) {
+                               info = &(page_cache->size_cache [j]);
+                               info->width = page_cache->uniform_width;
+                               info->height = page_cache->uniform_height;

                        }
                        page_cache->uniform = FALSE;
 
                }
 
                if (! page_cache->uniform) {
                        }
                        page_cache->uniform = FALSE;
 
                }
 
                if (! page_cache->uniform) {

-                       info = &(page_cache->size_cache [i - 1]);
+                       info = &(page_cache->size_cache [i]);

 
                        info->width = page_width;
                        info->height = page_height;
                }
        }
 
 
                        info->width = page_width;
                        info->height = page_height;
                }
        }
 

+       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);
+       
+       saved_height = 0;
+       for (i = 0; i < page_cache->n_pages; i++) {
+
+               if (page_cache->uniform) {
+                       page_cache->height_to_page [i] = (i + 1) * page_cache->uniform_height;
+               } else {
+                       page_cache->height_to_page [i] = saved_height + page_cache->size_cache [i].height;
+                       saved_height = page_cache->height_to_page [i];
+               }
+       }
+       
+       saved_height = 0;
+       for (i = 0; i < page_cache->n_pages; i += 2) {
+
+               if (page_cache->uniform) {
+                       page_cache->dual_height_to_page [i / 2] = (i / 2 + 1) * page_cache->uniform_height;
+               } else {
+                       if (i == page_cache->n_pages - 1) {
+                               page_cache->dual_height_to_page [i / 2] =
+                                       saved_height + page_cache->size_cache [i].height;
+                       }
+                       else {
+                               page_cache->dual_height_to_page [i / 2] = saved_height +
+                                      MAX(page_cache->size_cache [i].height,                               
+                                          page_cache->size_cache [i + 1].height);
+                               saved_height = page_cache->dual_height_to_page [i / 2];
+                       }
+               }
+       }
+
+       page_cache->page_info = ev_document_get_info (document);
+

        /* make some sanity check assertions */
        /* make some sanity check assertions */

-       g_assert (page_cache->n_pages > 0);

        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);
 
        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);

 
        return page_cache;
 }
 
        return page_cache;
 }


@@ -266,11 +352,68 @@ ev_page_cache_get_size (EvPageCache *page_cache,
        }
 
        if (width)
        }
 
        if (width)

-               *width = (*width) * scale;
+               *width = (int) ((*width) * scale + 0.5);

        if (width)
        if (width)

-               *height = (*height) * scale;
+               *height = (int) ((*height) * scale + 0.5);

 
 }
 
 }

+
+
+void
+ev_page_cache_get_max_width      (EvPageCache *page_cache,
+                                 gfloat       scale,
+                                 gint        *width)
+{
+       g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
+
+       if (width)
+               *width = page_cache->max_width * scale;
+}
+
+void
+ev_page_cache_get_max_height      (EvPageCache *page_cache,
+                                  gfloat       scale,
+                                  gint        *height)
+{
+       g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
+
+       if (height)
+               *height = page_cache->max_height * scale;
+}
+
+void    
+ev_page_cache_get_height_to_page (EvPageCache *page_cache,
+                                 gint page,
+                                 gfloat       scale,
+                                 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 > 0)
+               result = page_cache->height_to_page [page - 1]; 
+       
+       if (height)
+               *height = result * scale;
+
+       if (page > 1)
+               dual_result = page_cache->dual_height_to_page [page / 2 - 1];   
+       
+       if (dual_height)
+               *dual_height = dual_result * scale;
+}
+
+gint
+ev_page_cache_get_max_label_chars (EvPageCache *page_cache)
+{
+       g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
+       
+       return page_cache->max_label_chars;
+}
+

 gchar *
 ev_page_cache_get_page_label (EvPageCache *page_cache,
                              gint         page)
 gchar *
 ev_page_cache_get_page_label (EvPageCache *page_cache,
                              gint         page)


@@ -284,6 +427,21 @@ ev_page_cache_get_page_label (EvPageCache *page_cache,
        return g_strdup (page_cache->page_labels[page]);
 }
 
        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;
+}
+
+const EvDocumentInfo *
+ev_page_cache_get_info (EvPageCache *page_cache)
+{
+       g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), NULL);
+
+       return page_cache->page_info;
+}
+

 
 gboolean
 ev_page_cache_next_page (EvPageCache *page_cache)
 
 gboolean
 ev_page_cache_next_page (EvPageCache *page_cache)