minimal effort implementation of:

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 7f7a0e0080e5cf9e6d17d1e9ac9af70da5317f9b..8dc3e7be8a20fb2b9d4bd257f67ebd4aeed4d2d8 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -45,6 +45,10 @@
 
 #include "support/lstrings.h"
 
+#include "frontends/Gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+
 #include <boost/tuple/tuple.hpp>
 
 using lyx::pos_type;
@@ -53,6 +57,9 @@ using lyx::textclass_type;
 
 using lyx::support::bformat;
 
+using lyx::frontend::Gui;
+using lyx::frontend::Clipboard;
+
 using std::endl;
 using std::for_each;
 using std::make_pair;
@@ -491,8 +498,9 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
                // solved by running the line below only when the selection has
                // finished. The solution used currently just works, to make it
                // faster we need to be more clever and probably also have more
-               // calls to stuffClipboard. (Lgb)
-//             cur.bv().stuffClipboard(cur.selectionAsString(true));
+               // calls to cur.bv().owner()->gui().selection().put. (Lgb)
+//             cur.bv().owner()->gui().selection().put(cur.selectionAsString(true));
+       
 
                // make sure that the depth behind the selection are restored, too
                recordUndoSelection(cur);
@@ -555,7 +563,7 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
 void copySelection(LCursor & cur)
 {
        // stuff the selection onto the X clipboard, from an explicit copy request
-       cur.bv().stuffClipboard(cur.selectionAsString(true));
+       cur.bv().owner()->gui().clipboard().put(cur.selectionAsString(true));
 
        // this doesn't make sense, if there is no selection
        if (!cur.selection())
@@ -581,7 +589,7 @@ void copySelection(LCursor & cur)
        }
 
        if (cur.inMathed()) {
-               lyxerr << "copySelection in mathed" << endl;
+               //lyxerr << "copySelection in mathed" << endl;
                ParagraphList pars;
                pars.push_back(Paragraph());
                BufferParams const & bp = cur.buffer().params();
@@ -604,7 +612,7 @@ std::string getSelection(Buffer const & buf, size_t sel_index)
 
 
 void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
-                       textclass_type textclass)
+                       textclass_type textclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
                LyXText * text = cur.text();
@@ -614,15 +622,13 @@ void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
 
                pit_type endpit;
                PitPosPair ppp;
-               ErrorList el;
 
                boost::tie(ppp, endpit) =
                        pasteSelectionHelper(cur.buffer(),
                                             text->paragraphs(),
                                             cur.pit(), cur.pos(),
                                             parlist, textclass,
-                                            el);
-               bufferErrors(cur.buffer(), el);
+                                            errorList);
                updateLabels(cur.buffer());
                cur.clearSelection();
                text->setCursor(cur, ppp.first, ppp.second);
@@ -633,46 +639,31 @@ void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
 }
 
 
-void pasteSelection(LCursor & cur, size_t sel_index)
+void pasteSelection(LCursor & cur, ErrorList & errorList, size_t sel_index)
 {
        // this does not make sense, if there is nothing to paste
        if (!checkPastePossible(sel_index))
                return;
 
        pasteParagraphList(cur, theCuts[sel_index].first,
-                          theCuts[sel_index].second);
-       cur.bv().showErrorList(_("Paste"));
-       cur.setSelection();
-}
-
-
-void setSelectionRange(LCursor & cur, pos_type length)
-{
-       LyXText * text = cur.text();
-       BOOST_ASSERT(text);
-       if (!length)
-               return;
-       cur.resetAnchor();
-       while (length--)
-               text->cursorRight(cur);
+                          theCuts[sel_index].second, errorList);
        cur.setSelection();
 }
 
 
 // simple replacing. The font of the first selected character is used
-void replaceSelectionWithString(LCursor & cur, string const & str)
+void replaceSelectionWithString(LCursor & cur, string const & str, bool backwards)
 {
-       LyXText * text = cur.text();
-       BOOST_ASSERT(text);
        recordUndo(cur);
+       DocIterator selbeg = cur.selectionBegin();
 
        // Get font setting before we cut
-       pos_type pos = cur.selEnd().pos();
-       Paragraph & par = text->getPar(cur.selEnd().pit());
        LyXFont const font =
-               par.getFontSettings(cur.buffer().params(), cur.selBegin().pos());
+               selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
 
        // Insert the new string
+       pos_type pos = cur.selEnd().pos();
+       Paragraph & par = cur.selEnd().paragraph();
        string::const_iterator cit = str.begin();
        string::const_iterator end = str.end();
        for (; cit != end; ++cit, ++pos)
@@ -680,6 +671,13 @@ void replaceSelectionWithString(LCursor & cur, string const & str)
 
        // Cut the selection
        cutSelection(cur, true, false);
+
+       // select the replacement
+       if (backwards) {
+               selbeg.pos() += str.length();
+               cur.setSelection(selbeg, -str.length());
+       } else
+               cur.setSelection(selbeg, str.length());
 }
 
 
@@ -690,21 +688,6 @@ void replaceSelection(LCursor & cur)
 }
 
 
-// only used by the spellchecker
-void replaceWord(LCursor & cur, string const & replacestring)
-{
-       LyXText * text = cur.text();
-       BOOST_ASSERT(text);
-
-       replaceSelectionWithString(cur, replacestring);
-       setSelectionRange(cur, replacestring.length());
-
-       // Go back so that replacement string is also spellchecked
-       for (string::size_type i = 0; i < replacestring.length() + 1; ++i)
-               text->cursorLeft(cur);
-}
-
-
 void eraseSelection(LCursor & cur)
 {
        //lyxerr << "LCursor::eraseSelection begin: " << cur << endl;