X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fev-poppler.cc;h=4fb1d9a2e50c957bad2db783a8fde10a85d42c59;hb=d2ac321bceb0da7a82ed651273d0fa7bfc028886;hp=29f18cf0c34f9224c47bb64410ed14cd28ee73f7;hpb=22125ebfe1521762c29554e272fa7f3d9ae49d68;p=evince.git diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc index 29f18cf0..4fb1d9a2 100644 --- a/pdf/ev-poppler.cc +++ b/pdf/ev-poppler.cc @@ -57,9 +57,6 @@ struct _PdfDocument PopplerPSFile *ps_file; gchar *password; - PopplerOrientation orientation; - gboolean orientation_set; - PopplerFontInfo *font_info; PopplerFontsIter *fonts_iter; int fonts_scanned_pages; @@ -106,6 +103,20 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT, pdf_selection_iface_init); }); + +static void +set_rc_data (PdfDocument *pdf_document, + EvRenderContext *rc) +{ + if (rc->data == NULL) { + rc->data = poppler_document_get_page (pdf_document->document, + rc->page); + rc->destroy = g_object_unref; + } else { + g_assert (rc->page == poppler_page_get_index (POPPLER_PAGE (rc->data))); + } +} + static void pdf_document_search_free (PdfDocumentSearch *search) { @@ -207,24 +218,6 @@ pdf_document_save (EvDocument *document, return retval; } -static PopplerOrientation -get_document_orientation (PdfDocument *pdf_document) -{ - PopplerOrientation orientation; - PopplerPage *page; - - /* Should prolly be smarter here and check more than first page */ - page = poppler_document_get_page (pdf_document->document, 0); - if (page) { - orientation = poppler_page_get_orientation (page); - } else { - orientation = POPPLER_ORIENTATION_PORTRAIT; - } - g_object_unref (page); - - return orientation; -} - static gboolean pdf_document_load (EvDocument *document, const char *uri, @@ -250,15 +243,6 @@ pdf_document_get_n_pages (EvDocument *document) return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document); } -/* FIXME This should not be necessary, poppler should rember it */ -static void -set_page_orientation (PdfDocument *pdf_document, PopplerPage *page) -{ - if (pdf_document->orientation_set) { - poppler_page_set_orientation (page, pdf_document->orientation); - } -} - static void pdf_document_get_page_size (EvDocument *document, int page, @@ -269,7 +253,6 @@ pdf_document_get_page_size (EvDocument *document, PopplerPage *poppler_page; poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); poppler_page_get_size (poppler_page, width, height); g_object_unref (poppler_page); } @@ -337,31 +320,35 @@ pdf_document_render_pixbuf (EvDocument *document, EvRenderContext *rc) { PdfDocument *pdf_document; - PopplerPage *poppler_page; GdkPixbuf *pixbuf; double width_points, height_points; gint width, height; pdf_document = PDF_DOCUMENT (document); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page); - poppler_page_get_size (poppler_page, &width_points, &height_points); - width = (int) ((width_points * rc->scale) + 0.5); - height = (int) ((height_points * rc->scale) + 0.5); + set_rc_data (pdf_document, rc); + + poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points); + + 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, width, height); - poppler_page_render_to_pixbuf (poppler_page, + poppler_page_render_to_pixbuf (POPPLER_PAGE (rc->data), 0, 0, width, height, rc->scale, + rc->rotation, pixbuf); - g_object_unref (poppler_page); return pixbuf; } @@ -540,7 +527,6 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect) char *text; poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); g_return_val_if_fail (poppler_page != NULL, NULL); poppler_page_get_size (poppler_page, NULL, &height); @@ -556,63 +542,6 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect) return text; } -static EvOrientation -pdf_document_get_orientation (EvDocument *document) -{ - EvOrientation result; - PdfDocument *pdf_document = PDF_DOCUMENT (document); - - if (!pdf_document->orientation_set) { - pdf_document->orientation = get_document_orientation (pdf_document); - } - - switch (pdf_document->orientation) { - case POPPLER_ORIENTATION_PORTRAIT: - result = EV_ORIENTATION_PORTRAIT; - break; - case POPPLER_ORIENTATION_LANDSCAPE: - result = EV_ORIENTATION_LANDSCAPE; - break; - case POPPLER_ORIENTATION_UPSIDEDOWN: - result = EV_ORIENTATION_UPSIDEDOWN; - break; - case POPPLER_ORIENTATION_SEASCAPE: - result = EV_ORIENTATION_SEASCAPE; - break; - default: - g_assert_not_reached (); - } - - return result; -} - -static void -pdf_document_set_orientation (EvDocument *document, EvOrientation orientation) -{ - PdfDocument *pdf_document = PDF_DOCUMENT (document); - PopplerOrientation poppler_orientation; - - switch (orientation) { - case EV_ORIENTATION_PORTRAIT: - poppler_orientation = POPPLER_ORIENTATION_PORTRAIT; - break; - case EV_ORIENTATION_LANDSCAPE: - poppler_orientation = POPPLER_ORIENTATION_LANDSCAPE; - break; - case EV_ORIENTATION_UPSIDEDOWN: - poppler_orientation = POPPLER_ORIENTATION_UPSIDEDOWN; - break; - case EV_ORIENTATION_SEASCAPE: - poppler_orientation = POPPLER_ORIENTATION_SEASCAPE; - break; - default: - g_assert_not_reached (); - } - - pdf_document->orientation = poppler_orientation; - pdf_document->orientation_set = TRUE; -} - static void pdf_document_document_iface_init (EvDocumentIface *iface) { @@ -626,8 +555,6 @@ pdf_document_document_iface_init (EvDocumentIface *iface) iface->get_text = pdf_document_get_text; iface->can_get_text = pdf_document_can_get_text; iface->get_info = pdf_document_get_info; - iface->set_orientation = pdf_document_set_orientation; - iface->get_orientation = pdf_document_get_orientation; }; static void @@ -775,19 +702,108 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links) 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: + link = ev_link_new_page_fit (action->any.title, + action->goto_dest.dest->page_num - 1); + break; + case POPPLER_DEST_FITH: + link = ev_link_new_page_fith (action->any.title, + action->goto_dest.dest->page_num - 1, + action->goto_dest.dest->top); + break; + case POPPLER_DEST_FITV: + link = ev_link_new_page_fitv (action->any.title, + action->goto_dest.dest->page_num - 1, + action->goto_dest.dest->left); + break; + case POPPLER_DEST_FITR: + link = ev_link_new_page_fitr (action->any.title, + action->goto_dest.dest->page_num - 1, + action->goto_dest.dest->left, + action->goto_dest.dest->bottom, + action->goto_dest.dest->right, + action->goto_dest.dest->top); + 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) { - EvLink *link; + EvLink *link = NULL; const char *title; + const char *unimplemented_action = NULL; 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: + link = ev_link_new_title (title); + 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: + link = ev_link_new_launch (title, action->launch.file_name, + action->launch.params); + break; + case POPPLER_ACTION_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); } @@ -811,16 +827,22 @@ build_tree (PdfDocument *pdf_document, action = poppler_index_iter_get_action (iter); expand = poppler_index_iter_is_open (iter); if (action) { + char *title_markup; + gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent); link = ev_link_from_action (action); poppler_action_free (action); + title_markup = g_markup_escape_text (ev_link_get_title (link), -1); gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter, - EV_DOCUMENT_LINKS_COLUMN_MARKUP, ev_link_get_title (link), + EV_DOCUMENT_LINKS_COLUMN_MARKUP, title_markup, EV_DOCUMENT_LINKS_COLUMN_LINK, link, EV_DOCUMENT_LINKS_COLUMN_EXPAND, expand, -1); + + g_free (title_markup); g_object_unref (link); + child = poppler_index_iter_get_child (iter); if (child) build_tree (pdf_document, model, &tree_iter, child); @@ -861,82 +883,77 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface) } static GdkPixbuf * -make_thumbnail_for_size (PdfDocument *pdf_document, - gint page, - gint size, - gboolean border) +make_thumbnail_for_size (PdfDocument *pdf_document, + gint page, + int rotation, + gint size) { PopplerPage *poppler_page; - GdkPixbuf *pixbuf, *sub_pixbuf; + GdkPixbuf *pixbuf; int width, height; double scale; gdouble unscaled_width, unscaled_height; poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); g_return_val_if_fail (poppler_page != NULL, NULL); - pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page, size, &width, &height); + pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page, + size, &width, &height); poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height); scale = width / unscaled_width; - if (border) { - pixbuf = ev_document_misc_get_thumbnail_frame (width, height, NULL); - - sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf, - 1, 1, - width - 1, height - 1); - } else { - pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, - width, height); - gdk_pixbuf_fill (pixbuf, 0xffffffff); - sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf, - 0, 0, - width, height); + /* rotate */ + if (rotation == 90 || rotation == 270) { + int temp; + temp = width; + width = height; + height = temp; } + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, + width, height); + gdk_pixbuf_fill (pixbuf, 0xffffffff); + poppler_page_render_to_pixbuf (poppler_page, 0, 0, width, height, - scale, sub_pixbuf); - - g_object_unref (G_OBJECT (sub_pixbuf)); + scale, rotation, pixbuf); + g_object_unref (poppler_page); + return pixbuf; } static GdkPixbuf * pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails, gint page, + gint rotation, gint size, - gboolean border) + gboolean border) { PdfDocument *pdf_document; PopplerPage *poppler_page; GdkPixbuf *pixbuf; + GdkPixbuf *border_pixbuf; pdf_document = PDF_DOCUMENT (document_thumbnails); poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); g_return_val_if_fail (poppler_page != NULL, NULL); pixbuf = poppler_page_get_thumbnail (poppler_page); - if (pixbuf != NULL) { - /* The document provides its own thumbnails. */ - if (border) { - GdkPixbuf *real_pixbuf; - - real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf); - g_object_unref (pixbuf); - pixbuf = real_pixbuf; - } - } else { + if (pixbuf == NULL) { /* There is no provided thumbnail. We need to make one. */ - pixbuf = make_thumbnail_for_size (pdf_document, page, size, border); + pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size); } + if (border) { + border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf); + g_object_unref (pixbuf); + pixbuf = border_pixbuf; + } + g_object_unref (poppler_page); return pixbuf; @@ -955,7 +972,6 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail pdf_document = PDF_DOCUMENT (document_thumbnails); poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); g_return_if_fail (width != NULL); g_return_if_fail (height != NULL); @@ -967,13 +983,8 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail double page_width, page_height; poppler_page_get_size (poppler_page, &page_width, &page_height); - if (page_width > page_height) { - *width = size; - *height = (int) (size * page_height / page_width); - } else { - *width = (int) (size * page_width / page_height); - *height = size; - } + *width = size; + *height = (int) (size * page_height / page_width); } g_object_unref (poppler_page); } @@ -997,7 +1008,6 @@ pdf_document_search_idle_callback (void *data) page = poppler_document_get_page (search->document->document, search->search_page); - set_page_orientation (pdf_document, page); ev_document_doc_mutex_lock (); matches = poppler_page_find_text (page, search->text); @@ -1117,7 +1127,6 @@ pdf_document_find_get_result (EvDocumentFind *document_find, return FALSE; poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); poppler_page_get_size (poppler_page, NULL, &height); rectangle->x1 = r->x1; rectangle->y1 = height - r->y2; @@ -1134,9 +1143,7 @@ pdf_document_find_page_has_results (EvDocumentFind *document_find, { PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; - g_return_val_if_fail (search != NULL, FALSE); - - return search->pages[page] != NULL; + return search && search->pages[page] != NULL; } double @@ -1187,25 +1194,27 @@ pdf_document_find_iface_init (EvDocumentFindIface *iface) static void pdf_document_ps_exporter_begin (EvPSExporter *exporter, const char *filename, - int first_page, int last_page) + int first_page, int last_page, + double width, double height, gboolean duplex) { PdfDocument *pdf_document = PDF_DOCUMENT (exporter); pdf_document->ps_file = poppler_ps_file_new (pdf_document->document, filename, first_page, last_page - first_page + 1); + poppler_ps_file_set_paper_size (pdf_document->ps_file, width, height); + poppler_ps_file_set_duplex (pdf_document->ps_file, duplex); } static void -pdf_document_ps_exporter_do_page (EvPSExporter *exporter, int page) +pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc) { PdfDocument *pdf_document = PDF_DOCUMENT (exporter); PopplerPage *poppler_page; g_return_if_fail (pdf_document->ps_file != NULL); - poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page); + poppler_page = poppler_document_get_page (pdf_document->document, rc->page); poppler_page_render_to_ps (poppler_page, pdf_document->ps_file); g_object_unref (poppler_page); } @@ -1233,19 +1242,18 @@ pdf_selection_render_selection (EvSelection *selection, EvRenderContext *rc, GdkPixbuf **pixbuf, EvRectangle *points, - EvRectangle *old_points) + EvRectangle *old_points, + GdkColor *text, + GdkColor *base) { PdfDocument *pdf_document; - PopplerPage *poppler_page; double width_points, height_points; gint width, height; pdf_document = PDF_DOCUMENT (selection); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page); + set_rc_data (pdf_document, rc); - poppler_page_get_size (poppler_page, &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); @@ -1255,12 +1263,12 @@ pdf_selection_render_selection (EvSelection *selection, width, height); } - poppler_page_render_selection (poppler_page, - rc->scale, *pixbuf, + poppler_page_render_selection (POPPLER_PAGE (rc->data), + rc->scale, rc->rotation, *pixbuf, (PopplerRectangle *)points, - (PopplerRectangle *)old_points); - g_object_unref (poppler_page); - + (PopplerRectangle *)old_points, + text, + base); } @@ -1270,16 +1278,13 @@ pdf_selection_get_selection_region (EvSelection *selection, EvRectangle *points) { PdfDocument *pdf_document; - PopplerPage *poppler_page; GdkRegion *retval; pdf_document = PDF_DOCUMENT (selection); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page); - retval = poppler_page_get_selection_region (poppler_page, rc->scale, (PopplerRectangle *) points); - g_object_unref (poppler_page); + set_rc_data (pdf_document, rc); + + retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points); return retval; } @@ -1296,7 +1301,6 @@ pdf_selection_get_selection_map (EvSelection *selection, pdf_document = PDF_DOCUMENT (selection); poppler_page = poppler_document_get_page (pdf_document->document, rc->page); - set_page_orientation (pdf_document, poppler_page); points.x1 = 0.0; points.y1 = 0.0;