Give priority to form fields over images when deciding whether a button

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

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 8af07fd4fdb8f3a4a63c8850a7f74323334ecffd..fa669fa170cc30dd48e072267ed1dcc227de0cd3 100644 (file)
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -19,10 +19,6 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#ifdef HAVE_POPPLER_FORM_FIELD_BUTTON_GET_BUTTON_TYPE
-#define HAVE_FORMS
-#endif
-

 #include <math.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>
 #include <gtk/gtk.h>


@@ -67,18 +63,19 @@ typedef struct {
 
 typedef struct {
        EvFileExporterFormat format;
 
 typedef struct {
        EvFileExporterFormat format;

-       PopplerPSFile *ps_file;

 
        /* Pages per sheet */
        gint pages_per_sheet;
        gint pages_printed;
        gint pages_x;
        gint pages_y;
 
        /* Pages per sheet */
        gint pages_per_sheet;
        gint pages_printed;
        gint pages_x;
        gint pages_y;

-       gdouble page_width;
-       gdouble page_height;
+       gdouble paper_width;
+       gdouble paper_height;

        
 #ifdef HAVE_CAIRO_PRINT
        cairo_t *cr;
        
 #ifdef HAVE_CAIRO_PRINT
        cairo_t *cr;

+#else
+       PopplerPSFile *ps_file;

 #endif
 } PdfPrintContext;
 
 #endif
 } PdfPrintContext;
 


@@ -126,7 +123,6 @@ static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 

-#ifdef HAVE_FORMS

 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                          {
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                          {
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,


@@ -152,31 +148,6 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
                                                        pdf_document_page_transition_iface_init);
                         });
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
                                                        pdf_document_page_transition_iface_init);
                         });

-#else /* !HAVE_FORMS */
-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                       pdf_document_document_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
-                                                       pdf_document_security_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                       pdf_document_document_thumbnails_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
-                                                       pdf_document_document_links_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
-                                                       pdf_document_document_images_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
-                                                       pdf_document_document_fonts_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
-                                                       pdf_document_find_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-                                                       pdf_document_file_exporter_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
-                                                       pdf_selection_iface_init);
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
-                                                       pdf_document_page_transition_iface_init);
-                        });
-#endif /* HAVE_FORMS */

 
 static void
 set_rc_data (PdfDocument     *pdf_document,
 
 static void
 set_rc_data (PdfDocument     *pdf_document,


@@ -565,12 +536,6 @@ pdf_document_set_password (EvDocumentSecurity *document_security,
        document->password = g_strdup (password);
 }
 
        document->password = g_strdup (password);
 }
 

-static gboolean
-pdf_document_can_get_text (EvDocument *document)
-{
-       return TRUE;
-}
-

 static EvDocumentInfo *
 pdf_document_get_info (EvDocument *document)
 {
 static EvDocumentInfo *
 pdf_document_get_info (EvDocument *document)
 {


@@ -716,31 +681,6 @@ pdf_document_get_info (EvDocument *document)
        return info;
 }
 
        return info;
 }
 

-static char *
-pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
-       PopplerPage *poppler_page;
-       PopplerRectangle r;
-       double height;
-       char *text;
-       
-       poppler_page = poppler_document_get_page (pdf_document->document, page);
-       g_return_val_if_fail (poppler_page != NULL, NULL);
-
-       poppler_page_get_size (poppler_page, NULL, &height);
-       r.x1 = rect->x1;
-       r.y1 = height - rect->y2;
-       r.x2 = rect->x2;
-       r.y2 = height - rect->y1;
-
-       text = poppler_page_get_text (poppler_page, &r);
-
-       g_object_unref (poppler_page);
-
-       return text;
-}
-

 static void
 pdf_document_document_iface_init (EvDocumentIface *iface)
 {
 static void
 pdf_document_document_iface_init (EvDocumentIface *iface)
 {


@@ -752,8 +692,6 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->has_attachments = pdf_document_has_attachments;
        iface->get_attachments = pdf_document_get_attachments;
        iface->render = pdf_document_render;
        iface->has_attachments = pdf_document_has_attachments;
        iface->get_attachments = pdf_document_get_attachments;
        iface->render = pdf_document_render;

-       iface->get_text = pdf_document_get_text;
-       iface->can_get_text = pdf_document_can_get_text;

        iface->get_info = pdf_document_get_info;
 };
 
        iface->get_info = pdf_document_get_info;
 };
 


@@ -1092,8 +1030,11 @@ build_tree (PdfDocument      *pdf_document,
                                break;
                }
                
                                break;
                }
                

-               if (!link) {
+               if (!link || strlen (ev_link_get_title (link)) <= 0) {

                        poppler_action_free (action);
                        poppler_action_free (action);

+                       if (link)
+                               g_object_unref (link);
+                       

                        continue;
                }
 
                        continue;
                }
 


@@ -1559,15 +1500,16 @@ pdf_print_context_free (PdfPrintContext *ctx)
        if (!ctx)
                return;
 
        if (!ctx)
                return;
 

-       if (ctx->ps_file) {
-               poppler_ps_file_free (ctx->ps_file);
-               ctx->ps_file = NULL;
-       }

 #ifdef HAVE_CAIRO_PRINT
        if (ctx->cr) {
                cairo_destroy (ctx->cr);
                ctx->cr = NULL;
        }
 #ifdef HAVE_CAIRO_PRINT
        if (ctx->cr) {
                cairo_destroy (ctx->cr);
                ctx->cr = NULL;
        }

+#else
+       if (ctx->ps_file) {
+               poppler_ps_file_free (ctx->ps_file);
+               ctx->ps_file = NULL;
+       }

 #endif
        g_free (ctx);
 }
 #endif
        g_free (ctx);
 }


@@ -1579,7 +1521,6 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
        gdouble width, height;
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
        gdouble width, height;

-       gboolean change_orient = FALSE;

 #ifdef HAVE_CAIRO_PRINT
        cairo_surface_t *surface = NULL;
 #endif
 #ifdef HAVE_CAIRO_PRINT
        cairo_surface_t *surface = NULL;
 #endif


@@ -1591,6 +1532,9 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
        ctx->format = fc->format;
        ctx->pages_per_sheet = fc->pages_per_sheet;
 
        ctx->format = fc->format;
        ctx->pages_per_sheet = fc->pages_per_sheet;
 

+       ctx->paper_width = fc->paper_width;
+       ctx->paper_height = fc->paper_height;
+       

        switch (fc->pages_per_sheet) {
                default:
                case 1:
        switch (fc->pages_per_sheet) {
                default:
                case 1:


@@ -1598,18 +1542,16 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        ctx->pages_y = 1;
                        break;
                case 2:
                        ctx->pages_y = 1;
                        break;
                case 2:

-                       change_orient = TRUE;
-                       ctx->pages_x = 2;
-                       ctx->pages_y = 1;
+                       ctx->pages_x = 1;
+                       ctx->pages_y = 2;

                        break;
                case 4:
                        ctx->pages_x = 2;
                        ctx->pages_y = 2;
                        break;
                case 6:
                        break;
                case 4:
                        ctx->pages_x = 2;
                        ctx->pages_y = 2;
                        break;
                case 6:

-                       change_orient = TRUE;
-                       ctx->pages_x = 3;
-                       ctx->pages_y = 2;
+                       ctx->pages_x = 2;
+                       ctx->pages_y = 3;

                        break;
                case 9:
                        ctx->pages_x = 3;
                        break;
                case 9:
                        ctx->pages_x = 3;


@@ -1621,23 +1563,12 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        break;
        }
 
                        break;
        }
 

-       if (change_orient) {
-               width = fc->paper_height;
-               height = fc->paper_width;
-       } else {
-               width = fc->paper_width;
-               height = fc->paper_height;
-       }
-
-       ctx->page_width = width / ctx->pages_x;
-       ctx->page_height = height / ctx->pages_y;
-

        ctx->pages_printed = 0;
 
        switch (fc->format) {
                case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS
        ctx->pages_printed = 0;
 
        switch (fc->format) {
                case EV_FILE_FORMAT_PS:
 #ifdef HAVE_CAIRO_PS

-                       surface = cairo_ps_surface_create (fc->filename, width, height);
+                       surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);

 #else
                        ctx->ps_file = poppler_ps_file_new (pdf_document->document,
                                                            fc->filename, fc->first_page,
 #else
                        ctx->ps_file = poppler_ps_file_new (pdf_document->document,
                                                            fc->filename, fc->first_page,


@@ -1648,7 +1579,7 @@ pdf_document_file_exporter_begin (EvFileExporter        *exporter,
                        break;
                case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF
                        break;
                case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF

-                       surface = cairo_pdf_surface_create (fc->filename, width, height);
+                       surface = cairo_pdf_surface_create (fc->filename, fc->paper_width, fc->paper_height);

 #endif
                        break;
                default:
 #endif
                        break;
                default:


@@ -1669,8 +1600,12 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
        PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
 #ifdef HAVE_CAIRO_PRINT
        PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
 #ifdef HAVE_CAIRO_PRINT

-       gdouble page_width, page_height;
-       gint    x, y;
+       gdouble  page_width, page_height;
+       gint     x, y;
+       gboolean rotate, landscape;
+       gdouble  width, height;
+       gdouble  pwidth, pheight;
+       gdouble  xscale, yscale;

 #endif
 
        g_return_if_fail (pdf_document->print_ctx != NULL);
 #endif
 
        g_return_if_fail (pdf_document->print_ctx != NULL);


@@ -1681,15 +1616,83 @@ pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
        x = (ctx->pages_printed % ctx->pages_per_sheet) % ctx->pages_x;
        y = (ctx->pages_printed % ctx->pages_per_sheet) / ctx->pages_x;
        poppler_page_get_size (poppler_page, &page_width, &page_height);
        x = (ctx->pages_printed % ctx->pages_per_sheet) % ctx->pages_x;
        y = (ctx->pages_printed % ctx->pages_per_sheet) / ctx->pages_x;
        poppler_page_get_size (poppler_page, &page_width, &page_height);

-       
+
+       if (page_width > page_height && page_width > ctx->paper_width) {
+               rotate = TRUE;
+       } else {
+               rotate = FALSE;
+       }
+
+       landscape = (ctx->paper_width > ctx->paper_height);
+
+       /* Use always portrait mode and rotate when necessary */
+       if (ctx->paper_width > ctx->paper_height) {
+               width = ctx->paper_height;
+               height = ctx->paper_width;
+               rotate = !rotate;
+
+               cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
+                                          width, height);
+       } else {
+               width = ctx->paper_width;
+               height = ctx->paper_height;
+       }
+
+       if (ctx->pages_per_sheet == 2 || ctx->pages_per_sheet == 6) {
+               rotate = !rotate;
+       }       
+
+       if (rotate) {
+               gint tmp1;
+               gdouble tmp2;
+
+               tmp1 = x;
+               x = y;
+               y = tmp1;
+
+               tmp2 = page_width;
+               page_width = page_height;
+               page_height = tmp2;
+
+       }
+
+       pwidth = width / ctx->pages_x;
+       pheight = height / ctx->pages_y;
+
+       if ((page_width > pwidth || page_height > pheight) ||
+           (page_width < pwidth && page_height < pheight)) {
+               xscale = pwidth / page_width;
+               yscale = pheight / page_height;
+               
+               if (yscale < xscale) {
+                       xscale = yscale;
+               } else {
+                       yscale = xscale;
+               }
+               
+       } else {        
+               xscale = yscale = 1;
+       }
+
+       /* TODO: center */
+

        cairo_save (ctx->cr);
        cairo_save (ctx->cr);

+       if (rotate) {
+               cairo_matrix_t matrix;
+               
+               cairo_translate (ctx->cr, width, 0);
+               cairo_matrix_init (&matrix,
+                                  0,  1,
+                                  -1,  0,
+                                  0,  0);
+               cairo_transform (ctx->cr, &matrix);
+       }
+       

        cairo_translate (ctx->cr,
        cairo_translate (ctx->cr,

-                        x * ctx->page_width,
-                        y * ctx->page_height);
-       cairo_scale (ctx->cr,
-                    ctx->page_width / page_width,
-                    ctx->page_height / page_height);
-
+                        x * (rotate ? pheight : pwidth),
+                        y * (rotate ? pwidth : pheight));
+       cairo_scale (ctx->cr, xscale, yscale);
+       

 #ifdef HAVE_POPPLER_PAGE_RENDER
        poppler_page_render (poppler_page, ctx->cr);
 #endif
 #ifdef HAVE_POPPLER_PAGE_RENDER
        poppler_page_render (poppler_page, ctx->cr);
 #endif


@@ -1756,6 +1759,7 @@ pdf_selection_render_selection (EvSelection      *selection,
                                cairo_surface_t **surface,
                                EvRectangle      *points,
                                EvRectangle      *old_points,
                                cairo_surface_t **surface,
                                EvRectangle      *points,
                                EvRectangle      *old_points,

+                               EvSelectionStyle  style,

                                GdkColor         *text,
                                GdkColor         *base)
 {
                                GdkColor         *text,
                                GdkColor         *base)
 {


@@ -1771,7 +1775,6 @@ pdf_selection_render_selection (EvSelection      *selection,
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
 
        width = (int) ((width_points * rc->scale) + 0.5);
        height = (int) ((height_points * rc->scale) + 0.5);
 

-

 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
 
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
 


@@ -1791,7 +1794,7 @@ pdf_selection_render_selection (EvSelection      *selection,
                                       cr,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,
                                       cr,
                                       (PopplerRectangle *)points,
                                       (PopplerRectangle *)old_points,

-                                      POPPLER_SELECTION_NORMAL, /* SelectionStyle */
+                                      (PopplerSelectionStyle)style,

                                       text,
                                       base);
        cairo_destroy (cr);
                                       text,
                                       base);
        cairo_destroy (cr);


@@ -1806,7 +1809,7 @@ pdf_selection_render_selection (EvSelection      *selection,
                                                 rc->scale, rc->rotation, pixbuf,
                                                 (PopplerRectangle *)points,
                                                 (PopplerRectangle *)old_points,
                                                 rc->scale, rc->rotation, pixbuf,
                                                 (PopplerRectangle *)points,
                                                 (PopplerRectangle *)old_points,

-                                                POPPLER_SELECTION_NORMAL, /* SelectionStyle */
+                                                (PopplerSelectionStyle)style,

                                                 text,
                                                 base);
        if (*surface)
                                                 text,
                                                 base);
        if (*surface)


@@ -1816,10 +1819,40 @@ pdf_selection_render_selection (EvSelection      *selection,
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 }
 
 #endif /* HAVE_POPPLER_PAGE_RENDER */
 }
 

+static gchar *
+pdf_selection_get_selected_text (EvSelection     *selection,
+                                EvRenderContext *rc,
+                                EvSelectionStyle style,
+                                EvRectangle     *points)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (selection);
+       PopplerPage *poppler_page;
+       PopplerRectangle r;
+       double height;
+       char *retval;
+       
+       poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+       g_return_val_if_fail (poppler_page != NULL, NULL);
+
+       poppler_page_get_size (poppler_page, NULL, &height);
+       r.x1 = points->x1;
+       r.y1 = height - points->y2;
+       r.x2 = points->x2;
+       r.y2 = height - points->y1;
+
+       retval = poppler_page_get_text (poppler_page,
+                                       (PopplerSelectionStyle)style,
+                                       &r);
+
+       g_object_unref (poppler_page);
+
+       return retval;
+}

 
 static GdkRegion *
 pdf_selection_get_selection_region (EvSelection     *selection,
                                    EvRenderContext *rc,
 
 static GdkRegion *
 pdf_selection_get_selection_region (EvSelection     *selection,
                                    EvRenderContext *rc,

+                                   EvSelectionStyle style,

                                    EvRectangle     *points)
 {
        PdfDocument *pdf_document;
                                    EvRectangle     *points)
 {
        PdfDocument *pdf_document;


@@ -1831,6 +1864,7 @@ pdf_selection_get_selection_region (EvSelection     *selection,
 
        retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
                                                    rc->scale,
 
        retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
                                                    rc->scale,

+                                                   (PopplerSelectionStyle)style,

                                                    (PopplerRectangle *) points);
        return retval;
 }
                                                    (PopplerRectangle *) points);
        return retval;
 }


@@ -1851,7 +1885,9 @@ pdf_selection_get_selection_map (EvSelection     *selection,
        points.x1 = 0.0;
        points.y1 = 0.0;
        poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
        points.x1 = 0.0;
        points.y1 = 0.0;
        poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));

-       retval = poppler_page_get_selection_region (poppler_page, 1.0, &points);
+       retval = poppler_page_get_selection_region (poppler_page, 1.0,
+                                                   POPPLER_SELECTION_GLYPH,
+                                                   &points);

        g_object_unref (poppler_page);
 
        return retval;
        g_object_unref (poppler_page);
 
        return retval;


@@ -1861,6 +1897,7 @@ static void
 pdf_selection_iface_init (EvSelectionIface *iface)
 {
         iface->render_selection = pdf_selection_render_selection;
 pdf_selection_iface_init (EvSelectionIface *iface)
 {
         iface->render_selection = pdf_selection_render_selection;

+       iface->get_selected_text = pdf_selection_get_selected_text;

         iface->get_selection_region = pdf_selection_get_selection_region;
         iface->get_selection_map = pdf_selection_get_selection_map;
 }
         iface->get_selection_region = pdf_selection_get_selection_region;
         iface->get_selection_map = pdf_selection_get_selection_map;
 }


@@ -1916,7 +1953,6 @@ pdf_document_get_crop_box (EvDocument  *document,
        rect->y2 = poppler_rect.y2;
 }
 
        rect->y2 = poppler_rect.y2;
 }
 

-#ifdef HAVE_FORMS

 static EvFormField *
 ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 {
 static EvFormField *
 ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
 {


@@ -1953,10 +1989,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                        field_text->do_scroll = poppler_form_field_text_do_scroll (poppler_field);
                        field_text->is_rich_text = poppler_form_field_text_is_rich_text (poppler_field);
                        field_text->is_password = poppler_form_field_text_is_password (poppler_field);
                        field_text->do_scroll = poppler_form_field_text_do_scroll (poppler_field);
                        field_text->is_rich_text = poppler_form_field_text_is_rich_text (poppler_field);
                        field_text->is_password = poppler_form_field_text_is_password (poppler_field);

-                       
-#ifdef HAVE_POPPLER_FORM_FIELD_TEXT_GET_MAX_LEN

                        field_text->max_len = poppler_form_field_text_get_max_len (poppler_field);
                        field_text->max_len = poppler_form_field_text_get_max_len (poppler_field);

-#endif

                        field_text->text = poppler_form_field_text_get_text (poppler_field);
 
                }
                        field_text->text = poppler_form_field_text_get_text (poppler_field);
 
                }


@@ -2285,4 +2318,4 @@ pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface)
        iface->form_field_choice_set_text = pdf_document_forms_form_field_choice_set_text;
        iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }
        iface->form_field_choice_set_text = pdf_document_forms_form_field_choice_set_text;
        iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }

-#endif /* HAVE_FORMS */
+