Changeset 196

Timestamp:

05/28/06 11:53:35 (2 years ago)

Author:

jordi

Message:

The old DocumentLink? class is now the IDocumentLink interface and only handles the link's rectangle. The functionality of the old DocumentLink? class is now inside the IDocumentLink derived DocumentLinkGoto? class.

The links are now created inside PDFDocument::createDocumentLink function and can be of DocumentLinkGoto? for internal references or DocumentLinkUri? for internet addresses (not yet implemented).

Location:

trunk/src

Files:

• DocumentLinkGoto.cxx (added)
• DocumentLinkGoto.h (added)
• DocumentLinkUri.cxx (added)
• DocumentLinkUri.h (added)
• DocumentPage.cxx (modified) (5 diffs)
• DocumentPage.h (modified) (1 diff)
• IDocument.cxx (modified) (1 diff)
• IDocumentLink.cxx (moved) (moved from trunk/src/DocumentLink.cxx) (3 diffs)
• IDocumentLink.h (moved) (moved from trunk/src/DocumentLink.h) (2 diffs)
• Makefile.am (modified) (3 diffs)
• PDFDocument.cxx (modified) (3 diffs)
• PDFDocument.h (modified) (2 diffs)
• epdfview.h (modified) (1 diff)

trunk/src/DocumentPage.cxx

@@ -46 +46 @@
           linkItem = g_list_next (linkItem) )
     {
-        DocumentLink *link = (DocumentLink *)linkItem->data;
+        IDocumentLink *link = (IDocumentLink *)linkItem->data;
         delete link;
     }
@@ -61 +61 @@
 ///
 void
-DocumentPage::addLink (DocumentLink *link)
+DocumentPage::addLink (IDocumentLink *link)
 {
     m_LinkList = g_list_prepend (m_LinkList, link);
@@ -111 +111 @@
 /// @return The link under the position (x, y) or NULL if no link exists.
 ///
-DocumentLink *
+IDocumentLink *
 DocumentPage::getLinkAtPosition (gint x, gint y)
 {
-    DocumentLink *link = NULL;
+    IDocumentLink *link = NULL;
 
     for ( GList *linkItem = g_list_first (m_LinkList) ;
@@ -120 +120 @@
           linkItem = g_list_next (linkItem) )
     {
-        DocumentLink *tmpLink = (DocumentLink *)linkItem->data;
+        IDocumentLink *tmpLink = (IDocumentLink *)linkItem->data;
         if ( tmpLink->positionIsOver (x, y) )
         {
@@ -126 +126 @@
         }
     }
-    
+
     return link;
 }

trunk/src/DocumentPage.h

@@ -32 +32 @@
             DocumentPage (void);
             ~DocumentPage (void);
-           
-            void addLink (DocumentLink *link);
+
+            void addLink (IDocumentLink *link);
             void clearSelection (void);
             guchar *getData (void);
             gint getHeight (void);
-            DocumentLink *getLinkAtPosition (gint x, gint y);
+            IDocumentLink *getLinkAtPosition (gint x, gint y);
             gint getRowStride (void);
             gint getWidth (void);

trunk/src/IDocument.cxx

@@ -1476 +1476 @@
     if ( NULL != page && 0 == getRotation () )
     {
-        DocumentLink *link = page->getLinkAtPosition (x, y);
+        IDocumentLink *link = page->getLinkAtPosition (x, y);
         if ( NULL != link )
         {
-            goToPage (link->getDestinationPage ());
+            link->activate (this);
         }
-    }    
-}
+    }
+}

trunk/src/IDocumentLink.cxx

@@ -22 +22 @@
 
 ///
-/// @brief Construct a new DocumentLink object.
+/// @brief Construct a new IDocumentLink object.
 ///
 /// @param x1 The X coordinate of the link's top-left corner.
@@ -28 +28 @@
 /// @param x2 The X coordinate of the link's bottom-right corner.
 /// @param y2 The Y coordinate of the link's bottom-right corner.
-/// @param destinationPage The page number the links points to.
 ///
-DocumentLink::DocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y2,
-                            gint destinationPage)
+IDocumentLink::IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y2)
 {
-    m_DestinationPage = destinationPage;
     m_Rect = new DocumentRectangle (x1, y1, x2, y2);
 }
 
 ///
-/// @brief Destroys all dynamically allocated memory by DocumentLink.
+/// @brief Destroys all dynamically allocated memory by IDocumentLink.
 ///
-DocumentLink::~DocumentLink ()
+IDocumentLink::~IDocumentLink ()
 {
     delete m_Rect;
 }
 
-///
-/// @brief Gets the destination page number.
-///
-/// @return The page number the link's points at.
-///
-gint
-DocumentLink::getDestinationPage ()
-{
-    return m_DestinationPage;
-}
-
-///
 /// @brief Checks if a position is over the link.
 ///
@@ -68 +53 @@
 ///
 gboolean
-DocumentLink::positionIsOver (gint x, gint y)
+IDocumentLink::positionIsOver (gint x, gint y)
 {
     return ( (gint)m_Rect->getX1 () <= x && (gint)m_Rect->getY1 () <= y &&

trunk/src/IDocumentLink.h

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#if !defined (__DOCUMENT_LINK_H__)
-#define __DOCUMENT_LINK_H__
+#if !defined (__IDOCUMENT_LINK_H__)
+#define __IDOCUMENT_LINK_H__
 
 namespace ePDFView
 {
+    // Forward declarations.
+    class IDocument;
+
     ///
-    /// @class DocumentLink
+    /// @class IDocumentLink
     /// @brief A single link on a page.
     ///
     /// This class is used by ePDFView::DocumentPage to maintain a list
-    /// of all links that a single page have. A link, in this version of
-    /// ePDFView, is just a rectangle on a page that points to another page.
+    /// of all links that a single page have.
     ///
-    class DocumentLink
+    class IDocumentLink
     {
         public:
-            DocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y1,
-                          gint destinationPage);
-            ~DocumentLink (void);
+            IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y1);
+            virtual ~IDocumentLink (void);
 
-            gint getDestinationPage (void);
+            virtual void activate (IDocument *document) = 0;
             gboolean positionIsOver (gint x, gint y);
 
         protected:
-            /// The number of the link's destination page.
-            gint m_DestinationPage;
             /// The link rectangle.
             DocumentRectangle *m_Rect;
@@ -47 +46 @@
 }
 
-#endif // !__DOCUMENT_LINK_H__
+#endif // !__IDOCUMENT_LINK_H__

trunk/src/Makefile.am

@@ -5 +5 @@
 
 libepdfview_a_SOURCES = \
-    Config.cxx          \
-    Config.h            \
-    DocumentLink.cxx    \
-    DocumentLink.h  \
+    Config.cxx  \
+    Config.h    \
+    DocumentLinkGoto.cxx    \
+    DocumentLinkGoto.h  \
+    DocumentLinkUri.cxx \
+    DocumentLinkUri.h   \
     DocumentOutline.cxx \
     DocumentOutline.h   \
@@ -15 +17 @@
     DocumentRectangle.cxx   \
     DocumentRectangle.h \
-    epdfview.h          \
+    epdfview.h  \
     FindPter.cxx    \
     FindPter.h  \
-    gettext.h           \
-    IDocument.cxx       \
-    IDocument.h         \
+    gettext.h   \
+    IDocument.cxx   \
+    IDocument.h     \
+    IDocumentLink.cxx   \
+    IDocumentLink.h \
     IDocumentObserver.h \
     IFindView.h \
@@ -29 +33 @@
     JobFind.cxx \
     JobFind.h   \
-    JobLoad.cxx         \
-    JobLoad.h           \
+    JobLoad.cxx     \
+    JobLoad.h       \
     JobRender.cxx   \
     JobRender.h \
-    MainPter.cxx        \
-    MainPter.h          \
+    MainPter.cxx    \
+    MainPter.h      \
     PagePter.cxx    \
     PagePter.h  \
-    PDFDocument.cxx     \
+    PDFDocument.cxx \
     PDFDocument.h
 
 libepdfview_a_CXXFLAGS =    \
-    $(GLIB_CFLAGS)          \
+    $(GLIB_CFLAGS)  \
     $(POPPLER_CFLAGS)
 

trunk/src/PDFDocument.cxx

@@ -54 +54 @@
 }
 
+///
+/// @brief Creates a new document link.
+///
+/// Based on the passed @a link, this function creates a new document
+/// links of the best type for the link's action.
+///
+/// @param link The link to create the document link from.
+/// @param pageHeight The unscaled size of the page's height.
+/// @param scale The scale to calculate the link's coordinates.
+///
+/// @return The link best suited for @a link or NULL if no link can be
+///         created.
+IDocumentLink *
+PDFDocument::createDocumentLink (const PopplerLinkMapping *link,
+                                 const gdouble pageHeight,
+                                 const gdouble scale)
+{
+    PopplerAction *action = link->action;
+    IDocumentLink *documentLink = NULL;
+
+    // Calculate the four link's corners.
+    gdouble topLeft = link->area.x1 * scale;
+    gdouble topRight = link->area.x2 * scale;
+    gdouble bottomLeft = (pageHeight - link->area.y2) * scale;
+    gdouble bottomRight = (pageHeight - link->area.y1) * scale;
+
+    switch (action->type)
+    {
+        // Internal cross-reference link.
+        case POPPLER_ACTION_GOTO_DEST:
+        {
+            PopplerActionGotoDest *actionGoTo = (PopplerActionGotoDest *)action;
+            documentLink = new DocumentLinkGoto (
+                    topLeft, bottomLeft, topRight, bottomRight,
+                    actionGoTo->dest->page_num);
+            break;
+        }
+        // Internet address.
+        case POPPLER_ACTION_URI:
+        {
+            PopplerActionUri *actionUri = (PopplerActionUri *)action;
+            documentLink = new DocumentLinkUri (
+                    topLeft, bottomLeft, topRight, bottomRight,
+                    actionUri->uri);
+            break;
+        }
+
+        default:
+            g_warning ("Poppler's link type %d not handled.", action->type);
+            break;
+    }
+
+    return documentLink;
+}
+
 GList *
 PDFDocument::findTextInPage (gint pageNum, const gchar *textToFind)
 {
     GList *results = NULL;
-    
+
     if ( NULL == m_Document )
-    {    
+    {
         return results;
     }
@@ -161 +216 @@
         return FALSE;
     }
-   
+
     // Set the used filename and password to let the user reload the
     // document.
-    setFileName (filename);    
+    setFileName (filename);
     setPassword (password);
     if ( NULL != m_Document )
@@ -289 +344 @@
     {
         PopplerLinkMapping *link = (PopplerLinkMapping *)pageLink->data;
-        PopplerAction *action = link->action;
-        // Only internal links.
-        if ( POPPLER_ACTION_GOTO_DEST == action->type )
-        {
-            PopplerActionGotoDest *actionGoTo = (PopplerActionGotoDest *)action;
-            DocumentLink *documentLink = 
-                new DocumentLink (link->area.x1 * scale, 
-                                  (pageHeight - link->area.y2) * scale,
-                                  link->area.x2 * scale,
-                                  (pageHeight - link->area.y1) * scale,
-                                  actionGoTo->dest->page_num);
+        IDocumentLink *documentLink = createDocumentLink (link, pageHeight, scale);
+        if ( NULL != documentLink )
+        {
             renderedPage->addLink (documentLink);
         }

trunk/src/PDFDocument.h

@@ -21 +21 @@
 
 /// Forward declarations.
+typedef struct _PopplerDocument PopplerDocument;
 typedef struct _PopplerIndexIter PopplerIndexIter;
-typedef struct _PopplerDocument PopplerDocument;
+typedef struct _PopplerLinkMapping PopplerLinkMapping;
 typedef struct _PopplerPage PopplerPage;
 
@@ -51 +52 @@
             PopplerDocument *m_Document;
 
+            IDocumentLink *createDocumentLink (const PopplerLinkMapping *link,
+                                               const gdouble pageHeight,
+                                               const gdouble scale);
             void loadMetadata (void);
-            void setOutline (DocumentOutline *outline, 
+            void setOutline (DocumentOutline *outline,
                              PopplerIndexIter *childrenList);
             void setLinks (DocumentPage *renderedPage,

trunk/src/epdfview.h

@@ -26 +26 @@
 
 #include <DocumentRectangle.h>
-#include <DocumentLink.h>
+#include <IDocumentLink.h>
+#include <DocumentLinkGoto.h>
+#include <DocumentLinkUri.h>
 #include <DocumentOutline.h>
 #include <DocumentPage.h>