]> www.fi.muni.cz Git - evince.git/blobdiff - backend/pdf/ev-poppler.cc
[pdf] Implement document_links_find_link_page()
[evince.git] / backend / pdf / ev-poppler.cc
index 4b262900427080c48589811524244f2a8dea3b98..d68c7b173a97219f9fe2d2f9231bbfffba5e6e4b 100644 (file)
 
 #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-images.h"
 #include "ev-document-fonts.h"
 #include "ev-document-security.h"
-#include "ev-document-thumbnails.h"
 #include "ev-document-transition.h"
 #include "ev-document-forms.h"
 #include "ev-document-layers.h"
@@ -102,7 +100,8 @@ struct _PdfDocument
 
        PopplerDocument *document;
        gchar *password;
-       gboolean modified;
+       gboolean forms_modified;
+       gboolean annots_modified;
 
        PopplerFontInfo *font_info;
        PopplerFontsIter *fonts_iter;
@@ -111,10 +110,10 @@ struct _PdfDocument
        PdfPrintContext *print_ctx;
 
        GList *layers;
+       GHashTable *annots;
 };
 
 static void pdf_document_security_iface_init             (EvDocumentSecurityInterface    *iface);
-static void pdf_document_document_thumbnails_iface_init  (EvDocumentThumbnailsInterface  *iface);
 static void pdf_document_document_links_iface_init       (EvDocumentLinksInterface       *iface);
 static void pdf_document_document_images_iface_init      (EvDocumentImagesInterface      *iface);
 static void pdf_document_document_forms_iface_init       (EvDocumentFormsInterface       *iface);
@@ -128,10 +127,6 @@ static void pdf_document_file_exporter_iface_init        (EvFileExporterInterfac
 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,
-                                                         gint                           *height);
 static int  pdf_document_get_n_pages                    (EvDocument                     *document);
 
 static EvLinkDest *ev_link_dest_from_dest    (PdfDocument       *pdf_document,
@@ -148,8 +143,6 @@ EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
                         {
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
                                                                 pdf_document_security_iface_init);
-                                EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                                pdf_document_document_thumbnails_iface_init);
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
                                                                 pdf_document_document_links_iface_init);
                                 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
@@ -188,6 +181,11 @@ pdf_document_dispose (GObject *object)
                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);
        }
@@ -251,9 +249,13 @@ pdf_document_save (EvDocument  *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);
@@ -397,6 +399,102 @@ pdf_document_render (EvDocument      *document,
                                width, height, rc);
 }
 
+static GdkPixbuf *
+make_thumbnail_for_page (PopplerPage     *poppler_page,
+                        EvRenderContext *rc,
+                        gint             width,
+                        gint             height)
+{
+       GdkPixbuf *pixbuf;
+
+#ifdef POPPLER_WITH_GDK
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                width, height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
+       ev_document_fc_mutex_lock ();
+       poppler_page_render_to_pixbuf (poppler_page, 0, 0,
+                                      width, height,
+                                      rc->scale, rc->rotation, pixbuf);
+       ev_document_fc_mutex_unlock ();
+#else
+       cairo_surface_t *surface;
+
+       ev_document_fc_mutex_lock ();
+       surface = pdf_page_render (poppler_page, width, height, rc);
+       ev_document_fc_mutex_unlock ();
+       
+       pixbuf = ev_document_misc_pixbuf_from_surface (surface);
+       cairo_surface_destroy (surface);
+#endif /* POPPLER_WITH_GDK */
+
+       return pixbuf;
+}
+
+static GdkPixbuf *
+pdf_document_get_thumbnail (EvDocument      *document,
+                           EvRenderContext *rc)
+{
+       PdfDocument *pdf_document = PDF_DOCUMENT (document);
+       PopplerPage *poppler_page;
+       GdkPixbuf *pixbuf = NULL;
+       GdkPixbuf *border_pixbuf;
+       double page_width, page_height;
+       gint width, height;
+
+       poppler_page = POPPLER_PAGE (rc->page->backend_page);
+
+       poppler_page_get_size (poppler_page,
+                              &page_width, &page_height);
+
+       width = MAX ((gint)(page_width * rc->scale + 0.5), 1);
+       height = MAX ((gint)(page_height * rc->scale + 0.5), 1);
+
+       if (rc->rotation == 90 || rc->rotation == 270) {
+               gint  temp;
+
+               temp = width;
+               width = height;
+               height = temp;
+       }
+
+#ifdef POPPLER_WITH_GDK
+       pixbuf = poppler_page_get_thumbnail_pixbuf (poppler_page);
+#else
+       cairo_surface_t *surface;
+       
+       surface = poppler_page_get_thumbnail (poppler_page);
+       if (surface) {
+               pixbuf = ev_document_misc_pixbuf_from_surface (surface);
+               cairo_surface_destroy (surface);
+       }
+#endif /* POPPLER_WITH_GDK */
+
+       if (pixbuf != NULL) {
+               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
+                       gdk_pixbuf_get_height (pixbuf) :
+                       gdk_pixbuf_get_width (pixbuf);
+
+               if (thumb_width == width) {
+                       GdkPixbuf *rotated_pixbuf;
+
+                       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
+                                                                  (GdkPixbufRotation) (360 - rc->rotation));
+                       g_object_unref (pixbuf);
+                       pixbuf = rotated_pixbuf;
+               } else {
+                       /* The provided thumbnail has a different size */
+                       g_object_unref (pixbuf);
+                       pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
+               }
+       } else {
+               /* There is no provided thumbnail. We need to make one. */
+               pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
+       }
+
+       return pixbuf;
+}
+
 /* reference:
 http://www.pdfa.org/lib/exe/fetch.php?id=pdfa%3Aen%3Atechdoc&cache=cache&media=pdfa:techdoc:tn0001_pdfa-1_and_namespaces_2008-03-18.pdf */
 static char *
@@ -798,6 +896,12 @@ pdf_document_get_backend_info (EvDocument *document, EvDocumentBackendInfo *info
        return TRUE;
 }
 
+static gboolean
+pdf_document_support_synctex (EvDocument *document)
+{
+       return TRUE;
+}
+
 static void
 pdf_document_class_init (PdfDocumentClass *klass)
 {
@@ -813,8 +917,10 @@ pdf_document_class_init (PdfDocumentClass *klass)
        ev_document_class->get_page_size = pdf_document_get_page_size;
        ev_document_class->get_page_label = pdf_document_get_page_label;
        ev_document_class->render = pdf_document_render;
+       ev_document_class->get_thumbnail = pdf_document_get_thumbnail;
        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 */
@@ -1152,36 +1258,7 @@ build_tree (PdfDocument      *pdf_document,
                if (!action)
                        continue;
 
-               switch (action->type) {
-                       case POPPLER_ACTION_GOTO_DEST: {
-                               /* For bookmarks, solve named destinations */
-                               if (action->goto_dest.dest->type == POPPLER_DEST_NAMED) {
-                                       PopplerDest *dest;
-                                       EvLinkDest *ev_dest = NULL;
-                                       EvLinkAction *ev_action;
-                                       
-                                       dest = poppler_document_find_dest (pdf_document->document,
-                                                                          action->goto_dest.dest->named_dest);
-                                       if (!dest) {
-                                               link = ev_link_from_action (pdf_document, action);
-                                               break;
-                                       }
-                                       
-                                       ev_dest = ev_link_dest_from_dest (pdf_document, dest);
-                                       poppler_dest_free (dest);
-                                       
-                                       ev_action = ev_link_action_new_dest (ev_dest);
-                                       link = ev_link_new (action->any.title, ev_action);
-                               } else {
-                                       link = ev_link_from_action (pdf_document, action);
-                               }
-                       }
-                               break;
-                       default:
-                               link = ev_link_from_action (pdf_document, action);
-                               break;
-               }
-               
+               link = ev_link_from_action (pdf_document, action);
                if (!link || strlen (ev_link_get_title (link)) <= 0) {
                        poppler_action_free (action);
                        if (link)
@@ -1235,7 +1312,7 @@ pdf_document_links_get_links_model (EvDocumentLinks *document_links)
        return model;
 }
 
-static GList *
+static EvMappingList *
 pdf_document_links_get_links (EvDocumentLinks *document_links,
                              EvPage          *page)
 {
@@ -1270,7 +1347,7 @@ pdf_document_links_get_links (EvDocumentLinks *document_links,
 
        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 *
@@ -1292,6 +1369,25 @@ pdf_document_links_find_link_dest (EvDocumentLinks  *document_links,
        return ev_dest;
 }
 
+static gint
+pdf_document_links_find_link_page (EvDocumentLinks  *document_links,
+                                  const gchar      *link_name)
+{
+       PdfDocument *pdf_document;
+       PopplerDest *dest;
+       gint         retval = -1;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       dest = poppler_document_find_dest (pdf_document->document,
+                                          link_name);
+       if (dest) {
+               retval = dest->page_num - 1;
+               poppler_dest_free (dest);
+       }
+
+       return retval;
+}
+
 static void
 pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface)
 {
@@ -1299,9 +1395,10 @@ pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface)
        iface->get_links_model = pdf_document_links_get_links_model;
        iface->get_links = pdf_document_links_get_links;
        iface->find_link_dest = pdf_document_links_find_link_dest;
+       iface->find_link_page = pdf_document_links_find_link_page;
 }
 
-static GList *
+static EvMappingList *
 pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
                                       EvPage           *page)
 {
@@ -1334,7 +1431,7 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
 
        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 *
@@ -1368,128 +1465,6 @@ pdf_document_document_images_iface_init (EvDocumentImagesInterface *iface)
        iface->get_image = pdf_document_images_get_image;
 }
 
-static GdkPixbuf *
-make_thumbnail_for_page (PopplerPage     *poppler_page,
-                        EvRenderContext *rc,
-                        gint             width,
-                        gint             height)
-{
-       GdkPixbuf *pixbuf;
-
-#ifdef POPPLER_WITH_GDK
-       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-                                width, height);
-       gdk_pixbuf_fill (pixbuf, 0xffffffff);
-
-       ev_document_fc_mutex_lock ();
-       poppler_page_render_to_pixbuf (poppler_page, 0, 0,
-                                      width, height,
-                                      rc->scale, rc->rotation, pixbuf);
-       ev_document_fc_mutex_unlock ();
-#else
-       cairo_surface_t *surface;
-
-       ev_document_fc_mutex_lock ();
-       surface = pdf_page_render (poppler_page, width, height, rc);
-       ev_document_fc_mutex_unlock ();
-       
-       pixbuf = ev_document_misc_pixbuf_from_surface (surface);
-       cairo_surface_destroy (surface);
-#endif /* POPPLER_WITH_GDK */
-
-       return pixbuf;
-}
-
-static GdkPixbuf *
-pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
-                                      EvRenderContext      *rc, 
-                                      gboolean              border)
-{
-       PdfDocument *pdf_document = PDF_DOCUMENT (document_thumbnails);
-       PopplerPage *poppler_page;
-       GdkPixbuf *pixbuf = NULL;
-       GdkPixbuf *border_pixbuf;
-       gint width, height;
-
-       poppler_page = POPPLER_PAGE (rc->page->backend_page);
-
-       pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
-                                               rc, &width, &height);
-       
-#ifdef POPPLER_WITH_GDK
-       pixbuf = poppler_page_get_thumbnail_pixbuf (poppler_page);
-#else
-       cairo_surface_t *surface;
-       
-       surface = poppler_page_get_thumbnail (poppler_page);
-       if (surface) {
-               pixbuf = ev_document_misc_pixbuf_from_surface (surface);
-               cairo_surface_destroy (surface);
-       }
-#endif /* POPPLER_WITH_GDK */
-
-       if (pixbuf != NULL) {
-               int thumb_width = (rc->rotation == 90 || rc->rotation == 270) ?
-                       gdk_pixbuf_get_height (pixbuf) :
-                       gdk_pixbuf_get_width (pixbuf);
-
-               if (thumb_width == width) {
-                       GdkPixbuf *rotated_pixbuf;
-
-                       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf,
-                                                                  (GdkPixbufRotation) (360 - rc->rotation));
-                       g_object_unref (pixbuf);
-                       pixbuf = rotated_pixbuf;
-               } else {
-                       /* The provided thumbnail has a different size */
-                       g_object_unref (pixbuf);
-                       pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
-               }
-       } else {
-               /* There is no provided thumbnail. We need to make one. */
-               pixbuf = make_thumbnail_for_page (poppler_page, rc, width, height);
-       }
-
-        if (border && pixbuf) {
-               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
-               g_object_unref (pixbuf);
-               pixbuf = border_pixbuf;
-       }               
-
-       return pixbuf;
-}
-
-static void
-pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails,
-                                       EvRenderContext      *rc,
-                                       gint                 *width,
-                                       gint                 *height)
-{
-       double page_width, page_height;
-       
-       poppler_page_get_size (POPPLER_PAGE (rc->page->backend_page),
-                              &page_width, &page_height);
-       
-       *width = MAX ((gint)(page_width * rc->scale + 0.5), 1);
-       *height = MAX ((gint)(page_height * rc->scale + 0.5), 1);
-
-       if (rc->rotation == 90 || rc->rotation == 270) {
-               gint  temp;
-
-               temp = *width;
-               *width = *height;
-               *height = temp;
-       }
-}
-
-static void
-pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface)
-{
-       iface->get_thumbnail = pdf_document_thumbnails_get_thumbnail;
-       iface->get_dimensions = pdf_document_thumbnails_get_dimensions;
-}
-
-
 static GList *
 pdf_document_find_find_text (EvDocumentFind *document_find,
                             EvPage         *page,
@@ -1899,12 +1874,18 @@ pdf_selection_get_selected_text (EvSelection     *selection,
                                 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;
@@ -1914,53 +1895,53 @@ pdf_selection_get_selected_text (EvSelection     *selection,
        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;
@@ -1976,14 +1957,14 @@ pdf_selection_iface_init (EvSelectionInterface *iface)
 
 
 /* EvDocumentText */
-static GdkRegion *
+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);
 
@@ -1996,12 +1977,26 @@ pdf_document_text_get_text_mapping (EvDocumentText *document_text,
        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)
@@ -2021,7 +2016,9 @@ pdf_document_text_get_text (EvDocumentText  *selection,
                                      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,
@@ -2036,6 +2033,7 @@ pdf_document_text_get_text_layout (EvDocumentText  *selection,
 
        return poppler_page_get_text_layout (poppler_page, (PopplerRectangle **)areas, n_areas);
 }
+#endif
 
 static void
 pdf_document_text_iface_init (EvDocumentTextInterface *iface)
@@ -2235,7 +2233,7 @@ ev_form_field_from_poppler_field (PopplerFormField *poppler_field)
        return ev_field;
 }
 
-static GList *
+static EvMappingList *
 pdf_document_forms_get_form_fields (EvDocumentForms *document, 
                                    EvPage          *page)
 {
@@ -2280,7 +2278,15 @@ pdf_document_forms_get_form_fields (EvDocumentForms *document,
        
        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 *
@@ -2312,7 +2318,7 @@ pdf_document_forms_form_field_text_set_text (EvDocumentForms *document,
                return;
        
        poppler_form_field_text_set_text (poppler_field, text);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2327,7 +2333,7 @@ pdf_document_forms_form_field_button_set_state (EvDocumentForms *document,
                return;
        
        poppler_form_field_button_set_state (poppler_field, state);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static gboolean
@@ -2408,7 +2414,7 @@ pdf_document_forms_form_field_choice_select_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_select_item (poppler_field, index);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2423,7 +2429,7 @@ pdf_document_forms_form_field_choice_toggle_item (EvDocumentForms *document,
                return;
 
        poppler_form_field_choice_toggle_item (poppler_field, index);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2437,7 +2443,7 @@ pdf_document_forms_form_field_choice_unselect_all (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_unselect_all (poppler_field);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static void
@@ -2452,7 +2458,7 @@ pdf_document_forms_form_field_choice_set_text (EvDocumentForms *document,
                return;
        
        poppler_form_field_choice_set_text (poppler_field, text);
-       PDF_DOCUMENT (document)->modified = TRUE;
+       PDF_DOCUMENT (document)->forms_modified = TRUE;
 }
 
 static gchar *
@@ -2475,6 +2481,7 @@ static void
 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;
@@ -2506,6 +2513,77 @@ poppler_annot_color_to_gdk_color (PopplerAnnot *poppler_annot,
        } /* 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)
@@ -2523,7 +2601,9 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
                        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;
                case POPPLER_ANNOT_FILE_ATTACHMENT: {
@@ -2578,10 +2658,34 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
        }
 
        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;
@@ -2607,13 +2711,10 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
 
                                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);
@@ -2634,13 +2735,14 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
        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;
@@ -2648,12 +2750,20 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
 
        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;
@@ -2665,8 +2775,12 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
                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;
@@ -2685,13 +2799,139 @@ pdf_document_annotations_get_annotations (EvDocumentAnnotations *document_annota
 
        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;
 
@@ -2699,15 +2939,62 @@ pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *documen
        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 */