commit fb264663d8c3aadc3da0b922e31105c0aa7e319d
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Nov 9 15:13:41 2016 +0100
Make insertInset use a temporary cut-and-paste area.
This is a long wanted feature, although it does not go all the way to
fix #6604 (private-cut/private-paste).
Additionally, it fixes a crash that can happen when using undefined
branches. This is done by making the action when pasting unknown
branches configurable.
Fixes bug #6570.
---
src/CutAndPaste.cpp | 62 +++++++++++++++++++++++++++++++++++++++++----------
src/CutAndPaste.h | 15 +++++++++++-
src/Text3.cpp | 6 +++-
3 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index d5aa087..3cceb2b 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -86,6 +86,8 @@ typedef limited_stack<pair<ParagraphList,
DocumentClassConstPtr> > CutStack;
CutStack theCuts(10);
// persistent selection, cleared until the next selection
CutStack selectionBuffer(1);
+// temporary scratch area
+CutStack tempCut(1);
// 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,
@@ -111,7 +113,7 @@ struct PasteReturnValue {
PasteReturnValue
pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
- DocumentClassConstPtr oldDocClass, Buffer * tmpbuffer,
+ DocumentClassConstPtr oldDocClass, cap::BranchAction
branchAction,
ErrorList & errorlist)
{
Buffer const & buffer = *cur.buffer();
@@ -355,12 +357,15 @@ pasteSelectionHelper(DocIterator const & cur,
ParagraphList const & parlist,
|| (is_child && (branchlist.find(name)
||
buffer.masterBuffer()->params().branchlist().find(name))))
break;
- if (tmpbuffer) {
+ switch(branchAction) {
+ case cap::BRANCH_ADD: {
// This is for a temporary buffer, so simply
create the branch.
// Must not use lyx::dispatch(), since
tmpbuffer has no view.
DispatchResult dr;
-
tmpbuffer->dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr);
- } else {
+
const_cast<Buffer&>(buffer).dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr);
+ break;
+ }
+ case cap::BRANCH_ASK: {
docstring text = bformat(
_("The pasted branch \"%1$s\" is
undefined.\n"
"Do you want to add it to the
document's branch list?"),
@@ -369,6 +374,10 @@ pasteSelectionHelper(DocIterator const & cur,
ParagraphList const & parlist,
text, 0, 1, _("&Add"), _("&Don't
Add")) != 0)
break;
lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD,
name));
+ break;
+ }
+ case cap::BRANCH_IGNORE:
+ break;
}
// We need to update the list of branches.
need_update = true;
@@ -521,7 +530,7 @@ Buffer * copyToTempBuffer(ParagraphList const & paragraphs,
DocumentClassConstPt
// temporary Buffer, since it does a lot of things to fix them up.
DocIterator dit = doc_iterator_begin(buffer, &buffer->inset());
ErrorList el;
- pasteSelectionHelper(dit, paragraphs, docclass, buffer, el);
+ pasteSelectionHelper(dit, paragraphs, docclass, cap::BRANCH_ADD, el);
return buffer;
}
@@ -839,8 +848,9 @@ size_type numberOfSelections()
return theCuts.size();
}
+namespace {
-void cutSelection(Cursor & cur, bool doclear, bool realcut)
+void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool
realcut, bool putclip)
{
// This doesn't make sense, if there is no selection
if (!cur.selection())
@@ -868,11 +878,12 @@ void cutSelection(Cursor & cur, bool doclear, bool
realcut)
*text,
begpit, endpit,
cur.selBegin().pos(), endpos,
- bp.documentClassPtr(), theCuts);
+ bp.documentClassPtr(), cuts);
// Stuff what we got on the clipboard.
// Even if there is no selection.
- putClipboard(theCuts[0].first, theCuts[0].second,
- cur.selectionAsString(true));
+ if (putclip)
+ putClipboard(cuts[0].first, cuts[0].second,
+ cur.selectionAsString(true));
}
if (begpit != endpit)
@@ -922,6 +933,19 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
}
}
+}
+
+void cutSelection(Cursor & cur, bool doclear, bool realcut)
+{
+ cutSelectionHelper(cur, theCuts, doclear, realcut, true);
+}
+
+
+void cutSelectionToTemp(Cursor & cur, bool doclear, bool realcut)
+{
+ cutSelectionHelper(cur, tempCut, doclear, realcut, false);
+}
+
void copySelection(Cursor const & cur)
{
@@ -1066,14 +1090,15 @@ docstring selection(size_t sel_index,
DocumentClassConstPtr docclass)
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- DocumentClassConstPtr docclass, ErrorList & errorList)
+ DocumentClassConstPtr docclass,
ErrorList & errorList,
+ cap::BranchAction branchAction)
{
if (cur.inTexted()) {
Text * text = cur.text();
LBUFERR(text);
PasteReturnValue prv =
- pasteSelectionHelper(cur, parlist, docclass, 0,
errorList);
+ pasteSelectionHelper(cur, parlist, docclass,
branchAction, errorList);
cur.forceBufferUpdate();
cur.clearSelection();
text->setCursor(cur, prv.pit, prv.pos);
@@ -1092,7 +1117,20 @@ bool pasteFromStack(Cursor & cur, ErrorList & errorList,
size_t sel_index)
cur.recordUndo();
pasteParagraphList(cur, theCuts[sel_index].first,
- theCuts[sel_index].second, errorList);
+ theCuts[sel_index].second, errorList, BRANCH_ASK);
+ return true;
+}
+
+
+bool pasteFromTemp(Cursor & cur, ErrorList & errorList)
+{
+ // this does not make sense, if there is nothing to paste
+ if (tempCut.empty() || tempCut[0].first.empty())
+ return false;
+
+ cur.recordUndo();
+ pasteParagraphList(cur, tempCut[0].first,
+ tempCut[0].second, errorList, BRANCH_IGNORE);
return true;
}
diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index c6646f3..9453515 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -60,6 +60,9 @@ void replaceSelection(Cursor & cur);
* selection.
*/
void cutSelection(Cursor & cur, bool doclear = true, bool realcut = true);
+/// Like cutSelection, but only put to temporary cut buffer
+void cutSelectionToTemp(Cursor & cur, bool doclear = true, bool realcut =
true);
+
/// Push the current selection to the cut buffer and the system clipboard.
void copySelection(Cursor const & cur);
///
@@ -96,13 +99,23 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList &
errorList,
/// Replace the current selection with cut buffer \c sel_index
/// Does handle undo. Does only work in text, not mathed.
bool pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index);
+/// Replace the current selection with temporary cut buffer
+/// Does handle undo. Does only work in text, not mathed.
+bool pasteFromTemp(Cursor & cur, ErrorList & errorList);
/// Paste the clipboard as simple text, removing any formatting
void pasteSimpleText(Cursor & cur, bool asParagraphs);
+// What to do with unknown branches?
+enum BranchAction {
+ BRANCH_ADD, // add the branch unconditionally
+ BRANCH_IGNORE, // leave the branch undefined
+ BRANCH_ASK // ask the user whether the branch should be added
+};
/// Paste the paragraph list \p parlist at the position given by \p cur.
/// Does not handle undo. Does only work in text, not mathed.
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- DocumentClassConstPtr textclass, ErrorList & errorList);
+ DocumentClassConstPtr textclass, ErrorList & errorList,
+ BranchAction branchAction = BRANCH_ASK);
/** Needed to switch between different classes. This works
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 85d0c3c..a2a0cc7 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -90,7 +90,9 @@ namespace lyx {
using cap::copySelection;
using cap::cutSelection;
+using cap::cutSelectionToTemp;
using cap::pasteFromStack;
+using cap::pasteFromTemp;
using cap::pasteClipboardText;
using cap::pasteClipboardGraphics;
using cap::replaceSelection;
@@ -299,7 +301,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
bool gotsel = false;
if (cur.selection()) {
- cutSelection(cur, false, pastesel);
+ cutSelectionToTemp(cur, false, pastesel);
cur.clearSelection();
gotsel = true;
}
@@ -311,7 +313,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
if (!gotsel || !pastesel)
return true;
- pasteFromStack(cur, cur.buffer()->errorList("Paste"), 0);
+ pasteFromTemp(cur, cur.buffer()->errorList("Paste"));
cur.buffer()->errors("Paste");
cur.clearSelection(); // bug 393
cur.finishUndo();
