Changeset 277

Timestamp:

06/11/07 09:12:09 (15 months ago)

Author:

jordi

Message:

Added a patch by Igor Vagulin which adds text selection and copy to clipboard features. This fixes bug #14.

Location:

trunk

Files:

• data/epdfview-ui.xml (modified) (3 diffs)
• src/DocumentPage.cxx (modified) (6 diffs)
• src/DocumentPage.h (modified) (3 diffs)
• src/IDocument.h (modified) (3 diffs)
• src/IDocumentObserver.h (modified) (1 diff)
• src/IMainView.h (modified) (1 diff)
• src/IPageView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (2 diffs)
• src/MainPter.h (modified) (2 diffs)
• src/PDFDocument.cxx (modified) (1 diff)
• src/PDFDocument.h (modified) (1 diff)
• src/PagePter.cxx (modified) (8 diffs)
• src/PagePter.h (modified) (3 diffs)
• src/gtk/MainView.cxx (modified) (5 diffs)
• src/gtk/MainView.h (modified) (2 diffs)
• src/gtk/PageView.cxx (modified) (1 diff)

trunk/data/epdfview-ui.xml

@@ -11 +11 @@
     <menu action="EditMenu">
       <menuitem name="Find" action="Find"/>
+      <separator />
+      <menuitem name="PageModeScroll" action="PageModeScroll"/>
+      <menuitem name="PageModeText" action="PageModeText"/>
       <separator />
       <menuitem name="Preferences" action="Preferences"/>
@@ -39 +42 @@
     </menu>
   </menubar>
-  
+
   <toolbar name="ToolBar">
     <toolitem name="OpenFile" action="OpenFile"/>
@@ -50 +53 @@
     <toolitem name="ZoomFit" action="ZoomFit"/>
     <toolitem name="ZoomWidth" action="ZoomWidth"/>
+    <separator/>
+    <toolitem name="PageModeScroll" action="PageModeScroll"/>
+    <toolitem name="PageModeText" action="PageModeText"/>
   </toolbar>
 

trunk/src/DocumentPage.cxx

@@ -18 +18 @@
 #include <config.h>
 #include <string.h>
+#include <gdk/gdk.h>
 #include "epdfview.h"
 
@@ -29 +30 @@
 DocumentPage::DocumentPage ()
 {
+    m_Selection = NULL;
     m_Data = NULL;
     m_HasSelection = FALSE;
@@ -50 +52 @@
     }
     g_list_free (m_LinkList);
+
+    if(m_Selection)
+        gdk_region_destroy(m_Selection);
 }
 
@@ -79 +84 @@
         invertArea (m_SelectionX1, m_SelectionY1, m_SelectionX2, m_SelectionY2);
         m_HasSelection = FALSE;
+    }
+
+    if(NULL != m_Selection){
+        invertRegion(m_Selection);
+        gdk_region_destroy(m_Selection);
+        m_Selection = NULL;
     }
 }
@@ -196 +207 @@
 }
 
+void
+DocumentPage::invertRegion (GdkRegion* region)
+{
+    int count;
+    GdkRectangle *rectangles;
+    gdk_region_get_rectangles(region, &rectangles, &count);
+    while(count--){
+        GdkRectangle r = rectangles[count];
+        invertArea(r.x, r.y, r.x + r.width, r.y + r.height);
+    }
+    g_free(rectangles);
+}
+
+
 ///
 /// @brief Allocates the memory for a new page.
@@ -254 +279 @@
     m_HasSelection = TRUE;
 }
+
+void
+DocumentPage::setSelection (GdkRegion *region)
+{
+    clearSelection ();
+    
+    invertRegion (region);
+    
+    m_Selection = gdk_region_copy(region);
+}

trunk/src/DocumentPage.h

@@ -18 +18 @@
 #if !defined (__DOCUMENT_PAGE_H__)
 #define __DOCUMENT_PAGE_H__
+
+typedef struct _GdkRegion GdkRegion;
 
 namespace ePDFView
@@ -42 +44 @@
             gboolean newPage (gint width, gint height);
             void setSelection (DocumentRectangle &selection, gdouble scale);
+            void setSelection (GdkRegion *region);
 
         protected:
@@ -62 +65 @@
             /// The list of links from the page.
             GList *m_LinkList;
-
+            /// Selection region
+            GdkRegion *m_Selection;
+            
+            void invertRegion (GdkRegion*);
             void invertArea (gint x1, gint y1, gint x2, gint y2);
     };

trunk/src/IDocument.h

@@ -22 +22 @@
 #define EPDFVIEW_DOCUMENT_ERROR     ePDFView::IDocument::getErrorQuark ()
 
+typedef struct _GdkRegion GdkRegion;
+
 namespace ePDFView 
 {
@@ -27 +29 @@
     class DocumentIndex;
     class IDocumentObserver;
-    class DocumentPage;
+    class DocumentPage; 
 
     ///
@@ -263 +265 @@
             virtual gboolean saveFile (const gchar *filename,
                                        GError **error) = 0;
+
+            virtual GdkRegion* getTextRegion (DocumentRectangle *rect) = 0;
+            virtual void setTextSelection (DocumentRectangle *rect) = 0;
 
             void attach (const IDocumentObserver *observer);

trunk/src/IDocumentObserver.h

@@ -151 +151 @@
             virtual void notifySaveError (const GError *error) { }
 
+            ///
+            /// @brief Someone select text in document.
+            ///
+            /// This function called when someone select some text
+            /// in document.
+            ///
+            /// @param text Selected text.
+            ///
+            virtual void notifyTextSelected (const gchar* text) { }
+
         protected:
             ///

trunk/src/IMainView.h

@@ -577 +577 @@
             virtual void setOutline (DocumentOutline *outline) = 0;
 
+            virtual void copyTextToClibboard(const gchar* text) = 0;
+            virtual void activePageModeScroll (gboolean active) = 0;
+            virtual void activePageModeText (gboolean active) = 0;
+
         protected:
             ///

trunk/src/IPageView.h

@@ -33 +33 @@
         /// Drag cursor.
         PAGE_VIEW_CURSOR_DRAG,
+        /// Text selection cursor.
+        PAGE_VIEW_CURSOR_SELECT_TEXT,
         /// Link cursor.
         PAGE_VIEW_CURSOR_LINK

trunk/src/MainPter.cxx

@@ -696 +696 @@
 }
 
+void
+MainPter::pageModeScrollActivated (gboolean active)
+{
+    IMainView &view = getView ();
+    if ( active )
+    {
+        m_PagePter->setMode(PagePterModeScroll);
+        view.activePageModeText (FALSE);
+    }
+}
+
+void
+MainPter::pageModeTextActivated (gboolean active)
+{
+    IMainView &view = getView ();
+    if ( active )
+    {
+        m_PagePter->setMode(PagePterModeSelectText);
+        view.activePageModeScroll (FALSE);
+    }
+}
+
 ///
 /// @brief The "Zoom In" was activated.
@@ -996 +1018 @@
 }
 #endif // DEBUG
+
+void 
+MainPter::notifyTextSelected (const gchar* text)
+{
+    getView ().copyTextToClibboard(text);
+}

trunk/src/MainPter.h

@@ -40 +40 @@
             MainPter (IDocument *document);
             ~MainPter (void);
+
+            void pageModeTextActivated(gboolean active);
+            void pageModeScrollActivated(gboolean active);
 
             void setInitialState (void);
@@ -85 +88 @@
             void notifySave (void);
             void notifySaveError (const GError *error);
+            void notifyTextSelected (const gchar* text);
 
 #if defined (DEBUG)

trunk/src/PDFDocument.cxx

@@ -657 +657 @@
 }
 
+void 
+PDFDocument::setTextSelection (DocumentRectangle *rect)
+{
+    g_assert(rect);
+
+    PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1);
+    if(!page)
+        return;
+
+    gdouble pageWidth, pageHeight;
+    poppler_page_get_size(page, &pageWidth, &pageHeight);
+    
+    //for get text we must exchange y coordinate, don't ask me where logic here.
+    PopplerRectangle textRect = { rect->getX1(),
+                                  (pageHeight - rect->getY2()),
+                                  rect->getX2(),
+                                  (pageHeight - rect->getY1())};
+    gchar *text = poppler_page_get_text(page, &textRect);
+    if(!text)
+        goto cleanup;
+        
+    for ( GList *obs = g_list_first (m_Observers) ;
+          NULL != obs ;
+          obs = g_list_next (obs) )
+        {
+            IDocumentObserver *observer = (IDocumentObserver*)obs->data;
+            observer->notifyTextSelected(text);
+        }
+
+ cleanup:
+    if(page)
+        g_object_unref(page);
+    if(text)
+        g_free(text);
+}
+GdkRegion*
+PDFDocument::getTextRegion (DocumentRectangle *r)
+{
+    GdkRegion *res = NULL;
+    PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1);
+    if(!page)
+        return NULL;
+
+    //calulate rect
+    PopplerRectangle rect;
+    rect.x1 = r->getX1() / getZoom();
+    rect.y1 = r->getY1() / getZoom();
+    rect.x2 = r->getX2() / getZoom();
+    rect.y2 = r->getY2() / getZoom();
+
+    //calc selection size
+    res = poppler_page_get_selection_region(page, getZoom(), &rect);
+                             
+    //free some local data
+    g_object_unref(page);
+
+    return res;
+}
+
+
 ///
 /// @brief Gets the document's page layout from Poppler's page layout.

trunk/src/PDFDocument.h

@@ -55 +55 @@
             DocumentPage *renderPage (gint pageNum);
             gboolean saveFile (const gchar *fileName, GError **error);
+            GdkRegion* getTextRegion (DocumentRectangle* rect);
+            void setTextSelection (DocumentRectangle *rect);
 
         protected:

trunk/src/PagePter.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <gdk/gdk.h>
 #include "epdfview.h"
 
@@ -48 +49 @@
     gint y;
     /// The horizontal position of the page view scroll when the drag started.
-    gdouble scrollX;
+    int startX;
     /// The vertical position of the page view scroll when the drag started.
-    gdouble scrollY;
+    int startY;
 };
 
@@ -61 +62 @@
 PagePter::PagePter (IDocument *document)
 {
+    m_LastSelection = NULL;
     m_Document = document;
     m_Document->attach (this);
@@ -66 +68 @@
     m_NextPageScroll = PAGE_SCROLL_START;
     m_PageView = NULL;
+    m_Mode = PagePterModeScroll;
 }
 
@@ -130 +133 @@
 
             IPageView &view = getView ();
-            m_DragInfo->scrollX = view.getHorizontalScroll ();
-            m_DragInfo->scrollY = view.getVerticalScroll ();
-            view.setCursor (PAGE_VIEW_CURSOR_DRAG);
+            m_DragInfo->startX = x;
+            m_DragInfo->startY = y;
+            if(m_Mode == PagePterModeScroll)
+                view.setCursor (PAGE_VIEW_CURSOR_DRAG);
+            else
+                view.setCursor (PAGE_VIEW_CURSOR_SELECT_TEXT);
         }
     }
@@ -150 +156 @@
     if ( 1 == button )
     {
+        if(m_LastSelection)
+            gdk_region_destroy(m_LastSelection);
+        m_LastSelection = NULL;
+
+        if(m_Document->isLoaded() && m_Mode == PagePterModeSelectText){
+            DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY,
+                                   m_DragInfo->x, m_DragInfo->y);
+            m_Document->setTextSelection(&rect);
+        }
+
         delete m_DragInfo;
         m_DragInfo = NULL;
+
+        refreshPage(PAGE_SCROLL_NONE, FALSE);
+        
         getView ().setCursor (PAGE_VIEW_CURSOR_NORMAL);
     }
@@ -182 +201 @@
         }
     }
-    else
-    {
-        view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (),
-                         x - m_DragInfo->x, y - m_DragInfo->y);
+    else{
+        m_DragInfo->x = x;
+        m_DragInfo->y = y;  
+
+        if(m_Mode == PagePterModeScroll){
+            view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (),
+                             x - m_DragInfo->startX, y - m_DragInfo->startY);
+        }
+        else{
+            if(!m_Document->isLoaded())
+                return ;
+            
+            DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY,
+                                          m_DragInfo->x, m_DragInfo->y);
+
+            GdkRegion *region = m_Document->getTextRegion (&rect);
+
+            if( !m_LastSelection || !gdk_region_equal(m_LastSelection, region)){
+                if(m_LastSelection)
+                    gdk_region_destroy(m_LastSelection);
+                m_LastSelection = gdk_region_copy(region);
+                DocumentPage *page = m_Document->getCurrentPage();
+                if ( NULL != page )
+                    refreshPage (PAGE_SCROLL_NONE, FALSE);
+            }
+        }
     }
 }
@@ -274 +315 @@
         {
             g_WaitingForPage = FALSE;
+            if ( NULL != m_LastSelection )
+                documentPage->setSelection(m_LastSelection);
             view.showPage (documentPage, pageScroll);
         }

trunk/src/PagePter.h

@@ -24 +24 @@
 namespace ePDFView
 {
+    enum PagePterMode{
+        PagePterModeScroll,
+        PagePterModeSelectText,
+    };
+
     ///
     /// @class PagePter.
@@ -54 +59 @@
             void setView (IMainView &view);
             void viewResized (gint width, gint height);
+            void setMode(PagePterMode mode)
+            {
+                m_Mode = mode;
+            }
 
         protected:
@@ -64 +73 @@
             /// The page view.
             IPageView *m_PageView;
-            
-            void refreshPage (PageScroll pageScroll, gboolean wasZoomed);
+            /// Last text selection
+            GdkRegion *m_LastSelection;
+            /// What page presenter must do when user move mouse with button pressed.
+            PagePterMode m_Mode;
+
+            void refreshPage (PageScroll pageScroll, gboolean wasZoomed);
     };
 }

trunk/src/gtk/MainView.cxx

@@ -77 +77 @@
 static void main_window_zoom_out_cb (GtkWidget *, gpointer);
 static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+static void main_window_page_mode_scroll_cb (GtkToggleAction *, gpointer);
+static void main_window_page_mode_text_cb (GtkToggleAction *, gpointer);
 
 #if defined (HAVE_CUPS)
@@ -186 +188 @@
     { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
       N_("Make the current document fill the window width"),
-      G_CALLBACK (main_window_zoom_width_cb), FALSE }
+      G_CALLBACK (main_window_zoom_width_cb), FALSE },
+
+    { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL,
+      N_("Mouse scroll page"),
+      G_CALLBACK (main_window_page_mode_scroll_cb), FALSE },
+
+    { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL,
+      N_(" Mouse select text"),
+      G_CALLBACK (main_window_page_mode_text_cb), FALSE },
 
 };
@@ -273 +283 @@
 }
 
+void
+MainView::activePageModeScroll (gboolean active)
+{
+    GtkAction *action =
+        gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeScroll");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
+}
+
+
+void
+MainView::activePageModeText (gboolean active)
+{
+    GtkAction *action =
+        gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeText");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
+}
+
 gchar *
 MainView::openFileDialog (const gchar *lastFolder)
@@ -1037 +1064 @@
         }
     }
+}
+
+void
+MainView::copyTextToClibboard(const gchar* text)
+{
+    GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+    gtk_clipboard_set_text(clipboard, text, -1);
 }
 
@@ -1417 +1451 @@
     pter->zoomWidthActivated (gtk_toggle_action_get_active (action));
 }
+
+void
+main_window_page_mode_scroll_cb (GtkToggleAction *action, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->pageModeScrollActivated (gtk_toggle_action_get_active (action));
+}
+
+void
+main_window_page_mode_text_cb (GtkToggleAction *action, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->pageModeTextActivated (gtk_toggle_action_get_active (action));
+}

trunk/src/gtk/MainView.h

@@ -36 +36 @@
             void activeZoomFit (gboolean active);
             void activeZoomWidth (gboolean active);
+            void activePageModeScroll (gboolean active);
+            void activePageModeText (gboolean active);
             gchar *openFileDialog (const gchar *lastFolder);
             gchar *promptPasswordDialog (void);
@@ -69 +71 @@
             void setZoomText (const gchar *text);
             const gchar *getGoToPageText (void);
+            void copyTextToClibboard(const gchar* text);
             IFindView *getFindView (void);
             IPageView *getPageView (void);

trunk/src/gtk/PageView.cxx

@@ -185 +185 @@
         switch (cursorType)
         {
+            case PAGE_VIEW_CURSOR_SELECT_TEXT:
+                cursor = gdk_cursor_new (GDK_XTERM);
+                break;
             case PAGE_VIEW_CURSOR_LINK:
                 cursor = gdk_cursor_new (GDK_HAND2);