Fix some bugs with xyz links, respect zoom

[evince.git] / pdf / ev-poppler.cc

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index b4a6799521877a6c30733097665d29d4ec873e89..414bfb453fcd350a49613755bb8393763de413c3 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -243,30 +243,6 @@ pdf_document_get_n_pages (EvDocument *document)
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 

-static void
-set_page_orientation (PdfDocument *pdf_document, PopplerPage *page, int rotation)
-{
-       PopplerOrientation orientation;
-       int r = rotation;
-
-       orientation = poppler_page_get_orientation (page);
-
-       while (r > 0) {
-               if (orientation == POPPLER_ORIENTATION_PORTRAIT) {
-                       orientation = POPPLER_ORIENTATION_LANDSCAPE;
-               } else if (orientation == POPPLER_ORIENTATION_LANDSCAPE) {
-                       orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
-               } else if (orientation == POPPLER_ORIENTATION_UPSIDEDOWN) {
-                       orientation = POPPLER_ORIENTATION_SEASCAPE;
-               } else {
-                       orientation = POPPLER_ORIENTATION_PORTRAIT;
-               }
-               r -= 90;
-       }
-
-       poppler_page_set_orientation (page, orientation);
-}
-

 static void
 pdf_document_get_page_size (EvDocument   *document,
                            int           page,
 static void
 pdf_document_get_page_size (EvDocument   *document,
                            int           page,


@@ -351,11 +327,16 @@ pdf_document_render_pixbuf (EvDocument   *document,
        pdf_document = PDF_DOCUMENT (document);
 
        set_rc_data (pdf_document, rc);
        pdf_document = PDF_DOCUMENT (document);
 
        set_rc_data (pdf_document, rc);

-       set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);

 
        poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
 
        poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);

-       width = (int) ((width_points * rc->scale) + 0.5);
-       height = (int) ((height_points * rc->scale) + 0.5);
+
+       if (rc->rotation == 90 || rc->rotation == 270) {
+               width = (int) ((height_points * rc->scale) + 0.5);
+               height = (int) ((width_points * rc->scale) + 0.5);
+       } else {
+               width = (int) ((width_points * rc->scale) + 0.5);
+               height = (int) ((height_points * rc->scale) + 0.5);
+       }

 
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
                                 FALSE, 8,
 
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
                                 FALSE, 8,


@@ -365,6 +346,7 @@ pdf_document_render_pixbuf (EvDocument   *document,
                                       0, 0,
                                       width, height,
                                       rc->scale,
                                       0, 0,
                                       width, height,
                                       rc->scale,

+                                      rc->rotation,

                                       pixbuf);
        
        
                                       pixbuf);
        
        


@@ -720,19 +702,97 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links)
        return TRUE;
 }
 
        return TRUE;
 }
 

+static EvLink *
+ev_link_from_dest (PopplerAction *action)
+{
+       EvLink *link = NULL;
+       const char *unimplemented_dest = NULL;
+
+       switch (action->goto_dest.dest->type) {
+       case POPPLER_DEST_UNKNOWN:
+               unimplemented_dest = "POPPLER_DEST_UNKNOWN";
+               break;
+       case POPPLER_DEST_XYZ:
+               link = ev_link_new_page_xyz (action->any.title,
+                                            action->goto_dest.dest->page_num - 1,
+                                            action->goto_dest.dest->left,
+                                            action->goto_dest.dest->top,
+                                            action->goto_dest.dest->zoom);
+               break;
+       case POPPLER_DEST_FIT:
+               unimplemented_dest = "POPPLER_DEST_FIT";
+               break;
+       case POPPLER_DEST_FITH:
+               unimplemented_dest = "POPPLER_DEST_FITH";
+               break;
+       case POPPLER_DEST_FITV:
+               unimplemented_dest = "POPPLER_DEST_FITV";
+               break;
+       case POPPLER_DEST_FITR:
+               unimplemented_dest = "POPPLER_DEST_FITR";
+               break;
+       case POPPLER_DEST_FITB:
+               unimplemented_dest = "POPPLER_DEST_FITB";
+               break;
+       case POPPLER_DEST_FITBH:
+               unimplemented_dest = "POPPLER_DEST_FITBH";
+               break;
+       case POPPLER_DEST_FITBV:
+               unimplemented_dest = "POPPLER_DEST_FITBV";
+               break;
+       }
+
+       if (unimplemented_dest) {
+               g_warning ("Unimplemented destination: %s, please post a bug report with a testcase.",
+                          unimplemented_dest);
+       }
+
+       if (link == NULL) {
+               link = ev_link_new_page (action->any.title, action->goto_dest.dest->page_num - 1);
+       }
+
+       return link;
+}
+

 static EvLink *
 ev_link_from_action (PopplerAction *action)
 {
 static EvLink *
 ev_link_from_action (PopplerAction *action)
 {

-       EvLink *link;
+       EvLink *link = NULL;

        const char *title;
        const char *title;

+       const char *unimplemented_action = NULL;

 
        title = action->any.title;
 
        title = action->any.title;

-       
-       if (action->type == POPPLER_ACTION_GOTO_DEST) {
-               link = ev_link_new_page (title, action->goto_dest.dest->page_num - 1);
-       } else if (action->type == POPPLER_ACTION_URI) {
+
+       switch (action->type) {
+       case POPPLER_ACTION_UNKNOWN:
+               g_warning ("Unknown action"); 
+               break;
+       case POPPLER_ACTION_GOTO_DEST:
+               link = ev_link_from_dest (action);
+               break;
+       case POPPLER_ACTION_GOTO_REMOTE:
+               unimplemented_action = "POPPLER_ACTION_GOTO_REMOTE";
+               break;
+       case POPPLER_ACTION_LAUNCH:
+               unimplemented_action = "POPPLER_ACTION_LAUNCH";
+               break;
+       case POPPLER_ACTION_URI:

                link = ev_link_new_external (title, action->uri.uri);
                link = ev_link_new_external (title, action->uri.uri);

-       } else {
+               break;
+       case POPPLER_ACTION_NAMED:
+               unimplemented_action = "POPPLER_ACTION_NAMED";
+               break;
+       case POPPLER_ACTION_MOVIE:
+               unimplemented_action = "POPPLER_ACTION_MOVIE";
+               break;
+       }
+
+       if (unimplemented_action) {
+               g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
+                          unimplemented_action);
+       }
+
+       if (link == NULL) {

                link = ev_link_new_title (title);
        }
 
                link = ev_link_new_title (title);
        }
 


@@ -819,7 +879,6 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
        gdouble unscaled_width, unscaled_height;
 
        poppler_page = poppler_document_get_page (pdf_document->document, page);
        gdouble unscaled_width, unscaled_height;
 
        poppler_page = poppler_document_get_page (pdf_document->document, page);

-       set_page_orientation (pdf_document, poppler_page, rotation);

        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,


@@ -828,12 +887,22 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
        scale = width / unscaled_width;
 
        if (border) {
        scale = width / unscaled_width;
 
        if (border) {

-               pixbuf = ev_document_misc_get_thumbnail_frame (width, height, NULL);
+               pixbuf = ev_document_misc_get_thumbnail_frame (width, height, rotation, NULL);

 
 

+               width = gdk_pixbuf_get_width (pixbuf);
+               height = gdk_pixbuf_get_height (pixbuf);

                sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
                                                       1, 1,
                                                       width - 1, height - 1);
        } else {
                sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
                                                       1, 1,
                                                       width - 1, height - 1);
        } else {

+               /* rotate */
+               if (rotation == 90 || rotation == 270) {
+                       int temp;
+                       temp = width;
+                       width = height;
+                       height = temp;
+               }
+

                pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
                                         width, height);
                gdk_pixbuf_fill (pixbuf, 0xffffffff);
                pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
                                         width, height);
                gdk_pixbuf_fill (pixbuf, 0xffffffff);


@@ -844,7 +913,7 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 
        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,
 
        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,

-                                      scale, sub_pixbuf);
+                                      scale, rotation, sub_pixbuf);

 
        g_object_unref (G_OBJECT (sub_pixbuf));
 
 
        g_object_unref (G_OBJECT (sub_pixbuf));
 


@@ -866,7 +935,6 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 
        poppler_page = poppler_document_get_page (pdf_document->document, page);
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 
        poppler_page = poppler_document_get_page (pdf_document->document, page);

-       set_page_orientation (pdf_document, poppler_page, rotation);

        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);


@@ -876,7 +944,7 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                if (border) {
                        GdkPixbuf *real_pixbuf;
 
                if (border) {
                        GdkPixbuf *real_pixbuf;
 

-                       real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
+                       real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);

                        g_object_unref (pixbuf);
                        pixbuf = real_pixbuf;
                }
                        g_object_unref (pixbuf);
                        pixbuf = real_pixbuf;
                }


@@ -1153,7 +1221,6 @@ pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
        g_return_if_fail (pdf_document->ps_file != NULL);
 
        poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
        g_return_if_fail (pdf_document->ps_file != NULL);
 
        poppler_page = poppler_document_get_page (pdf_document->document, rc->page);

-       set_page_orientation (pdf_document, poppler_page, rc->rotation);

        poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
        g_object_unref (poppler_page);
 }
        poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
        g_object_unref (poppler_page);
 }


@@ -1182,8 +1249,8 @@ pdf_selection_render_selection (EvSelection      *selection,
                                GdkPixbuf       **pixbuf,
                                EvRectangle      *points,
                                EvRectangle      *old_points,
                                GdkPixbuf       **pixbuf,
                                EvRectangle      *points,
                                EvRectangle      *old_points,

-                               guint             text,
-                               guint             base)
+                               GdkColor        *text,
+                               GdkColor        *base)

 {
        PdfDocument *pdf_document;
        double width_points, height_points;
 {
        PdfDocument *pdf_document;
        double width_points, height_points;


@@ -1192,8 +1259,6 @@ pdf_selection_render_selection (EvSelection      *selection,
        pdf_document = PDF_DOCUMENT (selection);
        set_rc_data (pdf_document, rc);
 
        pdf_document = PDF_DOCUMENT (selection);
        set_rc_data (pdf_document, rc);
 

-       set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);
-

        poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
        poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);


@@ -1205,7 +1270,7 @@ pdf_selection_render_selection (EvSelection      *selection,
        }
        
        poppler_page_render_selection (POPPLER_PAGE (rc->data),
        }
        
        poppler_page_render_selection (POPPLER_PAGE (rc->data),

-                                      rc->scale, *pixbuf,
+                                      rc->scale, rc->rotation, *pixbuf,

                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
                                       text,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
                                       text,


@@ -1224,7 +1289,6 @@ pdf_selection_get_selection_region (EvSelection     *selection,
        pdf_document = PDF_DOCUMENT (selection);
 
        set_rc_data (pdf_document, rc);
        pdf_document = PDF_DOCUMENT (selection);
 
        set_rc_data (pdf_document, rc);

-       set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);

 
        retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points);
 
 
        retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points);
 


@@ -1243,7 +1307,6 @@ pdf_selection_get_selection_map (EvSelection     *selection,
        pdf_document = PDF_DOCUMENT (selection);
        poppler_page = poppler_document_get_page (pdf_document->document,
                                                  rc->page);
        pdf_document = PDF_DOCUMENT (selection);
        poppler_page = poppler_document_get_page (pdf_document->document,
                                                  rc->page);

-       set_page_orientation (pdf_document, poppler_page, rc->rotation);

 
        points.x1 = 0.0;
        points.y1 = 0.0;
 
        points.x1 = 0.0;
        points.y1 = 0.0;