#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferParams.h"
+#include "BufferView.h"
#include "Cursor.h"
#include "debug.h"
#include "ErrorList.h"
// If we are in an inset which returns forceDefaultParagraphs,
// set the paragraphs to default
if (cur.inset().forceDefaultParagraphs(cur.idx())) {
- Layout_ptr const layout =
+ Layout_ptr const layout =
buffer.params().getTextClass().defaultLayout();
ParagraphList::iterator const end = insertion.end();
- for (ParagraphList::iterator par = insertion.begin();
+ for (ParagraphList::iterator par = insertion.begin();
par != end; ++par)
par->layout(layout);
}
}
tmpbuf->setChange(Change(buffer.params().trackChanges ?
- Change::INSERTED : Change::UNCHANGED));
+ Change::INSERTED : Change::UNCHANGED));
}
bool const empty = pars[pit].empty();
void putClipboard(ParagraphList const & paragraphs, textclass_type textclass,
- docstring const & plaintext)
+ docstring const & plaintext)
{
// For some strange reason gcc 3.2 and 3.3 do not accept
// Buffer buffer(string(), false);
// to the buffer language.
if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
it->changeLanguage(buf.params(), latex_language,
- buf.getLanguage());
+ buf.getLanguage());
}
it->setInsetOwner(0);
}
// do not copy text (also nested in insets) which is marked as deleted
- // acceptChanges() is defined for Text rather than ParagraphList
- // Thus we must wrap copy_pars into a Text object and cross our fingers
- Text lt;
- copy_pars.swap(lt.paragraphs());
- lt.acceptChanges(buf.params());
- copy_pars.swap(lt.paragraphs());
+ acceptChanges(copy_pars, buf.params());
cutstack.push(make_pair(copy_pars, tc));
}
void switchBetweenClasses(textclass_type c1, textclass_type c2,
InsetText & in, ErrorList & errorlist)
{
+ errorlist.clear();
+
BOOST_ASSERT(!in.paragraphs().empty());
if (c1 == c2)
return;
// layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
- string const name = it->layout()->name();
+ docstring const name = it->layout()->name();
bool hasLayout = tclass2.hasLayout(name);
if (hasLayout)
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()),
+ name, 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,
asciiSel += pit->asString(buffer, false);
if (asciiSel.size() > 25) {
asciiSel.replace(22, docstring::npos,
- from_ascii("..."));
+ from_ascii("..."));
break;
}
}
Text * text = cur.text();
BOOST_ASSERT(text);
+ saveSelection(cur);
+
// make sure that the depth behind the selection are restored, too
recordUndoSelection(cur);
pit_type begpit = cur.selBegin().pit();
cur.pit() = endpit;
// sometimes necessary
- if (doclear
+ 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.selection())
return;
+ // copySelection can not yet handle the case of cross idx selection
+ if (cur.selBegin().idx() != cur.selEnd().idx())
+ return;
+
if (cur.inTexted()) {
Text * text = cur.text();
BOOST_ASSERT(text);
copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
pos, cur.selEnd().pos(), cur.buffer().params().textclass, cutstack);
+ dirtyTabularStack(false);
}
if (cur.inMathed()) {
void copySelection(Cursor & 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
+ // 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()) {
void saveSelection(Cursor & cur)
{
- LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
- << to_utf8(cur.selectionAsString(true)) << "'."
- << endl;
-
- if (cur.selection())
+ // This function is called, not when a selection is formed, but when
+ // a selection is cleared. Therefore, multiple keyboard selection
+ // will not repeatively trigger this function (bug 3877).
+ if (cur.selection()
+ && cur.selBegin() == cur.bv().cursor().selBegin()
+ && cur.selEnd() == cur.bv().cursor().selEnd()) {
+ LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
+ << to_utf8(cur.selectionAsString(true)) << "'."
+ << endl;
copySelectionToStack(cur, selectionBuffer);
- // tell X whether we now have a valid selection
- theSelection().haveSelection(cur.selection());
+ }
}
textclass, errorList);
updateLabels(cur.buffer());
cur.clearSelection();
- text->setCursor(cur.top(), ppp.first, ppp.second);
+ text->setCursor(cur, ppp.first, ppp.second);
}
// mathed is handled in InsetMathNest/InsetMathGrid
pasteParagraphList(cur, theCuts[sel_index].first,
theCuts[sel_index].second, errorList);
cur.setSelection();
- saveSelection(cur);
}
return;
recordUndo(cur);
pasteParagraphList(cur, selectionBuffer[0].first,
- selectionBuffer[0].second, errorList);
- cur.setSelection();
+ selectionBuffer[0].second, errorList);
}
cur.setSelection(selbeg, -int(str.length()));
} else
cur.setSelection(selbeg, str.length());
- saveSelection(cur);
}
CursorSlice const & i1 = cur.selBegin();
CursorSlice const & i2 = cur.selEnd();
if (i1.inset().asInsetMath()) {
+ saveSelection(cur);
cur.top() = i1;
if (i1.idx() == i2.idx()) {
i1.cell().erase(i1.pos(), i2.pos());
}
// need a valid cursor. (Lgb)
cur.clearSelection();
- theSelection().haveSelection(false);
} else {
lyxerr << "can't erase this selection 1" << endl;
}
projects / lyx.git / blobdiff