X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fpdf%2Fev-poppler.cc;h=fa669fa170cc30dd48e072267ed1dcc227de0cd3;hb=2c027febd41098f2b2157d30210cc386fbbfdef8;hp=4b6b114e23b7b0d97b0773c9d67694fab83b442d;hpb=e70119b293ab8a26bdea4a56407bb0f41f1e43aa;p=evince.git diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc index 4b6b114e..fa669fa1 100644 --- a/backend/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc @@ -19,10 +19,6 @@ #include "config.h" -#ifdef HAVE_POPPLER_FORM_FIELD_BUTTON_GET_BUTTON_TYPE -#define HAVE_FORMS -#endif - #include #include #include @@ -32,6 +28,9 @@ #ifdef HAVE_CAIRO_PDF #include #endif +#ifdef HAVE_CAIRO_PS +#include +#endif #include #include "ev-poppler.h" @@ -49,6 +48,10 @@ #include "ev-attachment.h" #include "ev-image.h" +#if defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS) +#define HAVE_CAIRO_PRINT +#endif + typedef struct { PdfDocument *document; char *text; @@ -60,9 +63,19 @@ typedef struct { 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; -#ifdef HAVE_CAIRO_PDF - cairo_t *pdf_cairo; #endif } PdfPrintContext; @@ -122,10 +135,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); -#ifdef HAVE_FORMS 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, @@ -138,7 +149,6 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT, pdf_document_page_transition_iface_init); }); - static void set_rc_data (PdfDocument *pdf_document, EvRenderContext *rc) @@ -461,7 +471,7 @@ pdf_document_render (EvDocument *document, #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) * @@ -526,12 +536,6 @@ pdf_document_set_password (EvDocumentSecurity *document_security, document->password = g_strdup (password); } -static gboolean -pdf_document_can_get_text (EvDocument *document) -{ - return TRUE; -} - static EvDocumentInfo * pdf_document_get_info (EvDocument *document) { @@ -677,31 +681,6 @@ pdf_document_get_info (EvDocument *document) 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) { @@ -713,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->get_text = pdf_document_get_text; - iface->can_get_text = pdf_document_can_get_text; iface->get_info = pdf_document_get_info; }; @@ -1053,8 +1030,11 @@ build_tree (PdfDocument *pdf_document, break; } - if (!link) { + if (!link || strlen (ev_link_get_title (link)) <= 0) { poppler_action_free (action); + if (link) + g_object_unref (link); + continue; } @@ -1254,7 +1234,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); - 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); } @@ -1512,15 +1500,16 @@ 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; } -#ifdef HAVE_CAIRO_PDF - if (ctx->pdf_cairo) { - cairo_destroy (ctx->pdf_cairo); - ctx->pdf_cairo = NULL; - } #endif g_free (ctx); } @@ -1531,35 +1520,76 @@ pdf_document_file_exporter_begin (EvFileExporter *exporter, { PdfDocument *pdf_document = PDF_DOCUMENT (exporter); PdfPrintContext *ctx; - + gdouble width, height; +#ifdef HAVE_CAIRO_PRINT + 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; 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: + 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; + 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); +#else 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_PS */ break; - case EV_FILE_FORMAT_PDF: { + case EV_FILE_FORMAT_PDF: #ifdef HAVE_CAIRO_PDF - cairo_surface_t *surface; - surface = cairo_pdf_surface_create (fc->filename, fc->paper_width, fc->paper_height); - ctx->pdf_cairo = cairo_create (surface); - cairo_surface_destroy (surface); #endif - } break; default: g_assert_not_reached (); } + +#ifdef HAVE_CAIRO_PRINT + ctx->cr = cairo_create (surface); + cairo_surface_destroy (surface); +#endif } static void @@ -1569,30 +1599,113 @@ pdf_document_file_exporter_do_page (EvFileExporter *exporter, 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); + +#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; + + 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); + 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 - poppler_page_render (poppler_page, ctx->pdf_cairo); + poppler_page_render (poppler_page, ctx->cr); #endif -#ifdef HAVE_CAIRO_PDF - cairo_show_page (ctx->pdf_cairo); - cairo_restore (ctx->pdf_cairo); -#endif - break; - default: - g_assert_not_reached (); + ctx->pages_printed++; + + if (ctx->pages_printed % ctx->pages_per_sheet == 0) { + cairo_show_page (ctx->cr); } + 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); } @@ -1615,6 +1728,14 @@ pdf_document_file_exporter_get_capabilities (EvFileExporter *exporter) 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 | @@ -1638,6 +1759,7 @@ pdf_selection_render_selection (EvSelection *selection, cairo_surface_t **surface, EvRectangle *points, EvRectangle *old_points, + EvSelectionStyle style, GdkColor *text, GdkColor *base) { @@ -1653,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); - #ifdef HAVE_POPPLER_PAGE_RENDER cairo_t *cr; @@ -1673,7 +1794,7 @@ pdf_selection_render_selection (EvSelection *selection, cr, (PopplerRectangle *)points, (PopplerRectangle *)old_points, - POPPLER_SELECTION_NORMAL, /* SelectionStyle */ + (PopplerSelectionStyle)style, text, base); cairo_destroy (cr); @@ -1688,7 +1809,7 @@ pdf_selection_render_selection (EvSelection *selection, rc->scale, rc->rotation, pixbuf, (PopplerRectangle *)points, (PopplerRectangle *)old_points, - POPPLER_SELECTION_NORMAL, /* SelectionStyle */ + (PopplerSelectionStyle)style, text, base); if (*surface) @@ -1698,10 +1819,40 @@ pdf_selection_render_selection (EvSelection *selection, #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, + EvSelectionStyle style, EvRectangle *points) { PdfDocument *pdf_document; @@ -1713,6 +1864,7 @@ pdf_selection_get_selection_region (EvSelection *selection, retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, + (PopplerSelectionStyle)style, (PopplerRectangle *) points); return retval; } @@ -1733,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)); - 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; @@ -1743,6 +1897,7 @@ static void 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; } @@ -1798,7 +1953,6 @@ pdf_document_get_crop_box (EvDocument *document, rect->y2 = poppler_rect.y2; } -#ifdef HAVE_FORMS static EvFormField * ev_form_field_from_poppler_field (PopplerFormField *poppler_field) { @@ -1835,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); - -#ifdef HAVE_POPPLER_FORM_FIELD_TEXT_GET_MAX_LEN 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); } @@ -2167,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; } -#endif /* HAVE_FORMS */ +