#include "ev-poppler.h"
#include "ev-file-exporter.h"
-#include "ev-mapping.h"
#include "ev-document-find.h"
#include "ev-document-misc.h"
#include "ev-document-links.h"
#include "ev-document-print.h"
#include "ev-document-annotations.h"
#include "ev-document-attachments.h"
+#include "ev-document-text.h"
#include "ev-selection.h"
#include "ev-transition-effect.h"
#include "ev-attachment.h"
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
-#if (defined (HAVE_POPPLER_PAGE_RENDER)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
+#if (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
#define HAVE_CAIRO_PRINT
#endif
PopplerDocument *document;
gchar *password;
- gboolean modified;
+ gboolean forms_modified;
+ gboolean annots_modified;
PopplerFontInfo *font_info;
PopplerFontsIter *fonts_iter;
PdfPrintContext *print_ctx;
GList *layers;
+ GHashTable *annots;
};
static void pdf_document_security_iface_init (EvDocumentSecurityInterface *iface);
static void pdf_document_document_forms_iface_init (EvDocumentFormsInterface *iface);
static void pdf_document_document_fonts_iface_init (EvDocumentFontsInterface *iface);
static void pdf_document_document_layers_iface_init (EvDocumentLayersInterface *iface);
-#ifdef HAVE_POPPLER_PAGE_RENDER
static void pdf_document_document_print_iface_init (EvDocumentPrintInterface *iface);
-#endif
static void pdf_document_document_annotations_iface_init (EvDocumentAnnotationsInterface *iface);
static void pdf_document_document_attachments_iface_init (EvDocumentAttachmentsInterface *iface);
static void pdf_document_find_iface_init (EvDocumentFindInterface *iface);
static void pdf_document_file_exporter_iface_init (EvFileExporterInterface *iface);
static void pdf_selection_iface_init (EvSelectionInterface *iface);
static void pdf_document_page_transition_iface_init (EvDocumentTransitionInterface *iface);
+static void pdf_document_text_iface_init (EvDocumentTextInterface *iface);
static void pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails,
EvRenderContext *rc,
gint *width,
pdf_document_document_fonts_iface_init);
EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LAYERS,
pdf_document_document_layers_iface_init);
-#ifdef HAVE_POPPLER_PAGE_RENDER
EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_PRINT,
pdf_document_document_print_iface_init);
-#endif
EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_ANNOTATIONS,
pdf_document_document_annotations_iface_init);
EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_ATTACHMENTS,
pdf_selection_iface_init);
EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
pdf_document_page_transition_iface_init);
+ EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TEXT,
+ pdf_document_text_iface_init);
});
static void
pdf_document->print_ctx = NULL;
}
+ if (pdf_document->annots) {
+ g_hash_table_destroy (pdf_document->annots);
+ pdf_document->annots = NULL;
+ }
+
if (pdf_document->document) {
g_object_unref (pdf_document->document);
}
gboolean retval;
GError *poppler_error = NULL;
- if (pdf_document->modified) {
+ if (pdf_document->forms_modified || pdf_document->annots_modified) {
retval = poppler_document_save (pdf_document->document,
uri, &poppler_error);
+ if (retval) {
+ pdf_document->forms_modified = FALSE;
+ pdf_document->annots_modified = FALSE;
+ }
} else {
retval = poppler_document_save_a_copy (pdf_document->document,
uri, &poppler_error);
EvRenderContext *rc)
{
cairo_surface_t *surface;
-
-#ifdef HAVE_POPPLER_PAGE_RENDER
cairo_t *cr;
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
cairo_paint (cr);
cairo_destroy (cr);
-#else /* HAVE_POPPLER_PAGE_RENDER */
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- FALSE, 8,
- width, height);
-
- poppler_page_render_to_pixbuf (page,
- 0, 0,
- width, height,
- rc->scale,
- rc->rotation,
- pixbuf);
- surface = ev_document_misc_surface_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
-#endif /* HAVE_POPPLER_PAGE_RENDER */
- return surface;
+ return surface;
}
static cairo_surface_t *
return TRUE;
}
+static gboolean
+pdf_document_support_synctex (EvDocument *document)
+{
+ return TRUE;
+}
+
static void
pdf_document_class_init (PdfDocumentClass *klass)
{
ev_document_class->render = pdf_document_render;
ev_document_class->get_info = pdf_document_get_info;
ev_document_class->get_backend_info = pdf_document_get_backend_info;
+ ev_document_class->support_synctex = pdf_document_support_synctex;
}
/* EvDocumentSecurity */
return model;
}
-static GList *
+static EvMappingList *
pdf_document_links_get_links (EvDocumentLinks *document_links,
EvPage *page)
{
poppler_page_free_link_mapping (mapping_list);
- return g_list_reverse (retval);
+ return ev_mapping_list_new (page->index, g_list_reverse (retval), (GDestroyNotify)g_object_unref);
}
static EvLinkDest *
iface->find_link_dest = pdf_document_links_find_link_dest;
}
-static GList *
+static EvMappingList *
pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
EvPage *page)
{
poppler_page_free_image_mapping (mapping_list);
- return g_list_reverse (retval);
+ return ev_mapping_list_new (page->index, g_list_reverse (retval), (GDestroyNotify)g_object_unref);
}
GdkPixbuf *
EvImage *image)
{
GdkPixbuf *retval = NULL;
-#ifdef HAVE_POPPLER_PAGE_GET_IMAGE
PdfDocument *pdf_document;
PopplerPage *poppler_page;
cairo_surface_t *surface;
}
g_object_unref (poppler_page);
-#endif
+
return retval;
}
EV_FILE_EXPORTER_CAN_REVERSE |
EV_FILE_EXPORTER_CAN_SCALE |
#ifdef HAVE_CAIRO_PRINT
-#ifdef HAVE_POPPLER_PAGE_RENDER
EV_FILE_EXPORTER_CAN_NUMBER_UP |
#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);
}
iface->get_capabilities = pdf_document_file_exporter_get_capabilities;
}
-#ifdef HAVE_POPPLER_PAGE_RENDER
/* EvDocumentPrint */
static void
pdf_document_print_print_page (EvDocumentPrint *document,
{
iface->print_page = pdf_document_print_print_page;
}
-#endif /* HAVE_POPPLER_PAGE_RENDER */
static void
pdf_selection_render_selection (EvSelection *selection,
GdkColor *base)
{
PopplerPage *poppler_page;
+ cairo_t *cr;
+ PopplerColor text_color, base_color;
double width_points, height_points;
gint width, height;
width = (int) ((width_points * rc->scale) + 0.5);
height = (int) ((height_points * rc->scale) + 0.5);
-#ifdef HAVE_POPPLER_PAGE_RENDER
- cairo_t *cr;
- PopplerColor text_color, base_color;
-
text_color.red = text->red;
text_color.green = text->green;
text_color.blue = text->blue;
&text_color,
&base_color);
cairo_destroy (cr);
-#else /* HAVE_POPPLER_PAGE_RENDER */
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- TRUE, 8,
- width, height);
-
- poppler_page_render_selection_to_pixbuf (poppler_page,
- rc->scale, rc->rotation, pixbuf,
- (PopplerRectangle *)points,
- (PopplerRectangle *)old_points,
- (PopplerSelectionStyle)style,
- text,
- base);
- if (*surface)
- cairo_surface_destroy (*surface);
- *surface = ev_document_misc_surface_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
-#endif /* HAVE_POPPLER_PAGE_RENDER */
}
static gchar *
EvRectangle *points)
{
PopplerPage *poppler_page;
- PopplerRectangle r;
- double height;
char *retval;
-
+
poppler_page = POPPLER_PAGE (page->backend_page);
+#ifdef HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
+ retval = poppler_page_get_selected_text (poppler_page,
+ (PopplerSelectionStyle)style,
+ (PopplerRectangle *)points);
+#else
+ PopplerRectangle r;
+ double height;
+
poppler_page_get_size (poppler_page, NULL, &height);
r.x1 = points->x1;
r.y1 = height - points->y2;
retval = poppler_page_get_text (poppler_page,
(PopplerSelectionStyle)style,
&r);
+#endif /* HAVE_POPPLER_PAGE_GET_SELECTED_TEXT */
return retval;
}
-static GdkRegion *
-create_gdk_region_from_poppler_region (GList *region)
+static cairo_region_t *
+create_region_from_poppler_region (GList *region, gdouble scale)
{
GList *l;
- GdkRegion *retval;
-
- retval = gdk_region_new ();
-
+ cairo_region_t *retval;
+
+ retval = cairo_region_create ();
+
for (l = region; l; l = g_list_next (l)) {
- PopplerRectangle *rectangle;
- GdkRectangle rect;
-
+ PopplerRectangle *rectangle;
+ cairo_rectangle_int_t rect;
+
rectangle = (PopplerRectangle *)l->data;
-
- rect.x = (gint) rectangle->x1;
- rect.y = (gint) rectangle->y1;
- rect.width = (gint) (rectangle->x2 - rectangle->x1);
- rect.height = (gint) (rectangle->y2 - rectangle->y1);
- gdk_region_union_with_rect (retval, &rect);
-
+
+ rect.x = (gint) ((rectangle->x1 * scale) + 0.5);
+ rect.y = (gint) ((rectangle->y1 * scale) + 0.5);
+ rect.width = (gint) (((rectangle->x2 - rectangle->x1) * scale) + 0.5);
+ rect.height = (gint) (((rectangle->y2 - rectangle->y1) * scale) + 0.5);
+ cairo_region_union_rectangle (retval, &rect);
+
poppler_rectangle_free (rectangle);
}
return retval;
}
-static GdkRegion *
+static cairo_region_t *
pdf_selection_get_selection_region (EvSelection *selection,
EvRenderContext *rc,
EvSelectionStyle style,
EvRectangle *points)
{
- PopplerPage *poppler_page;
- GdkRegion *retval;
- GList *region;
+ PopplerPage *poppler_page;
+ cairo_region_t *retval;
+ GList *region;
poppler_page = POPPLER_PAGE (rc->page->backend_page);
-
region = poppler_page_get_selection_region (poppler_page,
- rc->scale,
+ 1.0,
(PopplerSelectionStyle)style,
(PopplerRectangle *) points);
- retval = create_gdk_region_from_poppler_region (region);
+ retval = create_region_from_poppler_region (region, rc->scale);
g_list_free (region);
return retval;
}
-static GdkRegion *
-pdf_selection_get_selection_map (EvSelection *selection,
- EvPage *page)
+static void
+pdf_selection_iface_init (EvSelectionInterface *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;
+}
+
+
+/* EvDocumentText */
+static cairo_region_t *
+pdf_document_text_get_text_mapping (EvDocumentText *document_text,
+ EvPage *page)
{
PopplerPage *poppler_page;
PopplerRectangle points;
GList *region;
- GdkRegion *retval;
+ cairo_region_t *retval;
+
+ g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
poppler_page = POPPLER_PAGE (page->backend_page);
points.x1 = 0.0;
points.y1 = 0.0;
poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
-
+
region = poppler_page_get_selection_region (poppler_page, 1.0,
POPPLER_SELECTION_GLYPH,
&points);
- retval = create_gdk_region_from_poppler_region (region);
+ retval = create_region_from_poppler_region (region, 1.0);
g_list_free (region);
return retval;
}
+#ifdef HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
+static gchar *
+pdf_document_text_get_text (EvDocumentText *selection,
+ EvPage *page)
+{
+ PopplerPage *poppler_page;
+
+ g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+
+ poppler_page = POPPLER_PAGE (page->backend_page);
+
+ return poppler_page_get_text (poppler_page);
+}
+#else
+static gchar *
+pdf_document_text_get_text (EvDocumentText *selection,
+ EvPage *page)
+{
+ PopplerPage *poppler_page;
+ PopplerRectangle r;
+
+ g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+
+ poppler_page = POPPLER_PAGE (page->backend_page);
+
+ r.x1 = 0;
+ r.y1 = 0;
+ poppler_page_get_size (poppler_page, &(r.x2), &(r.y2));
+
+ return poppler_page_get_text (poppler_page,
+ POPPLER_SELECTION_WORD,
+ &r);
+}
+#endif /* HAVE_POPPLER_PAGE_GET_SELECTED_TEXT */
+
+#ifdef HAVE_POPPLER_PAGE_GET_TEXT_LAYOUT
+static gboolean
+pdf_document_text_get_text_layout (EvDocumentText *selection,
+ EvPage *page,
+ EvRectangle **areas,
+ guint *n_areas)
+{
+ PopplerPage *poppler_page;
+
+ g_return_val_if_fail (POPPLER_IS_PAGE (page->backend_page), NULL);
+
+ poppler_page = POPPLER_PAGE (page->backend_page);
+
+ return poppler_page_get_text_layout (poppler_page, (PopplerRectangle **)areas, n_areas);
+}
+#endif
+
static void
-pdf_selection_iface_init (EvSelectionInterface *iface)
+pdf_document_text_iface_init (EvDocumentTextInterface *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_text_mapping = pdf_document_text_get_text_mapping;
+ iface->get_text = pdf_document_text_get_text;
+#ifdef HAVE_POPPLER_PAGE_GET_TEXT_LAYOUT
+ iface->get_text_layout = pdf_document_text_get_text_layout;
+#endif
}
/* Page Transitions */
return ev_field;
}
-static GList *
+static EvMappingList *
pdf_document_forms_get_form_fields (EvDocumentForms *document,
EvPage *page)
{
poppler_page_free_form_field_mapping (fields);
- return g_list_reverse (retval);
+ return retval ? ev_mapping_list_new (page->index,
+ g_list_reverse (retval),
+ (GDestroyNotify)g_object_unref) : NULL;
+}
+
+static gboolean
+pdf_document_forms_document_is_modified (EvDocumentForms *document)
+{
+ return PDF_DOCUMENT (document)->forms_modified;
}
static gchar *
return;
poppler_form_field_text_set_text (poppler_field, text);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static void
return;
poppler_form_field_button_set_state (poppler_field, state);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static gboolean
return;
poppler_form_field_choice_select_item (poppler_field, index);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static void
return;
poppler_form_field_choice_toggle_item (poppler_field, index);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static void
return;
poppler_form_field_choice_unselect_all (poppler_field);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static void
return;
poppler_form_field_choice_set_text (poppler_field, text);
- PDF_DOCUMENT (document)->modified = TRUE;
+ PDF_DOCUMENT (document)->forms_modified = TRUE;
}
static gchar *
pdf_document_document_forms_iface_init (EvDocumentFormsInterface *iface)
{
iface->get_form_fields = pdf_document_forms_get_form_fields;
+ iface->document_is_modified = pdf_document_forms_document_is_modified;
iface->form_field_text_get_text = pdf_document_forms_form_field_text_get_text;
iface->form_field_text_set_text = pdf_document_forms_form_field_text_set_text;
iface->form_field_button_set_state = pdf_document_forms_form_field_button_set_state;
} /* TODO: else use a default color */
}
+static EvAnnotationTextIcon
+get_annot_text_icon (PopplerAnnotText *poppler_annot)
+{
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+ gchar *icon = poppler_annot_text_get_icon (poppler_annot);
+ EvAnnotationTextIcon retval;
+
+ if (!icon)
+ return EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+
+ if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_NOTE) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_NOTE;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_COMMENT) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_COMMENT;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_KEY) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_KEY;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_HELP) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_HELP;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_PARAGRAPH) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_PARAGRAPH;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_INSERT) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_INSERT;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_CROSS) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_CROSS;
+ else if (strcmp (icon, POPPLER_ANNOT_TEXT_ICON_CIRCLE) == 0)
+ retval = EV_ANNOTATION_TEXT_ICON_CIRCLE;
+ else
+ retval = EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+
+ g_free (icon);
+
+ return retval;
+#else
+ return EV_ANNOTATION_TEXT_ICON_UNKNOWN;
+#endif
+}
+
+static const gchar *
+get_poppler_annot_text_icon (EvAnnotationTextIcon icon)
+{
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+ switch (icon) {
+ case EV_ANNOTATION_TEXT_ICON_NOTE:
+ return POPPLER_ANNOT_TEXT_ICON_NOTE;
+ case EV_ANNOTATION_TEXT_ICON_COMMENT:
+ return POPPLER_ANNOT_TEXT_ICON_COMMENT;
+ case EV_ANNOTATION_TEXT_ICON_KEY:
+ return POPPLER_ANNOT_TEXT_ICON_KEY;
+ case EV_ANNOTATION_TEXT_ICON_HELP:
+ return POPPLER_ANNOT_TEXT_ICON_HELP;
+ case EV_ANNOTATION_TEXT_ICON_NEW_PARAGRAPH:
+ return POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH;
+ case EV_ANNOTATION_TEXT_ICON_PARAGRAPH:
+ return POPPLER_ANNOT_TEXT_ICON_PARAGRAPH;
+ case EV_ANNOTATION_TEXT_ICON_INSERT:
+ return POPPLER_ANNOT_TEXT_ICON_INSERT;
+ case EV_ANNOTATION_TEXT_ICON_CROSS:
+ return POPPLER_ANNOT_TEXT_ICON_CROSS;
+ case EV_ANNOTATION_TEXT_ICON_CIRCLE:
+ return POPPLER_ANNOT_TEXT_ICON_CIRCLE;
+ case EV_ANNOTATION_TEXT_ICON_UNKNOWN:
+ default:
+ return POPPLER_ANNOT_TEXT_ICON_NOTE;
+ }
+#else
+ return "Note";
+#endif
+}
+
static EvAnnotation *
ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
EvPage *page)
ev_annot = ev_annotation_text_new (page);
ev_annot_text = EV_ANNOTATION_TEXT (ev_annot);
- ev_annot_text->is_open = poppler_annot_text_get_is_open (poppler_text);
+ ev_annotation_text_set_is_open (ev_annot_text,
+ poppler_annot_text_get_is_open (poppler_text));
+ ev_annotation_text_set_icon (ev_annot_text, get_annot_text_icon (poppler_text));
}
break;
-#ifdef HAVE_POPPLER_ANNOT_FILE_ATTACHMENT_GET_ATTACHMENT
case POPPLER_ANNOT_FILE_ATTACHMENT: {
PopplerAnnotFileAttachment *poppler_annot_attachment;
EvAnnotationAttachment *ev_annot_attachment;
g_object_unref (poppler_attachment);
}
break;
-#endif /* HAVE_POPPLER_ANNOT_FILE_ATTACHMENT_GET_ATTACHMENT */
case POPPLER_ANNOT_LINK:
case POPPLER_ANNOT_WIDGET:
/* Ignore link and widgets annots since they are already handled */
}
if (ev_annot) {
- ev_annot->contents = poppler_annot_get_contents (poppler_annot);
- ev_annot->name = poppler_annot_get_name (poppler_annot);
- ev_annot->modified = poppler_annot_get_modified (poppler_annot);
- poppler_annot_color_to_gdk_color (poppler_annot, &ev_annot->color);
+ time_t utime;
+ gchar *modified;
+ gchar *contents;
+ gchar *name;
+ GdkColor color;
+
+ contents = poppler_annot_get_contents (poppler_annot);
+ if (contents) {
+ ev_annotation_set_contents (ev_annot, contents);
+ g_free (contents);
+ }
+
+ name = poppler_annot_get_name (poppler_annot);
+ if (name) {
+ ev_annotation_set_name (ev_annot, name);
+ g_free (name);
+ }
+
+ modified = poppler_annot_get_modified (poppler_annot);
+ if (poppler_date_parse (modified, &utime)) {
+ ev_annotation_set_modified_from_time (ev_annot, utime);
+ } else {
+ ev_annotation_set_modified (ev_annot, modified);
+ }
+ g_free (modified);
+
+ poppler_annot_color_to_gdk_color (poppler_annot, &color);
+ ev_annotation_set_color (ev_annot, &color);
if (POPPLER_IS_ANNOT_MARKUP (poppler_annot)) {
PopplerAnnotMarkup *markup;
g_object_set (ev_annot,
"rectangle", &ev_rect,
- "is_open", is_open,
+ "popup_is_open", is_open,
"has_popup", TRUE,
NULL);
} else {
- /* FIXME: Use poppler_annot_markup_has_popup() when
- * new poppler is released.
- */
g_object_set (ev_annot,
"has_popup", FALSE,
NULL);
return ev_annot;
}
-static GList *
+static EvMappingList *
pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annotations,
EvPage *page)
{
GList *retval = NULL;
PdfDocument *pdf_document;
PopplerPage *poppler_page;
+ EvMappingList *mapping_list;
GList *annots;
GList *list;
gdouble height;
pdf_document = PDF_DOCUMENT (document_annotations);
poppler_page = POPPLER_PAGE (page->backend_page);
+
+ if (pdf_document->annots) {
+ mapping_list = (EvMappingList *)g_hash_table_lookup (pdf_document->annots,
+ GINT_TO_POINTER (page->index));
+ if (mapping_list)
+ return ev_mapping_list_ref (mapping_list);
+ }
+
annots = poppler_page_get_annot_mapping (poppler_page);
poppler_page_get_size (poppler_page, NULL, &height);
for (list = annots; list; list = list->next) {
PopplerAnnotMapping *mapping;
- EvMapping *annot_mapping;
+ EvMapping *annot_mapping;
EvAnnotation *ev_annot;
mapping = (PopplerAnnotMapping *)list->data;
i++;
/* Make sure annot has a unique name */
- if (!ev_annot->name)
- ev_annot->name = g_strdup_printf ("annot-%d-%d", page->index, i);
+ if (!ev_annotation_get_name (ev_annot)) {
+ gchar *name = g_strdup_printf ("annot-%d-%d", page->index, i);
+
+ ev_annotation_set_name (ev_annot, name);
+ g_free (name);
+ }
annot_mapping = g_new (EvMapping, 1);
annot_mapping->area.x1 = mapping->area.x1;
poppler_page_free_annot_mapping (annots);
- return g_list_reverse (retval);
+ if (!retval)
+ return NULL;
+
+ if (!pdf_document->annots) {
+ pdf_document->annots = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
+ (GDestroyNotify)NULL,
+ (GDestroyNotify)ev_mapping_list_unref);
+ }
+
+ mapping_list = ev_mapping_list_new (page->index, g_list_reverse (retval), (GDestroyNotify)g_object_unref);
+ g_hash_table_insert (pdf_document->annots,
+ GINT_TO_POINTER (page->index),
+ ev_mapping_list_ref (mapping_list));
+
+ return mapping_list;
+}
+
+static gboolean
+pdf_document_annotations_document_is_modified (EvDocumentAnnotations *document_annotations)
+{
+ return PDF_DOCUMENT (document_annotations)->annots_modified;
+}
+
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+static void
+pdf_document_annotations_add_annotation (EvDocumentAnnotations *document_annotations,
+ EvAnnotation *annot,
+ EvRectangle *rect)
+{
+ PopplerAnnot *poppler_annot;
+ PdfDocument *pdf_document;
+ EvPage *page;
+ PopplerPage *poppler_page;
+ GList *list = NULL;
+ EvMappingList *mapping_list;
+ EvMapping *annot_mapping;
+ PopplerRectangle poppler_rect;
+ gdouble height;
+ PopplerColor poppler_color;
+ GdkColor color;
+ time_t utime;
+ gchar *modified;
+ gchar *name;
+
+ pdf_document = PDF_DOCUMENT (document_annotations);
+ page = ev_annotation_get_page (annot);
+ poppler_page = POPPLER_PAGE (page->backend_page);
+
+ poppler_page_get_size (poppler_page, NULL, &height);
+ poppler_rect.x1 = rect->x1;
+ poppler_rect.x2 = rect->x2;
+ poppler_rect.y1 = height - rect->y2;
+ poppler_rect.y2 = height - rect->y1;
+ poppler_annot = poppler_annot_text_new (pdf_document->document, &poppler_rect);
+
+ ev_annotation_get_color (annot, &color);
+ poppler_color.red = color.red;
+ poppler_color.green = color.green;
+ poppler_color.blue = color.blue;
+ poppler_annot_set_color (poppler_annot, &poppler_color);
+
+ if (EV_IS_ANNOTATION_MARKUP (annot)) {
+ EvAnnotationMarkup *markup = EV_ANNOTATION_MARKUP (annot);
+ const gchar *label;
+
+ if (ev_annotation_markup_has_popup (markup)) {
+ EvRectangle popup_rect;
+
+ ev_annotation_markup_get_rectangle (markup, &popup_rect);
+ poppler_rect.x1 = popup_rect.x1;
+ poppler_rect.x2 = popup_rect.x2;
+ poppler_rect.y1 = height - popup_rect.y2;
+ poppler_rect.y2 = height - popup_rect.y1;
+ poppler_annot_markup_set_popup (POPPLER_ANNOT_MARKUP (poppler_annot), &poppler_rect);
+ poppler_annot_markup_set_popup_is_open (POPPLER_ANNOT_MARKUP (poppler_annot),
+ ev_annotation_markup_get_popup_is_open (markup));
+ }
+
+ label = ev_annotation_markup_get_label (markup);
+ if (label)
+ poppler_annot_markup_set_label (POPPLER_ANNOT_MARKUP (poppler_annot), label);
+ }
+
+ if (EV_IS_ANNOTATION_TEXT (annot)) {
+ EvAnnotationText *text = EV_ANNOTATION_TEXT (annot);
+ EvAnnotationTextIcon icon;
+
+ icon = ev_annotation_text_get_icon (text);
+ poppler_annot_text_set_icon (POPPLER_ANNOT_TEXT (poppler_annot),
+ get_poppler_annot_text_icon (icon));
+ }
+ poppler_page_add_annot (poppler_page, poppler_annot);
+
+ annot_mapping = g_new (EvMapping, 1);
+ annot_mapping->area = *rect;
+ annot_mapping->data = annot;
+ g_object_set_data_full (G_OBJECT (annot),
+ "poppler-annot",
+ g_object_ref (poppler_annot),
+ (GDestroyNotify) g_object_unref);
+
+ if (pdf_document->annots) {
+ mapping_list = (EvMappingList *)g_hash_table_lookup (pdf_document->annots,
+ GINT_TO_POINTER (page->index));
+ list = ev_mapping_list_get_list (mapping_list);
+ name = g_strdup_printf ("annot-%d-%d", page->index, g_list_length (list) + 1);
+ ev_annotation_set_name (annot, name);
+ g_free (name);
+ list = g_list_append (list, annot_mapping);
+ } else {
+ pdf_document->annots = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
+ (GDestroyNotify)NULL,
+ (GDestroyNotify)ev_mapping_list_unref);
+ name = g_strdup_printf ("annot-%d-0", page->index);
+ ev_annotation_set_name (annot, name);
+ g_free (name);
+ list = g_list_append (list, annot_mapping);
+ mapping_list = ev_mapping_list_new (page->index, list, (GDestroyNotify)g_object_unref);
+ g_hash_table_insert (pdf_document->annots,
+ GINT_TO_POINTER (page->index),
+ ev_mapping_list_ref (mapping_list));
+ }
+
+ pdf_document->annots_modified = TRUE;
}
+#endif /* HAVE_POPPLER_PAGE_ADD_ANNOT */
static void
-pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *document,
- EvAnnotation *annot,
- const gchar *contents)
+pdf_document_annotations_save_annotation (EvDocumentAnnotations *document_annotations,
+ EvAnnotation *annot,
+ EvAnnotationsSaveMask mask)
{
PopplerAnnot *poppler_annot;
if (!poppler_annot)
return;
- poppler_annot_set_contents (poppler_annot, contents);
- PDF_DOCUMENT (document)->modified = TRUE;
+ if (mask & EV_ANNOTATIONS_SAVE_CONTENTS)
+ poppler_annot_set_contents (poppler_annot,
+ ev_annotation_get_contents (annot));
+
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+ if (mask & EV_ANNOTATIONS_SAVE_COLOR) {
+ PopplerColor color;
+ GdkColor ev_color;
+
+ ev_annotation_get_color (annot, &ev_color);
+ color.red = ev_color.red;
+ color.green = ev_color.green;
+ color.blue = ev_color.blue;
+ poppler_annot_set_color (poppler_annot, &color);
+ }
+
+ if (EV_IS_ANNOTATION_MARKUP (annot)) {
+ EvAnnotationMarkup *ev_markup = EV_ANNOTATION_MARKUP (annot);
+ PopplerAnnotMarkup *markup = POPPLER_ANNOT_MARKUP (poppler_annot);
+
+ if (mask & EV_ANNOTATIONS_SAVE_LABEL)
+ poppler_annot_markup_set_label (markup, ev_annotation_markup_get_label (ev_markup));
+ if (mask & EV_ANNOTATIONS_SAVE_OPACITY)
+ poppler_annot_markup_set_opacity (markup, ev_annotation_markup_get_opacity (ev_markup));
+ if (mask & EV_ANNOTATIONS_SAVE_POPUP_IS_OPEN)
+ poppler_annot_markup_set_popup_is_open (markup, ev_annotation_markup_get_popup_is_open (ev_markup));
+ }
+
+ if (EV_IS_ANNOTATION_TEXT (annot)) {
+ EvAnnotationText *ev_text = EV_ANNOTATION_TEXT (annot);
+ PopplerAnnotText *text = POPPLER_ANNOT_TEXT (poppler_annot);
+
+ if (mask & EV_ANNOTATIONS_SAVE_TEXT_IS_OPEN) {
+ poppler_annot_text_set_is_open (text,
+ ev_annotation_text_get_is_open (ev_text));
+ }
+ if (mask & EV_ANNOTATIONS_SAVE_TEXT_ICON) {
+ EvAnnotationTextIcon icon;
+
+ icon = ev_annotation_text_get_icon (ev_text);
+ poppler_annot_text_set_icon (text, get_poppler_annot_text_icon (icon));
+ }
+ }
+#endif /* HAVE_POPPLER_PAGE_ADD_ANNOT */
+ PDF_DOCUMENT (document_annotations)->annots_modified = TRUE;
}
static void
pdf_document_document_annotations_iface_init (EvDocumentAnnotationsInterface *iface)
{
iface->get_annotations = pdf_document_annotations_get_annotations;
- iface->annotation_set_contents = pdf_document_annotations_annotation_set_contents;
+ iface->document_is_modified = pdf_document_annotations_document_is_modified;
+#ifdef HAVE_POPPLER_PAGE_ADD_ANNOT
+ iface->add_annotation = pdf_document_annotations_add_annotation;
+#endif
+ iface->save_annotation = pdf_document_annotations_save_annotation;
}
/* Attachments */
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff