]> www.fi.muni.cz Git - evince.git/blobdiff - backend/pdf/ev-poppler.cc
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
New files, define a page transition effect, at the moment it maps
[evince.git] / backend / pdf / ev-poppler.cc
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 3b3fe2be7f0cf8af2ab524a1c06343468b447795..5b0398047c458ec8e84f286739270951c9b20a58 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>
@@ -32,6 +28,9 @@
 #ifdef HAVE_CAIRO_PDF
 #include <cairo-pdf.h>
 #endif
 #ifdef HAVE_CAIRO_PDF
 #include <cairo-pdf.h>
 #endif
+#ifdef HAVE_CAIRO_PS
+#include <cairo-ps.h>
+#endif
 #include <glib/gi18n.h>
 
 #include "ev-poppler.h"
 #include <glib/gi18n.h>
 
 #include "ev-poppler.h"
@@ -49,6 +48,10 @@
 #include "ev-attachment.h"
 #include "ev-image.h"
 
 #include "ev-attachment.h"
 #include "ev-image.h"
 
+#if (defined (HAVE_POPPLER_PAGE_RENDER) || defined (HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
+#define HAVE_CAIRO_PRINT
+#endif
+
 typedef struct {
        PdfDocument *document;
        char *text;
 typedef struct {
        PdfDocument *document;
        char *text;
@@ -60,9 +63,19 @@ typedef struct {
 
 typedef struct {
        EvFileExporterFormat format;
 
 typedef struct {
        EvFileExporterFormat format;
+
+       /* Pages per sheet */
+       gint pages_per_sheet;
+       gint pages_printed;
+       gint pages_x;
+       gint pages_y;
+       gdouble paper_width;
+       gdouble paper_height;
+       
+#ifdef HAVE_CAIRO_PRINT
+       cairo_t *cr;
+#else
        PopplerPSFile *ps_file;
        PopplerPSFile *ps_file;
-#ifdef HAVE_CAIRO_PDF
-       cairo_t *pdf_cairo;
 #endif
 } PdfPrintContext;
 
 #endif
 } PdfPrintContext;
 
@@ -110,10 +123,8 @@ 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);
 
-G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
-                         {
-                                G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                       pdf_document_document_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
+                        {
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
                                                        pdf_document_security_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
                                                        pdf_document_security_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
@@ -122,10 +133,8 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                                                        pdf_document_document_links_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
                                                        pdf_document_document_images_iface_init);
                                                        pdf_document_document_links_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
                                                        pdf_document_document_images_iface_init);
-#ifdef HAVE_FORMS
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
                                                        pdf_document_document_forms_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
                                                        pdf_document_document_forms_iface_init);
-#endif /* HAVE_FORMS */
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
                                                        pdf_document_document_fonts_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
                                                        pdf_document_document_fonts_iface_init);
                                 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
@@ -138,7 +147,6 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                                                        pdf_document_page_transition_iface_init);
                         });
 
                                                        pdf_document_page_transition_iface_init);
                         });
 
-
 static void
 set_rc_data (PdfDocument     *pdf_document,
             EvRenderContext *rc)
 static void
 set_rc_data (PdfDocument     *pdf_document,
             EvRenderContext *rc)
@@ -461,7 +469,7 @@ pdf_document_render (EvDocument      *document,
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
        
 #ifdef HAVE_POPPLER_PAGE_RENDER
        cairo_t *cr;
        
-       surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+       surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
                                              width, height);
        memset (cairo_image_surface_get_data (surface), 0xff,
                cairo_image_surface_get_height (surface) *
                                              width, height);
        memset (cairo_image_surface_get_data (surface), 0xff,
                cairo_image_surface_get_height (surface) *
@@ -526,12 +534,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)
 {
@@ -677,31 +679,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)
 {
@@ -713,8 +690,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;
 };
 
@@ -882,7 +857,10 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                        ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
                                                        dest->left,
                                                        height - dest->top,
                        ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
                                                        dest->left,
                                                        height - dest->top,
-                                                       dest->zoom);
+                                                       dest->zoom,
+                                                       dest->change_left,
+                                                       dest->change_top,
+                                                       dest->change_zoom);
                        g_object_unref (poppler_page);
                }
                        break;
                        g_object_unref (poppler_page);
                }
                        break;
@@ -897,13 +875,15 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
                                                                  MAX (0, dest->page_num - 1));
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
                                                                  MAX (0, dest->page_num - 1));
                        poppler_page_get_size (poppler_page, NULL, &height);
                        ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
-                                                        height - dest->top);
+                                                        height - dest->top,
+                                                        dest->change_top);
                        g_object_unref (poppler_page);
                }
                        break;
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
                        g_object_unref (poppler_page);
                }
                        break;
                case POPPLER_DEST_FITV:
                        ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
-                                                        dest->left);
+                                                        dest->left,
+                                                        dest->change_left);
                        break;
                case POPPLER_DEST_FITR: {
                        PopplerPage *poppler_page;
                        break;
                case POPPLER_DEST_FITR: {
                        PopplerPage *poppler_page;
@@ -1053,8 +1033,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;
                }
 
@@ -1254,7 +1237,15 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
        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);
-       if (!pixbuf) {
+       if (pixbuf) {
+               /* Rotate provided thumbnail if needed */
+               GdkPixbuf *rotated_pixbuf;
+
+               rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
+                                                          (GdkPixbufRotation) (360 - rc->rotation));
+               g_object_unref (pixbuf);
+               pixbuf = rotated_pixbuf;
+       } else {
                /* There is no provided thumbnail.  We need to make one. */
                pixbuf = make_thumbnail_for_page (pdf_document, poppler_page, rc);
        }
                /* There is no provided thumbnail.  We need to make one. */
                pixbuf = make_thumbnail_for_page (pdf_document, poppler_page, rc);
        }
@@ -1506,120 +1497,262 @@ pdf_document_find_iface_init (EvDocumentFindIface *iface)
         iface->cancel = pdf_document_find_cancel;
 }
 
         iface->cancel = pdf_document_find_cancel;
 }
 
-static const gboolean supported_formats[] = {
-       TRUE, /* EV_FILE_FORMAT_PS */
-#ifdef HAVE_CAIRO_PDF
-#ifdef HAVE_POPPLER_PAGE_RENDER
-       TRUE, /* EV_FILE_FORMAT_PDF */
-#else
-       FALSE, /* EV_FILE_FORMAT_PDF */
-#endif
-#endif
-};
-
 static void
 pdf_print_context_free (PdfPrintContext *ctx)
 {
        if (!ctx)
                return;
 
 static void
 pdf_print_context_free (PdfPrintContext *ctx)
 {
        if (!ctx)
                return;
 
+#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;
        }
        if (ctx->ps_file) {
                poppler_ps_file_free (ctx->ps_file);
                ctx->ps_file = NULL;
        }
-#ifdef HAVE_CAIRO_PDF
-       if (ctx->pdf_cairo) {
-               cairo_destroy (ctx->pdf_cairo);
-               ctx->pdf_cairo = NULL;
-       }
 #endif
        g_free (ctx);
 }
 
 #endif
        g_free (ctx);
 }
 
-static gboolean
-pdf_document_file_exporter_format_supported (EvFileExporter      *exporter,
-                                            EvFileExporterFormat format)
-{
-       return supported_formats[format];
-}
-
 static void
 static void
-pdf_document_file_exporter_begin (EvFileExporter      *exporter,
-                                 EvFileExporterFormat format,
-                                 const char          *filename,
-                                 int                  first_page,
-                                 int                  last_page,
-                                 double               width,
-                                 double               height,
-                                 gboolean             duplex)
+pdf_document_file_exporter_begin (EvFileExporter        *exporter,
+                                 EvFileExporterContext *fc)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx;
-
+#ifdef HAVE_CAIRO_PRINT
+       gdouble width, height;
+       cairo_surface_t *surface = NULL;
+#endif
+       
        if (pdf_document->print_ctx)
                pdf_print_context_free (pdf_document->print_ctx);
        pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
        ctx = pdf_document->print_ctx;
        if (pdf_document->print_ctx)
                pdf_print_context_free (pdf_document->print_ctx);
        pdf_document->print_ctx = g_new0 (PdfPrintContext, 1);
        ctx = pdf_document->print_ctx;
-       ctx->format = format;
+       ctx->format = fc->format;
        
        
-       switch (format) {
-               case EV_FILE_FORMAT_PS:
-                       ctx->ps_file = poppler_ps_file_new (pdf_document->document,
-                                                           filename, first_page,
-                                                           last_page - first_page + 1);
-                       poppler_ps_file_set_paper_size (ctx->ps_file, width, height);
-                       poppler_ps_file_set_duplex (ctx->ps_file, duplex);
+#ifdef HAVE_CAIRO_PRINT
+       ctx->pages_per_sheet = CLAMP (fc->pages_per_sheet, 1, 16);
 
 
+       ctx->paper_width = fc->paper_width;
+       ctx->paper_height = fc->paper_height;
+       
+       switch (fc->pages_per_sheet) {
+               default:
+               case 1:
+                       ctx->pages_x = 1;
+                       ctx->pages_y = 1;
+                       break;
+               case 2:
+                       ctx->pages_x = 1;
+                       ctx->pages_y = 2;
+                       break;
+               case 4:
+                       ctx->pages_x = 2;
+                       ctx->pages_y = 2;
                        break;
                        break;
-               case EV_FILE_FORMAT_PDF: {
+               case 6:
+                       ctx->pages_x = 2;
+                       ctx->pages_y = 3;
+                       break;
+               case 9:
+                       ctx->pages_x = 3;
+                       ctx->pages_y = 3;
+                       break;
+               case 16:
+                       ctx->pages_x = 4;
+                       ctx->pages_y = 4;
+                       break;
+       }
+
+       ctx->pages_printed = 0;
+       
+       switch (fc->format) {
+               case EV_FILE_FORMAT_PS:
+#ifdef HAVE_CAIRO_PS
+                       surface = cairo_ps_surface_create (fc->filename, fc->paper_width, fc->paper_height);
+#endif
+                       break;
+               case EV_FILE_FORMAT_PDF:
 #ifdef HAVE_CAIRO_PDF
 #ifdef HAVE_CAIRO_PDF
-                       cairo_surface_t *surface;
-                       
-                       surface = cairo_pdf_surface_create (filename, width, height);
-                       ctx->pdf_cairo = cairo_create (surface);
-                       cairo_surface_destroy (surface);
+                       surface = cairo_pdf_surface_create (fc->filename, fc->paper_width, fc->paper_height);
 #endif
 #endif
-               }
                        break;
                default:
                        g_assert_not_reached ();
        }
                        break;
                default:
                        g_assert_not_reached ();
        }
+
+       ctx->cr = cairo_create (surface);
+       cairo_surface_destroy (surface);
+
+#else /* HAVE_CAIRO_PRINT */
+       if (ctx->format == EV_FILE_FORMAT_PS) {
+               ctx->ps_file = poppler_ps_file_new (pdf_document->document,
+                                                   fc->filename, fc->first_page,
+                                                   fc->last_page - fc->first_page + 1);
+               poppler_ps_file_set_paper_size (ctx->ps_file, fc->paper_width, fc->paper_height);
+               poppler_ps_file_set_duplex (ctx->ps_file, fc->duplex);
+       }
+#endif /* HAVE_CAIRO_PRINT */
+}
+
+static void
+pdf_document_file_exporter_begin_page (EvFileExporter *exporter)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx = pdf_document->print_ctx;
+       
+       g_return_if_fail (pdf_document->print_ctx != NULL);
+
+       ctx->pages_printed = 0;
+       
+#ifdef HAVE_CAIRO_PRINT
+       if (ctx->paper_width > ctx->paper_height) {
+               if (ctx->format == EV_FILE_FORMAT_PS) {
+                       cairo_ps_surface_set_size (cairo_get_target (ctx->cr),
+                                                  ctx->paper_height,
+                                                  ctx->paper_width);
+               } else if (ctx->format == EV_FILE_FORMAT_PDF) {
+                       cairo_pdf_surface_set_size (cairo_get_target (ctx->cr),
+                                                   ctx->paper_height,
+                                                   ctx->paper_width);
+               }
+       }
+#endif /* HAVE_CAIRO_PRINT */
 }
 
 static void
 }
 
 static void
-pdf_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *rc)
+pdf_document_file_exporter_do_page (EvFileExporter  *exporter,
+                                   EvRenderContext *rc)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
        PdfPrintContext *ctx = pdf_document->print_ctx;
        PopplerPage *poppler_page;
+#ifdef HAVE_CAIRO_PRINT
+       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);
 
        poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
 
        g_return_if_fail (pdf_document->print_ctx != NULL);
 
        poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+       
+#ifdef HAVE_CAIRO_PRINT
+       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);
 
 
-       switch (ctx->format) {
-               case EV_FILE_FORMAT_PS:
-                       poppler_page_render_to_ps (poppler_page, ctx->ps_file);
-                       break;
-               case EV_FILE_FORMAT_PDF:
-#ifdef HAVE_CAIRO_PDF
-                       cairo_save (ctx->pdf_cairo);
-#endif
+       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;
+       } 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);
+       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,
+                        x * (rotate ? pheight : pwidth),
+                        y * (rotate ? pwidth : pheight));
+       cairo_scale (ctx->cr, xscale, yscale);
+
+#ifdef HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING
+       poppler_page_render_for_printing (poppler_page, ctx->cr);
+#else
 #ifdef HAVE_POPPLER_PAGE_RENDER
 #ifdef HAVE_POPPLER_PAGE_RENDER
-                       poppler_page_render (poppler_page, ctx->pdf_cairo);
+       poppler_page_render (poppler_page, ctx->cr);
 #endif
 #endif
-#ifdef HAVE_CAIRO_PDF
-                       cairo_show_page (ctx->pdf_cairo);
-                       cairo_restore (ctx->pdf_cairo);
 #endif
 #endif
-                       break;
-               default:
-                       g_assert_not_reached ();
-       }
+
+       ctx->pages_printed++;
+                       
+       cairo_restore (ctx->cr);
+#else /* HAVE_CAIRO_PRINT */
+       if (ctx->format == EV_FILE_FORMAT_PS)
+               poppler_page_render_to_ps (poppler_page, ctx->ps_file);
+#endif /* HAVE_CAIRO_PRINT */
        
        g_object_unref (poppler_page);
 }
 
        
        g_object_unref (poppler_page);
 }
 
+static void
+pdf_document_file_exporter_end_page (EvFileExporter *exporter)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
+       PdfPrintContext *ctx = pdf_document->print_ctx;
+       
+       g_return_if_fail (pdf_document->print_ctx != NULL);
+
+#ifdef HAVE_CAIRO_PRINT
+       cairo_show_page (ctx->cr);
+#endif
+}
+
 static void
 pdf_document_file_exporter_end (EvFileExporter *exporter)
 {
 static void
 pdf_document_file_exporter_end (EvFileExporter *exporter)
 {
@@ -1629,13 +1762,40 @@ pdf_document_file_exporter_end (EvFileExporter *exporter)
        pdf_document->print_ctx = NULL;
 }
 
        pdf_document->print_ctx = NULL;
 }
 
+static EvFileExporterCapabilities
+pdf_document_file_exporter_get_capabilities (EvFileExporter *exporter)
+{
+       return  (EvFileExporterCapabilities) (
+               EV_FILE_EXPORTER_CAN_PAGE_SET |
+               EV_FILE_EXPORTER_CAN_COPIES |
+               EV_FILE_EXPORTER_CAN_COLLATE |
+               EV_FILE_EXPORTER_CAN_REVERSE |
+               EV_FILE_EXPORTER_CAN_SCALE |
+#ifdef HAVE_CAIRO_PRINT
+#ifdef HAVE_POPPLER_PAGE_RENDER
+#if GTK_CHECK_VERSION (2, 11, 1)
+               EV_FILE_EXPORTER_CAN_NUMBER_UP |
+#endif
+#endif
+#endif
+               
+#ifdef HAVE_CAIRO_PDF
+#ifdef HAVE_POPPLER_PAGE_RENDER
+               EV_FILE_EXPORTER_CAN_GENERATE_PDF |
+#endif
+#endif
+               EV_FILE_EXPORTER_CAN_GENERATE_PS);
+}
+
 static void
 pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
 static void
 pdf_document_file_exporter_iface_init (EvFileExporterIface *iface)
 {
-       iface->format_supported = pdf_document_file_exporter_format_supported;
         iface->begin = pdf_document_file_exporter_begin;
         iface->begin = pdf_document_file_exporter_begin;
+       iface->begin_page = pdf_document_file_exporter_begin_page;
         iface->do_page = pdf_document_file_exporter_do_page;
         iface->do_page = pdf_document_file_exporter_do_page;
+       iface->end_page = pdf_document_file_exporter_end_page;
         iface->end = pdf_document_file_exporter_end;
         iface->end = pdf_document_file_exporter_end;
+       iface->get_capabilities = pdf_document_file_exporter_get_capabilities;
 }
 
 static void
 }
 
 static void
@@ -1644,6 +1804,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)
 {
@@ -1659,7 +1820,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;
 
@@ -1679,7 +1839,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);
@@ -1694,7 +1854,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)
@@ -1704,10 +1864,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;
@@ -1719,6 +1909,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;
 }
@@ -1739,7 +1930,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;
@@ -1749,6 +1942,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;
 }
@@ -1779,12 +1973,6 @@ pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface)
        iface->get_page_duration = pdf_document_get_page_duration;
 }
 
        iface->get_page_duration = pdf_document_get_page_duration;
 }
 
-PdfDocument *
-pdf_document_new (void)
-{
-       return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL));
-}
-
 /* Forms */
 static void
 pdf_document_get_crop_box (EvDocument  *document, 
 /* Forms */
 static void
 pdf_document_get_crop_box (EvDocument  *document, 
@@ -1804,7 +1992,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)
 {
@@ -1829,9 +2016,6 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                                case POPPLER_FORM_TEXT_MULTILINE:
                                        ev_text_type = EV_FORM_FIELD_TEXT_MULTILINE;
                                        break;
                                case POPPLER_FORM_TEXT_MULTILINE:
                                        ev_text_type = EV_FORM_FIELD_TEXT_MULTILINE;
                                        break;
-                               case POPPLER_FORM_TEXT_PASSWORD:
-                                       ev_text_type = EV_FORM_FIELD_TEXT_PASSWORD;
-                                       break;
                                case POPPLER_FORM_TEXT_FILE_SELECT:
                                        ev_text_type = EV_FORM_FIELD_TEXT_FILE_SELECT;
                                        break;
                                case POPPLER_FORM_TEXT_FILE_SELECT:
                                        ev_text_type = EV_FORM_FIELD_TEXT_FILE_SELECT;
                                        break;
@@ -1843,7 +2027,8 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                        field_text->do_spell_check = poppler_form_field_text_do_spell_check (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->do_spell_check = poppler_form_field_text_do_spell_check (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->max_len = poppler_form_field_text_get_max_len (poppler_field);
                        field_text->text = poppler_form_field_text_get_text (poppler_field);
 
                }
                        field_text->text = poppler_form_field_text_get_text (poppler_field);
 
                }
@@ -1902,7 +2087,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
                        ev_field = ev_form_field_signature_new (id);
                        break;
                case POPPLER_FORM_FIELD_UNKNOWN:
                        ev_field = ev_form_field_signature_new (id);
                        break;
                case POPPLER_FORM_FIELD_UNKNOWN:
-                       break;
+                       return NULL;
        }
 
        ev_field->font_size = font_size;
        }
 
        ev_field->font_size = font_size;
@@ -1921,7 +2106,6 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
        GList *fields;
        GList *list;
        double height;
        GList *fields;
        GList *list;
        double height;
-       
 
        pdf_document = PDF_DOCUMENT (document);
        poppler_page = poppler_document_get_page (pdf_document->document, page);
 
        pdf_document = PDF_DOCUMENT (document);
        poppler_page = poppler_document_get_page (pdf_document->document, page);
@@ -1931,19 +2115,25 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
        for (list = fields; list; list = list->next) {
                PopplerFormFieldMapping *mapping;
                EvFormFieldMapping *field_mapping;
        for (list = fields; list; list = list->next) {
                PopplerFormFieldMapping *mapping;
                EvFormFieldMapping *field_mapping;
-               
+               EvFormField *ev_field;
+
                mapping = (PopplerFormFieldMapping *)list->data;
 
                mapping = (PopplerFormFieldMapping *)list->data;
 
+               ev_field = ev_form_field_from_poppler_field (mapping->field);
+               if (!ev_field)
+                       continue;
+
                field_mapping = g_new0 (EvFormFieldMapping, 1);
                field_mapping->x1 = mapping->area.x1;
                field_mapping->x2 = mapping->area.x2;
                field_mapping->y1 = height - mapping->area.y2;
                field_mapping->y2 = height - mapping->area.y1;
                field_mapping = g_new0 (EvFormFieldMapping, 1);
                field_mapping->x1 = mapping->area.x1;
                field_mapping->x2 = mapping->area.x2;
                field_mapping->y1 = height - mapping->area.y2;
                field_mapping->y2 = height - mapping->area.y1;
-               field_mapping->field = ev_form_field_from_poppler_field (mapping->field);
+               field_mapping->field = ev_field;
                field_mapping->field->page = page;
                
                retval = g_list_prepend (retval, field_mapping);
        }
                field_mapping->field->page = page;
                
                retval = g_list_prepend (retval, field_mapping);
        }
+       
        poppler_page_free_form_field_mapping (fields);
        g_object_unref (poppler_page);
 
        poppler_page_free_form_field_mapping (fields);
        g_object_unref (poppler_page);
 
@@ -2172,4 +2362,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 */
+
Dual-screen mode for evince