X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.C;h=e554ac6311098839dcff14ca605c8e4445001370;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=e3063113dcd9e5cbd549aef6429bf091ee1fea65;hpb=979a4d8ecf1f80a91399938cfd12bd1ae04682ff;p=lyx.git diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index e3063113dc..e554ac6311 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -6,6 +6,7 @@ * \author Jürgen Vigna * \author Lars Gullik Bjønnes * \author Alfredo Braunstein + * \author Michael Gerz * * Full author contact details are available in file CREDITS. */ @@ -17,31 +18,42 @@ #include "buffer.h" #include "buffer_funcs.h" #include "bufferparams.h" -#include "BufferView.h" #include "cursor.h" +#include "debug.h" #include "errorlist.h" +#include "funcrequest.h" #include "gettext.h" -#include "iterators.h" +#include "insetiterator.h" +#include "language.h" +#include "lfuns.h" +#include "lyxfunc.h" +#include "lyxrc.h" #include "lyxtext.h" #include "lyxtextclasslist.h" #include "paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" -#include "ParagraphList_fwd.h" +#include "pariterator.h" #include "undo.h" +#include "insets/insetcharstyle.h" #include "insets/insettabular.h" +#include "mathed/MathData.h" +#include "mathed/InsetMath.h" +#include "mathed/MathSupport.h" + #include "support/lstrings.h" -#include +#include "frontends/Clipboard.h" +#include "frontends/Selection.h" -using lyx::pos_type; -using lyx::par_type; -using lyx::textclass_type; +#include +#include -using lyx::support::bformat; +#include +using std::endl; using std::for_each; using std::make_pair; using std::pair; @@ -49,223 +61,112 @@ using std::vector; using std::string; -namespace { - -typedef std::pair PitPosPair; - -typedef limited_stack > CutStack; - -CutStack cuts(10); - -struct resetOwnerAndChanges : public std::unary_function { - void operator()(Paragraph & p) const { - p.cleanChanges(); - p.setInsetOwner(0); - } -}; - -} // namespace anon - - namespace lyx { -namespace cap { - - -int SwitchLayoutsBetweenClasses(textclass_type c1, textclass_type c2, - ParagraphList & pars, ErrorList & errorlist) -{ - BOOST_ASSERT(!pars.empty()); - int ret = 0; - if (c1 == c2) - return ret; - LyXTextClass const & tclass1 = textclasslist[c1]; - LyXTextClass const & tclass2 = textclasslist[c2]; - ParIterator end = ParIterator(pars.size(), pars); - for (ParIterator it = ParIterator(0, pars); it != end; ++it) { - string const name = it->layout()->name(); - bool hasLayout = tclass2.hasLayout(name); - - if (hasLayout) - it->layout(tclass2[name]); - else - it->layout(tclass2.defaultLayout()); - - if (!hasLayout && name != tclass1.defaultLayoutName()) { - ++ret; - string const s = bformat( - _("Layout had to be changed from\n%1$s to %2$s\n" - "because of class conversion from\n%3$s to %4$s"), - name, it->layout()->name(), tclass1.name(), tclass2.name()); - // To warn the user that something had to be done. - errorlist.push_back(ErrorItem("Changed Layout", s, - it->id(), 0, - it->size())); - } - } - return ret; -} +using support::bformat; +using frontend::Clipboard; +namespace { -std::vector const availableSelections(Buffer const & buffer) -{ - vector selList; +typedef std::pair PitPosPair; - CutStack::const_iterator cit = cuts.begin(); - CutStack::const_iterator end = cuts.end(); - for (; cit != end; ++cit) { - // we do not use cit-> here because gcc 2.9x does not - // like it (JMarc) - ParagraphList const & pars = (*cit).first; - string asciiSel; - ParagraphList::const_iterator pit = pars.begin(); - ParagraphList::const_iterator pend = pars.end(); - for (; pit != pend; ++pit) { - asciiSel += pit->asString(buffer, false); - if (asciiSel.size() > 25) { - asciiSel.replace(22, string::npos, "..."); - break; - } - } +typedef limited_stack > CutStack; - selList.push_back(asciiSel); - } +CutStack theCuts(10); +// persistent selection, cleared until the next selection +CutStack selectionBuffer(1); - return selList; -} +// store whether the tabular stack is newer than the normal copy stack +// FIXME: this is a workaround for bug 1919. Should be removed for 1.5, +// when we (hopefully) have a one-for-all paste mechanism. +bool dirty_tabular_stack_ = false; -PitPosPair eraseSelection(BufferParams const & params, ParagraphList & pars, - par_type startpit, par_type endpit, - int startpos, int endpos, bool doclear) +void region(CursorSlice const & i1, CursorSlice const & i2, + InsetBase::row_type & r1, InsetBase::row_type & r2, + InsetBase::col_type & c1, InsetBase::col_type & c2) { - if (startpit == par_type(pars.size()) || - (startpos > pars[startpit].size())) - return PitPosPair(endpit, endpos); - - if (endpit == par_type(pars.size()) || - startpit == endpit) { - endpos -= pars[startpit].erase(startpos, endpos); - return PitPosPair(endpit, endpos); - } - - // clear end/begin fragments of the first/last par in selection - bool all_erased = true; - - pars[startpit].erase(startpos, pars[startpit].size()); - if (pars[startpit].size() != startpos) - all_erased = false; - - endpos -= pars[endpit].erase(0, endpos); - if (endpos != 0) - all_erased = false; - - // Loop through the deleted pars if any, erasing as needed - for (par_type pit = startpit + 1; pit != endpit;) { - // "erase" the contents of the par - pars[pit].erase(0, pars[pit].size()); - if (!pars[pit].size()) { - // remove the par if it's now empty - pars.erase(pars.begin() + pit); - --endpit; - } else { - ++pit; - all_erased = false; - } - } - -#if 0 // FIXME: why for cut but not copy ? - // the cut selection should begin with standard layout - if (realcut) { - buf->params().clear(); - buf->bibkey = 0; - buf->layout(textclasslist[buffer->params.textclass].defaultLayoutName()); - } -#endif - - if (startpit + 1 == par_type(pars.size())) - return PitPosPair(endpit, endpos); - - if (doclear) { - pars[startpit + 1].stripLeadingSpaces(); - } - - // paste the paragraphs again, if possible - if (all_erased && - (pars[startpit].hasSameLayout(pars[startpit + 1]) || - pars[startpit + 1].empty())) { - mergeParagraph(params, pars, startpit); - // this because endpar gets deleted here! - endpit = startpit; - endpos = startpos; - } - - return PitPosPair(endpit, endpos); - + InsetBase & p = i1.inset(); + c1 = p.col(i1.idx()); + c2 = p.col(i2.idx()); + if (c1 > c2) + std::swap(c1, c2); + r1 = p.row(i1.idx()); + r2 = p.row(i2.idx()); + if (r1 > r2) + std::swap(r1, r2); } -bool copySelection(ParagraphList & pars, - par_type startpit, par_type endpit, - int start, int end, textclass_type tc) +bool checkPastePossible(int index) { - BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); - BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); - BOOST_ASSERT(startpit != endpit || start <= end); - - // Clone the paragraphs within the selection. - ParagraphList paragraphs(pars.begin() + startpit, pars.begin() + endpit + 1); - for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges()); - - // Cut out the end of the last paragraph. - Paragraph & back = paragraphs.back(); - back.erase(end, back.size()); - - // Cut out the begin of the first paragraph - Paragraph & front = paragraphs.front(); - front.erase(0, start); - - cuts.push(make_pair(paragraphs, tc)); - - return true; + return size_t(index) < theCuts.size() && !theCuts[index].first.empty(); } -PitPosPair cutSelection(BufferParams const & params, ParagraphList & pars, - par_type startpit, par_type endpit, - int startpos, int endpos, textclass_type tc, bool doclear) +pair +pasteSelectionHelper(LCursor & cur, ParagraphList const & parlist, + textclass_type textclass, ErrorList & errorlist) { - copySelection(pars, startpit, endpit, startpos, endpos, tc); - return eraseSelection(params, pars, startpit, endpit, startpos, - endpos, doclear); -} + Buffer const & buffer = cur.buffer(); + pit_type pit = cur.pit(); + pos_type pos = cur.pos(); + ParagraphList & pars = cur.text()->paragraphs(); - -pair -pasteSelection(Buffer const & buffer, ParagraphList & pars, - par_type pit, int pos, - textclass_type tc, size_t cut_index, ErrorList & errorlist) -{ - if (!checkPastePossible()) + if (parlist.empty()) return make_pair(PitPosPair(pit, pos), pit); BOOST_ASSERT (pos <= pars[pit].size()); // Make a copy of the CaP paragraphs. - ParagraphList insertion = cuts[cut_index].first; - textclass_type const textclass = cuts[cut_index].second; + ParagraphList insertion = parlist; + textclass_type const tc = buffer.params().textclass; // Now remove all out of the pars which is NOT allowed in the // new environment and set also another font if that is required. + // Convert newline to paragraph break in ERT inset. + // This should not be here! + if (pars[pit].inInset() && + pars[pit].inInset()->lyxCode() == InsetBase::ERT_CODE) { + for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) { + for (pos_type j = 0; j < insertion[i].size(); ++j) { + if (insertion[i].isNewline(j)) { + // do not track deletion of newline + insertion[i].eraseChar(j, false); + breakParagraphConservative( + buffer.params(), + insertion, i, j); + } + } + } + } + + // If we are in an inset which returns forceDefaultParagraphs, + // set the paragraphs to default + if (cur.inset().forceDefaultParagraphs(cur.idx())) { + LyXLayout_ptr const layout = + buffer.params().getLyXTextClass().defaultLayout(); + ParagraphList::iterator const end = insertion.end(); + for (ParagraphList::iterator par = insertion.begin(); + par != end; ++par) + par->layout(layout); + } + // Make sure there is no class difference. - SwitchLayoutsBetweenClasses(textclass, tc, insertion, - errorlist); + InsetText in; + // This works without copying any paragraph data because we have + // a specialized swap method for ParagraphList. This is important + // since we store pointers to insets at some places and we don't + // want to invalidate them. + insertion.swap(in.paragraphs()); + cap::switchBetweenClasses(textclass, tc, in, errorlist); + insertion.swap(in.paragraphs()); ParagraphList::iterator tmpbuf = insertion.begin(); int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth(); - Paragraph::depth_type max_depth = pars[pit].getMaxDepthAfter(); + depth_type max_depth = pars[pit].getMaxDepthAfter(); for (; tmpbuf != insertion.end(); ++tmpbuf) { // If we have a negative jump so that the depth would @@ -289,30 +190,39 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, // Set the inset owner of this paragraph. tmpbuf->setInsetOwner(pars[pit].inInset()); for (pos_type i = 0; i < tmpbuf->size(); ++i) { - if (tmpbuf->getChar(i) == Paragraph::META_INSET) { - if (!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode())) - tmpbuf->erase(i--); - } + if (tmpbuf->getChar(i) == Paragraph::META_INSET && + !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode())) + // do not track deletion of invalid insets + tmpbuf->eraseChar(i--, false); } + + tmpbuf->setChange(Change(buffer.params().trackChanges ? + Change::INSERTED : Change::UNCHANGED)); } - // Make the buf exactly the same layout as the cursor paragraph. - insertion.begin()->makeSameLayout(pars[pit]); + bool const empty = pars[pit].empty(); + if (!empty) { + // Make the buf exactly the same layout as the cursor + // paragraph. + insertion.begin()->makeSameLayout(pars[pit]); + } // Prepare the paragraphs and insets for insertion. // A couple of insets store buffer references so need updating. - ParIterator fpit(0, insertion); - ParIterator fend(insertion.size(), insertion); + insertion.swap(in.paragraphs()); + + ParIterator fpit = par_iterator_begin(in); + ParIterator fend = par_iterator_end(in); for (; fpit != fend; ++fpit) { - InsetList::iterator lit = fpit->insetlist.begin(); - InsetList::iterator eit = fpit->insetlist.end(); + InsetList::const_iterator lit = fpit->insetlist.begin(); + InsetList::const_iterator eit = fpit->insetlist.end(); for (; lit != eit; ++lit) { switch (lit->inset->lyxCode()) { - case InsetOld::TABULAR_CODE: { + case InsetBase::TABULAR_CODE: { InsetTabular * it = static_cast(lit->inset); - it->buffer(const_cast(&buffer)); + it->buffer(&buffer); break; } @@ -321,26 +231,39 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, } } } + insertion.swap(in.paragraphs()); // Split the paragraph for inserting the buf if necessary. - bool did_split = false; - if (pars[pit].size() || pit + 1 == par_type(pars.size())) { + if (!empty) breakParagraphConservative(buffer.params(), pars, pit, pos); - did_split = true; - } // Paste it! - pars.insert(pars.begin() + pit + 1, insertion.begin(), insertion.end()); - mergeParagraph(buffer.params(), pars, pit); + if (empty) { + pars.insert(boost::next(pars.begin(), pit), + insertion.begin(), + insertion.end()); + + // merge the empty par with the last par of the insertion + mergeParagraph(buffer.params(), pars, + pit + insertion.size() - 1); + } else { + pars.insert(boost::next(pars.begin(), pit + 1), + insertion.begin(), + insertion.end()); + + // merge the first par of the insertion with the current par + mergeParagraph(buffer.params(), pars, pit); + } + + pit_type last_paste = pit + insertion.size() - 1; - par_type last_paste = pit + insertion.size() - 1; - // Store the new cursor position. pit = last_paste; pos = pars[last_paste].size(); - // Maybe some pasting. - if (did_split && last_paste + 1 != par_type(pars.size())) { + // Join (conditionally) last pasted paragraph with next one, i.e., + // the tail of the spliced document paragraph + if (!empty && last_paste + 1 != pit_type(pars.size())) { if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) { mergeParagraph(buffer.params(), pars, last_paste); } else if (pars[last_paste + 1].empty()) { @@ -350,7 +273,7 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, pars[last_paste].makeSameLayout(pars[last_paste + 1]); mergeParagraph(buffer.params(), pars, last_paste); } else { - pars[last_paste + 1].stripLeadingSpaces(); + pars[last_paste + 1].stripLeadingSpaces(buffer.params().trackChanges); ++last_paste; } } @@ -359,40 +282,234 @@ pasteSelection(Buffer const & buffer, ParagraphList & pars, } -pair -pasteSelection(Buffer const & buffer, ParagraphList & pars, - par_type pit, int pos, textclass_type tc, ErrorList & errorlist) +PitPosPair eraseSelectionHelper(BufferParams const & params, + ParagraphList & pars, + pit_type startpit, pit_type endpit, + int startpos, int endpos, bool doclear) +{ + // Start of selection is really invalid. + if (startpit == pit_type(pars.size()) || + (startpos > pars[startpit].size())) + return PitPosPair(endpit, endpos); + + // Start and end is inside same paragraph + if (endpit == pit_type(pars.size()) || startpit == endpit) { + endpos -= pars[startpit].eraseChars(startpos, endpos, params.trackChanges); + return PitPosPair(endpit, endpos); + } + + for (pit_type pit = startpit; pit != endpit + 1;) { + pos_type const left = (pit == startpit ? startpos : 0); + pos_type const right = (pit == endpit ? endpos : pars[pit].size() + 1); + + bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges); + + // Logically erase only, including the end-of-paragraph character + pars[pit].eraseChars(left, right, params.trackChanges); + + // Separate handling of paragraph break: + if (merge && pit != endpit && + (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) { + pos_type const thissize = pars[pit].size(); + if (doclear) + pars[pit + 1].stripLeadingSpaces(params.trackChanges); + mergeParagraph(params, pars, pit); + --endpit; + if (pit == endpit) + endpos += thissize; + } else + ++pit; + } + + // Ensure legal cursor pos: + endpit = startpit; + endpos = startpos; + return PitPosPair(endpit, endpos); +} + + +void putClipboard(ParagraphList const & paragraphs, textclass_type textclass, + docstring const & plaintext) { - return pasteSelection(buffer, pars, pit, pos, tc, 0, errorlist); + // For some strange reason gcc 3.2 and 3.3 do not accept + // Buffer buffer(string(), false); + Buffer buffer("", false); + buffer.setUnnamed(true); + buffer.paragraphs() = paragraphs; + buffer.params().textclass = textclass; + std::ostringstream lyx; + if (buffer.write(lyx)) + theClipboard().put(lyx.str(), plaintext); + else + theClipboard().put(string(), plaintext); } -int nrOfParagraphs() +void copySelectionHelper(Buffer const & buf, ParagraphList & pars, + pit_type startpit, pit_type endpit, + int start, int end, textclass_type tc, CutStack & cutstack) { - return cuts.empty() ? 0 : cuts[0].first.size(); + BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); + BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); + BOOST_ASSERT(startpit != endpit || start <= end); + + // Clone the paragraphs within the selection. + ParagraphList copy_pars(boost::next(pars.begin(), startpit), + boost::next(pars.begin(), endpit + 1)); + + // Remove the end of the last paragraph; afterwards, remove the beginning + // of the first paragraph. Keep this order - there may only be one paragraph! + // Do not track deletions here; this is an internal action not visible to the user + Paragraph & back = copy_pars.back(); + back.eraseChars(end, back.size(), false); + Paragraph & front = copy_pars.front(); + front.eraseChars(0, start, false); + + ParagraphList::iterator it = copy_pars.begin(); + ParagraphList::iterator it_end = copy_pars.end(); + + for (; it != it_end; it++) { + // ERT paragraphs have the Language latex_language. + // This is invalid outside of ERT, so we need to change it + // to the buffer language. + if (it->ownerCode() == InsetBase::ERT_CODE) { + it->changeLanguage(buf.params(), latex_language, + buf.getLanguage()); + } + it->setInsetOwner(0); + } + + // do not copy text (also nested in insets) which is marked as deleted + // acceptChanges() is defined for LyXText rather than ParagraphList + // Thus we must wrap copy_pars into a LyXText object and cross our fingers + LyXText lt; + copy_pars.swap(lt.paragraphs()); + lt.acceptChanges(buf.params()); + copy_pars.swap(lt.paragraphs()); + + cutstack.push(make_pair(copy_pars, tc)); } +} // namespace anon + + + -bool checkPastePossible() +namespace cap { + +docstring grabAndEraseSelection(LCursor & cur) { - return !cuts.empty() && !cuts[0].first.empty(); + if (!cur.selection()) + return docstring(); + docstring res = grabSelection(cur); + eraseSelection(cur); + return res; } -void cutSelection(LCursor & cur, bool doclear, bool realcut) +void switchBetweenClasses(textclass_type c1, textclass_type c2, + InsetText & in, ErrorList & errorlist) +{ + BOOST_ASSERT(!in.paragraphs().empty()); + if (c1 == c2) + return; + + LyXTextClass const & tclass1 = textclasslist[c1]; + LyXTextClass const & tclass2 = textclasslist[c2]; + + // layouts + ParIterator end = par_iterator_end(in); + for (ParIterator it = par_iterator_begin(in); it != end; ++it) { + string const name = it->layout()->name(); + bool hasLayout = tclass2.hasLayout(name); + + if (hasLayout) + it->layout(tclass2[name]); + else + it->layout(tclass2.defaultLayout()); + + if (!hasLayout && name != tclass1.defaultLayoutName()) { + docstring const s = bformat( + _("Layout had to be changed from\n%1$s to %2$s\n" + "because of class conversion from\n%3$s to %4$s"), + from_utf8(name), from_utf8(it->layout()->name()), + from_utf8(tclass1.name()), from_utf8(tclass2.name())); + // To warn the user that something had to be done. + errorlist.push_back(ErrorItem(_("Changed Layout"), s, + it->id(), 0, + it->size())); + } + } + + // character styles + InsetIterator const i_end = inset_iterator_end(in); + for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { + if (it->lyxCode() == InsetBase::CHARSTYLE_CODE) { + InsetCharStyle & inset = + static_cast(*it); + string const name = inset.params().type; + CharStyles::iterator const found_cs = + tclass2.charstyle(name); + if (found_cs == tclass2.charstyles().end()) { + // The character style is undefined in tclass2 + inset.setUndefined(); + docstring const s = bformat(_( + "Character style %1$s is " + "undefined because of class " + "conversion from\n%2$s to %3$s"), + from_utf8(name), from_utf8(tclass1.name()), + from_utf8(tclass2.name())); + // To warn the user that something had to be done. + errorlist.push_back(ErrorItem( + _("Undefined character style"), + s, it.paragraph().id(), it.pos(), it.pos() + 1)); + } else if (inset.undefined()) { + // The character style is undefined in + // tclass1 and is defined in tclass2 + inset.setDefined(found_cs); + } + } + } +} + + +std::vector const availableSelections(Buffer const & buffer) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); - // Stuff what we got on the clipboard. Even if there is no selection. - - // There is a problem with having the stuffing here in that the - // larger the selection the slower LyX will get. This can be - // 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)); + vector selList; + CutStack::const_iterator cit = theCuts.begin(); + CutStack::const_iterator end = theCuts.end(); + for (; cit != end; ++cit) { + // we do not use cit-> here because gcc 2.9x does not + // like it (JMarc) + ParagraphList const & pars = (*cit).first; + docstring asciiSel; + ParagraphList::const_iterator pit = pars.begin(); + ParagraphList::const_iterator pend = pars.end(); + for (; pit != pend; ++pit) { + asciiSel += pit->asString(buffer, false); + if (asciiSel.size() > 25) { + asciiSel.replace(22, docstring::npos, + from_ascii("...")); + break; + } + } + + selList.push_back(asciiSel); + } + + return selList; +} + + +size_type numberOfSelections() +{ + return theCuts.size(); +} + + +void cutSelection(LCursor & cur, bool doclear, bool realcut) +{ // This doesn't make sense, if there is no selection if (!cur.selection()) return; @@ -400,138 +517,298 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut) // OK, we have a selection. This is always between cur.selBegin() // and cur.selEnd() - // make sure that the depth behind the selection are restored, too - recordUndoSelection(cur); - par_type begpit = cur.selBegin().par(); - par_type endpit = cur.selEnd().par(); - - int endpos = cur.selEnd().pos(); - - BufferParams const & bufparams = cur.bv().buffer()->params(); - boost::tie(endpit, endpos) = realcut ? - cutSelection(bufparams, - text->paragraphs(), - begpit, endpit, - cur.selBegin().pos(), endpos, - bufparams.textclass, - doclear) - : eraseSelection(bufparams, - text->paragraphs(), - begpit, endpit, - cur.selBegin().pos(), endpos, - doclear); - // sometimes necessary - if (doclear) - text->paragraphs()[begpit].stripLeadingSpaces(); - - text->redoParagraphs(begpit, begpit + 1); - // cutSelection can invalidate the cursor so we need to set - // it anew. (Lgb) - // we prefer the end for when tracking changes - cur.pos() = endpos; - cur.par() = endpit; - - // need a valid cursor. (Lgb) - cur.clearSelection(); - text->updateCounters(); + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + + // make sure that the depth behind the selection are restored, too + recordUndoSelection(cur); + pit_type begpit = cur.selBegin().pit(); + pit_type endpit = cur.selEnd().pit(); + + int endpos = cur.selEnd().pos(); + + BufferParams const & bp = cur.buffer().params(); + if (realcut) { + copySelectionHelper(cur.buffer(), + text->paragraphs(), + begpit, endpit, + cur.selBegin().pos(), endpos, + bp.textclass, theCuts); + // Stuff what we got on the clipboard. + // Even if there is no selection. + putClipboard(theCuts[0].first, theCuts[0].second, + cur.selectionAsString(true)); + } + + boost::tie(endpit, endpos) = + eraseSelectionHelper(bp, + text->paragraphs(), + begpit, endpit, + cur.selBegin().pos(), endpos, + doclear); + + // cutSelection can invalidate the cursor so we need to set + // it anew. (Lgb) + // we prefer the end for when tracking changes + cur.pos() = endpos; + cur.pit() = endpit; + + // sometimes necessary + if (doclear + && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges)) + cur.fixIfBroken(); + + // need a valid cursor. (Lgb) + cur.clearSelection(); + updateLabels(cur.buffer()); + theSelection().haveSelection(false); + + // tell tabular that a recent copy happened + dirtyTabularStack(false); + } + + if (cur.inMathed()) { + if (cur.selBegin().idx() != cur.selEnd().idx()) { + // The current selection spans more than one cell. + // Record all cells + recordUndoInset(cur); + } else { + // Record only the current cell to avoid a jumping + // cursor after undo + recordUndo(cur); + } + if (realcut) + copySelection(cur); + eraseSelection(cur); + } } void copySelection(LCursor & cur) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); - // stuff the selection onto the X clipboard, from an explicit copy request - cur.bv().stuffClipboard(cur.selectionAsString(true)); + copySelection(cur, cur.selectionAsString(true)); +} + +namespace { + +void copySelectionToStack(LCursor & cur, CutStack & cutstack) +{ // this doesn't make sense, if there is no selection if (!cur.selection()) return; - // ok we have a selection. This is always between cur.selBegin() - // and sel_end cursor + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + // ok we have a selection. This is always between cur.selBegin() + // and sel_end cursor + + // copy behind a space if there is one + ParagraphList & pars = text->paragraphs(); + pos_type pos = cur.selBegin().pos(); + pit_type par = cur.selBegin().pit(); + while (pos < pars[par].size() && + pars[par].isLineSeparator(pos) && + (par != cur.selEnd().pit() || pos < cur.selEnd().pos())) + ++pos; + + copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(), + pos, cur.selEnd().pos(), cur.buffer().params().textclass, cutstack); + } + + if (cur.inMathed()) { + //lyxerr << "copySelection in mathed" << endl; + ParagraphList pars; + Paragraph par; + BufferParams const & bp = cur.buffer().params(); + par.layout(bp.getLyXTextClass().defaultLayout()); + par.insert(0, grabSelection(cur), LyXFont(), Change(Change::UNCHANGED)); + pars.push_back(par); + cutstack.push(make_pair(pars, bp.textclass)); + } +} + +} + - // copy behind a space if there is one - ParagraphList & pars = text->paragraphs(); - pos_type pos = cur.selBegin().pos(); - par_type par = cur.selBegin().par(); - while (pos < pars[par].size() - && pars[par].isLineSeparator(pos) - && (par != cur.selEnd().par() || pos < cur.selEnd().pos())) - ++pos; +void copySelectionToStack() +{ + if (!selectionBuffer.empty()) + theCuts.push(selectionBuffer[0]); +} - copySelection(pars, par, cur.selEnd().par(), - pos, cur.selEnd().pos(), cur.bv().buffer()->params().textclass); + +void copySelection(LCursor & cur, docstring const & plaintext) +{ + // In tablemode, because copy and paste actually use special table stack + // we do not attemp to get selected paragraphs under cursor. Instead, a + // paragraph with the plain text version is generated so that table cells + // can be pasted as pure text somewhere else. + if (cur.selBegin().idx() != cur.selEnd().idx()) { + ParagraphList pars; + Paragraph par; + BufferParams const & bp = cur.buffer().params(); + par.layout(bp.getLyXTextClass().defaultLayout()); + par.insert(0, plaintext, LyXFont(), Change(Change::UNCHANGED)); + pars.push_back(par); + theCuts.push(make_pair(pars, bp.textclass)); + } else + copySelectionToStack(cur, theCuts); + + // stuff the selection onto the X clipboard, from an explicit copy request + putClipboard(theCuts[0].first, theCuts[0].second, plaintext); } -void pasteSelection(LCursor & cur, size_t sel_index) +void saveSelection(LCursor & cur) +{ + if (lyxerr.debugging(Debug::ACTION)) + lyxerr << BOOST_CURRENT_FUNCTION << ": `" + << to_utf8(cur.selectionAsString(true)) << "'." + << endl; + + if (cur.selection()) + copySelectionToStack(cur, selectionBuffer); + // tell X whether we now have a valid selection + theSelection().haveSelection(cur.selection()); +} + + +bool selection() +{ + return !selectionBuffer.empty(); +} + + +void clearSelection() +{ + selectionBuffer.clear(); +} + + +docstring getSelection(Buffer const & buf, size_t sel_index) +{ + return sel_index < theCuts.size() + ? theCuts[sel_index].first.back().asString(buf, false) + : docstring(); +} + + +void pasteParagraphList(LCursor & cur, ParagraphList const & parlist, + textclass_type textclass, ErrorList & errorList) +{ + if (cur.inTexted()) { + LyXText * text = cur.text(); + BOOST_ASSERT(text); + + pit_type endpit; + PitPosPair ppp; + + boost::tie(ppp, endpit) = + pasteSelectionHelper(cur, parlist, + textclass, errorList); + updateLabels(cur.buffer()); + cur.clearSelection(); + text->setCursor(cur.top(), ppp.first, ppp.second); + } + + // mathed is handled in InsetMathNest/InsetMathGrid + BOOST_ASSERT(!cur.inMathed()); +} + + +void pasteFromStack(LCursor & cur, ErrorList & errorList, size_t sel_index) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); // this does not make sense, if there is nothing to paste - if (!checkPastePossible()) + if (!checkPastePossible(sel_index)) return; recordUndo(cur); + pasteParagraphList(cur, theCuts[sel_index].first, + theCuts[sel_index].second, errorList); + cur.setSelection(); + saveSelection(cur); +} - par_type endpit; - PitPosPair ppp; - - ErrorList el; - boost::tie(ppp, endpit) = - pasteSelection(*cur.bv().buffer(), - text->paragraphs(), - cur.par(), cur.pos(), - cur.bv().buffer()->params().textclass, - sel_index, el); - bufferErrors(*cur.bv().buffer(), el); - text->bv()->showErrorList(_("Paste")); +void pasteClipboard(LCursor & cur, ErrorList & errorList, bool asParagraphs) +{ + // Use internal clipboard if it is the most recent one + if (theClipboard().isInternal()) { + pasteFromStack(cur, errorList, 0); + return; + } - text->redoParagraphs(cur.par(), endpit); + // First try LyX format + if (theClipboard().hasLyXContents()) { + string lyx = theClipboard().getAsLyX(); + if (!lyx.empty()) { + // For some strange reason gcc 3.2 and 3.3 do not accept + // Buffer buffer(string(), false); + Buffer buffer("", false); + buffer.setUnnamed(true); + if (buffer.readString(lyx)) { + recordUndo(cur); + pasteParagraphList(cur, buffer.paragraphs(), + buffer.params().textclass, errorList); + cur.setSelection(); + return; + } + } + } - cur.clearSelection(); - cur.resetAnchor(); - text->setCursor(cur, ppp.first, ppp.second); - cur.setSelection(); - text->updateCounters(); + // Then try plain text + docstring const text = theClipboard().getAsText(); + if (text.empty()) + return; + recordUndo(cur); + if (asParagraphs) + cur.text()->insertStringAsParagraphs(cur, text); + else + cur.text()->insertStringAsLines(cur, text); } -void setSelectionRange(LCursor & cur, pos_type length) +void pasteSelection(LCursor & cur, ErrorList & errorList) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); - if (!length) + if (selectionBuffer.empty()) return; - cur.resetAnchor(); - while (length--) - text->cursorRight(cur); + recordUndo(cur); + pasteParagraphList(cur, selectionBuffer[0].first, + selectionBuffer[0].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, docstring 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(); - LyXFont const font = text->getPar(cur.selBegin().par()). - getFontSettings(cur.bv().buffer()->params(), cur.selBegin().pos()); + LyXFont const font = + selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos()); // Insert the new string - string::const_iterator cit = str.begin(); - string::const_iterator end = str.end(); + pos_type pos = cur.selEnd().pos(); + Paragraph & par = cur.selEnd().paragraph(); + docstring::const_iterator cit = str.begin(); + docstring::const_iterator end = str.end(); for (; cit != end; ++cit, ++pos) - text->getPar(cur.selEnd().par()).insertChar(pos, (*cit), font); + par.insertChar(pos, *cit, font, cur.buffer().params().trackChanges); // Cut the selection cutSelection(cur, true, false); + + // select the replacement + if (backwards) { + selbeg.pos() += str.length(); + cur.setSelection(selbeg, -int(str.length())); + } else + cur.setSelection(selbeg, str.length()); + saveSelection(cur); } @@ -542,20 +819,119 @@ void replaceSelection(LCursor & cur) } -// only used by the spellchecker -void replaceWord(LCursor & cur, string const & replacestring) +void eraseSelection(LCursor & cur) { - LyXText * text = cur.text(); - BOOST_ASSERT(text); + //lyxerr << "cap::eraseSelection begin: " << cur << endl; + CursorSlice const & i1 = cur.selBegin(); + CursorSlice const & i2 = cur.selEnd(); + if (i1.inset().asInsetMath()) { + cur.top() = i1; + if (i1.idx() == i2.idx()) { + i1.cell().erase(i1.pos(), i2.pos()); + // We may have deleted i1.cell(cur.pos()). + // Make sure that pos is valid. + if (cur.pos() > cur.lastpos()) + cur.pos() = cur.lastpos(); + } else { + InsetMath * p = i1.asInsetMath(); + InsetBase::row_type r1, r2; + InsetBase::col_type c1, c2; + region(i1, i2, r1, r2, c1, c2); + for (InsetBase::row_type row = r1; row <= r2; ++row) + for (InsetBase::col_type col = c1; col <= c2; ++col) + p->cell(p->index(row, col)).clear(); + // We've deleted the whole cell. Only pos 0 is valid. + cur.pos() = 0; + } + // need a valid cursor. (Lgb) + cur.clearSelection(); + theSelection().haveSelection(false); + } else { + lyxerr << "can't erase this selection 1" << endl; + } + //lyxerr << "cap::eraseSelection end: " << cur << endl; +} - 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 selDel(LCursor & cur) +{ + //lyxerr << "cap::selDel" << endl; + if (cur.selection()) + eraseSelection(cur); +} + + +void selClearOrDel(LCursor & cur) +{ + //lyxerr << "cap::selClearOrDel" << endl; + if (lyxrc.auto_region_delete) + selDel(cur); + else + cur.selection() = false; +} + + +docstring grabSelection(LCursor const & cur) +{ + if (!cur.selection()) + return docstring(); + + // FIXME: What is wrong with the following? +#if 0 + std::ostringstream os; + for (DocIterator dit = cur.selectionBegin(); + dit != cur.selectionEnd(); dit.forwardPos()) + os << asString(dit.cell()); + return os.str(); +#endif + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + + if (i1.idx() == i2.idx()) { + if (i1.inset().asInsetMath()) { + MathArray::const_iterator it = i1.cell().begin(); + return asString(MathArray(it + i1.pos(), it + i2.pos())); + } else { + return from_ascii("unknown selection 1"); + } + } + + InsetBase::row_type r1, r2; + InsetBase::col_type c1, c2; + region(i1, i2, r1, r2, c1, c2); + + docstring data; + if (i1.inset().asInsetMath()) { + for (InsetBase::row_type row = r1; row <= r2; ++row) { + if (row > r1) + data += "\\\\"; + for (InsetBase::col_type col = c1; col <= c2; ++col) { + if (col > c1) + data += '&'; + data += asString(i1.asInsetMath()-> + cell(i1.asInsetMath()->index(row, col))); + } + } + } else { + data = from_ascii("unknown selection 2"); + } + return data; +} + + +void dirtyTabularStack(bool b) +{ + dirty_tabular_stack_ = b; +} + + +bool tabularStackDirty() +{ + return dirty_tabular_stack_; } } // namespace cap + } // namespace lyx