Changeset 277 for trunk/src/PagePter.cxx

Timestamp:

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

Author:

jordi

Message:

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

Files:

• trunk/src/PagePter.cxx (modified) (8 diffs)

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);
         }