#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
+#include "errorlist.h"
#include "factory.h"
#include "funcrequest.h"
#include "gettext.h"
#include "pariterator.h"
#include "frontends/Dialogs.h"
+#include "frontends/Gui.h"
#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+#include "frontends/Selection.h"
#include "insets/insetcommand.h"
#include "insets/insetfloatlist.h"
#include "support/lyxlib.h"
#include "support/convert.h"
#include "support/lyxtime.h"
+#include "support/unicode.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
#include <clocale>
#include <sstream>
+using lyx::char_type;
using lyx::pos_type;
using lyx::cap::copySelection;
using lyx::cap::cutSelection;
+using lyx::cap::pasteParagraphList;
using lyx::cap::pasteSelection;
using lyx::cap::replaceSelection;
using lyx::support::isStrUnsignedInt;
using lyx::support::token;
+using lyx::frontend::Gui;
+using lyx::frontend::Clipboard;
+
using std::endl;
using std::string;
using std::istringstream;
if (selecting || cur.mark())
cur.setSelection();
if (!cur.selection())
- cur.bv().haveSelection(false);
+ cur.bv().owner()->gui().selection().haveSelection(false);
cur.bv().switchKeyMap();
}
updated |= cursorUp(cur);
}
- cur.bv().updateScrollbar();
finishUndo();
return updated;
}
updated |= cursorDown(cur);
}
- cur.bv().updateScrollbar();
finishUndo();
return updated;
}
break;
}
- case LFUN_DELETE_FORWARD_WORD_FORWARD:
+ case LFUN_WORD_DELETE_FORWARD:
cur.clearSelection();
deleteWordForward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_FORWARD_WORD_BACKWARD:
+ case LFUN_WORD_DELETE_BACKWARD:
cur.clearSelection();
deleteWordBackward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_FORWARD_LINE_FORWARD:
+ case LFUN_LINE_DELETE:
cur.clearSelection();
deleteLineForward(cur);
finishChange(cur, false);
break;
- case LFUN_WORD_FORWARD:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeftOneWord(cur);
- else
- needsUpdate = cursorRightOneWord(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_WORD_BACKWARD:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRightOneWord(cur);
- else
- needsUpdate = cursorLeftOneWord(cur);
- finishChange(cur, false);
- break;
-
case LFUN_BUFFER_BEGIN:
+ case LFUN_BUFFER_BEGIN_SELECT:
+ cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
needsUpdate = cursorTop(cur);
- finishChange(cur, false);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_BUFFER_BEGINSEL:
- if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorTop(cur);
- finishChange(cur, true);
} else {
cur.undispatched();
}
break;
case LFUN_BUFFER_END:
+ case LFUN_BUFFER_END_SELECT:
+ cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
needsUpdate = cursorBottom(cur);
- finishChange(cur, false);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_BUFFER_ENDSEL:
- if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorBottom(cur);
- finishChange(cur, true);
} else {
cur.undispatched();
}
break;
case LFUN_CHAR_FORWARD:
- case LFUN_CHAR_FORWARDSEL:
+ case LFUN_CHAR_FORWARD_SELECT:
//lyxerr << BOOST_CURRENT_FUNCTION
// << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_CHAR_FORWARDSEL);
+ cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
if (isRTL(cur.paragraph()))
needsUpdate = cursorLeft(cur);
else
break;
case LFUN_CHAR_BACKWARD:
- case LFUN_BACKWARD_SELECT:
- //lyxerr << "handle LFUN_CHAR_BACKWARD[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_BACKWARD_SELECT);
+ case LFUN_CHAR_BACKWARD_SELECT:
+ //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
+ cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
if (isRTL(cur.paragraph()))
needsUpdate = cursorRight(cur);
else
break;
case LFUN_PARAGRAPH_UP:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_PARAGRAPH_UP_SELECT:
+ cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
needsUpdate = cursorUpParagraph(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_PARAGRAPH_UPSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorUpParagraph(cur);
- finishChange(cur, true);
break;
case LFUN_PARAGRAPH_DOWN:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_PARAGRAPH_DOWN_SELECT:
+ cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
needsUpdate = cursorDownParagraph(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_PARAGRAPH_DOWNSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorDownParagraph(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_SCREEN_UPSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorPrevious(cur);
- finishChange(cur, true);
break;
- case LFUN_SCREEN_DOWNSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorNext(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_LINE_BEGINSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorHome(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_LINE_ENDSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorEnd(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_WORD_FORWARDSEL:
- if (!cur.selection())
- cur.resetAnchor();
- if (isRTL(cur.paragraph()))
- cursorLeftOneWord(cur);
- else
- cursorRightOneWord(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_WORD_BACKWARDSEL:
- if (!cur.selection())
- cur.resetAnchor();
- if (isRTL(cur.paragraph()))
- cursorRightOneWord(cur);
- else
- cursorLeftOneWord(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_WORD_SELECT: {
- selectWord(cur, lyx::WHOLE_WORD);
- finishChange(cur, true);
- break;
- }
-
case LFUN_SCREEN_UP:
+ case LFUN_SCREEN_UP_SELECT:
update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
+ cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
if (cur.pit() == 0 && cur.textRow().pos() == 0) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
break;
case LFUN_SCREEN_DOWN:
+ case LFUN_SCREEN_DOWN_SELECT:
update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
+ cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
if (cur.pit() == cur.lastpit()
&& cur.textRow().endpos() == cur.lastpos()) {
cur.undispatched();
break;
case LFUN_LINE_BEGIN:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_LINE_BEGIN_SELECT:
+ update(cur);
+ cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
needsUpdate = cursorHome(cur);
- finishChange(cur, false);
break;
case LFUN_LINE_END:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_LINE_END_SELECT:
+ update(cur);
+ cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
needsUpdate = cursorEnd(cur);
- finishChange(cur, false);
break;
+ case LFUN_WORD_FORWARD:
+ case LFUN_WORD_FORWARD_SELECT:
+ cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+ if (isRTL(cur.paragraph()))
+ needsUpdate = cursorLeftOneWord(cur);
+ else
+ needsUpdate = cursorRightOneWord(cur);
+ break;
+
+ case LFUN_WORD_BACKWARD:
+ case LFUN_WORD_BACKWARD_SELECT:
+ cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+ if (isRTL(cur.paragraph()))
+ needsUpdate = cursorRightOneWord(cur);
+ else
+ needsUpdate = cursorLeftOneWord(cur);
+ break;
+
+ case LFUN_WORD_SELECT: {
+ selectWord(cur, lyx::WHOLE_WORD);
+ finishChange(cur, true);
+ break;
+ }
+
case LFUN_BREAK_LINE: {
// Not allowed by LaTeX (labels or empty par)
if (cur.pos() > cur.paragraph().beginOfBody()) {
break;
}
- case LFUN_DELETE_FORWARD:
+ case LFUN_CHAR_DELETE_FORWARD:
if (!cur.selection()) {
if (cur.pos() == cur.paragraph().size())
// Par boundary, force full-screen update
break;
- case LFUN_DELETE_FORWARD_BACKWARD:
+ case LFUN_CHAR_DELETE_BACKWARD:
if (!cur.selection()) {
if (bv->owner()->getIntl().getTransManager().backspace()) {
// Par boundary, full-screen update
bv->switchKeyMap();
break;
- case LFUN_DELETE_FORWARD_BACKWARD_SKIP:
+ case LFUN_DELETE_BACKWARD_SKIP:
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
#ifdef WITH_WARNINGS
bv->switchKeyMap();
break;
- case LFUN_BREAK_PARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
lyx::cap::replaceSelection(cur);
breakParagraph(cur, 1);
cur.resetAnchor();
break;
}
- case LFUN_INSET_SETTINGS:
- cur.inset().showInsetDialog(bv);
- break;
-
- case LFUN_SCREEN_DOWN_INSET_TOGGLE: {
- InsetBase * inset = cur.nextInset();
- // this is the real function we want to invoke
- cmd = FuncRequest(LFUN_INSET_TOGGLE);
- cur.undispatched();
- // if there is an inset at cursor, see whether it
- // wants to toggle.
- if (inset) {
- LCursor tmpcur = cur;
- tmpcur.pushLeft(*inset);
- inset->dispatch(tmpcur, cmd);
- if (tmpcur.result().dispatched()) {
- cur.clearSelection();
- cur.dispatched();
- }
+ case LFUN_INSET_DISSOLVE: {
+ recordUndoInset(cur);
+ cur.selHandle(false);
+ // save position
+ lyx::pos_type spos = cur.pos();
+ lyx::pit_type spit = cur.pit();
+ ParagraphList plist;
+ if (cur.lastpit() != 0 || cur.lastpos() != 0)
+ plist = paragraphs();
+ cur.popLeft();
+ // store cursor offset
+ if (spit == 0)
+ spos += cur.pos();
+ spit += cur.pit();
+ cur.paragraph().erase(cur.pos());
+ if (!plist.empty()) {
+ Buffer * b = bv->buffer();
+ pasteParagraphList(cur, plist, b->params().textclass,
+ b->errorList("Paste"));
+ // restore position
+ cur.pit() = std::min(cur.lastpit(), spit);
+ cur.pos() = std::min(cur.lastpos(), spos);
}
- // if it did not work, try the underlying inset.
- if (!cur.result().dispatched())
- cur.inset().dispatch(cur, cmd);
+ cur.clearSelection();
+ cur.resetAnchor();
+ needsUpdate = true;
break;
}
+ case LFUN_INSET_SETTINGS:
+ cur.inset().showInsetDialog(bv);
+ break;
+
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
insertChar(cur, ' ');
specialChar(cur, InsetSpecialChar::LDOTS);
break;
- case LFUN_LINE_END_OF_SENTENCE_PERIOD_INSERT:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
break;
cur.message(_("Paste"));
lyx::cap::replaceSelection(cur);
if (isStrUnsignedInt(cmd.argument))
- pasteSelection(cur, convert<unsigned int>(cmd.argument));
+ pasteSelection(cur, bv->buffer()->errorList("Paste"),
+ convert<unsigned int>(cmd.argument));
else
- pasteSelection(cur, 0);
+ pasteSelection(cur, bv->buffer()->errorList("Paste"),
+ 0);
+ bv->buffer()->errors("Paste");
cur.clearSelection(); // bug 393
bv->switchKeyMap();
finishUndo();
break;
}
+ case LFUN_CLIPBOARD_PASTE: {
+ cur.clearSelection();
+ string const clip = bv->owner()->gui().clipboard().get();
+ if (!clip.empty()) {
+ recordUndo(cur);
+ if (cmd.argument == "paragraph")
+ insertStringAsParagraphs(cur, clip);
+ else
+ insertStringAsLines(cur, clip);
+ }
+ break;
+ }
+
case LFUN_PRIMARY_SELECTION_PASTE: {
cur.clearSelection();
- string const clip = bv->getClipboard();
+ string const clip = bv->owner()->gui().selection().get();
if (!clip.empty()) {
recordUndo(cur);
if (cmd.argument == "paragraph")
cursorEnd(cur);
cur.setSelection();
bv->cursor() = cur;
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
}
break;
if (cmd.button() == mouse_button::button1) {
selectWord(cur, lyx::WHOLE_WORD_STRICT);
bv->cursor() = cur;
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
}
break;
// finish selection
if (cmd.button() == mouse_button::button1)
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
bv->switchKeyMap();
bv->owner()->updateMenubar();
if (lyxrc.auto_region_delete) {
if (cur.selection())
cutSelection(cur, false, false);
- bv->haveSelection(false);
+ bv->owner()->gui().selection().haveSelection(false);
}
cur.clearSelection();
LyXFont const old_font = real_current_font;
+#if 0
string::const_iterator cit = cmd.argument.begin();
string::const_iterator end = cmd.argument.end();
for (; cit != end; ++cit)
bv->owner()->getIntl().getTransManager().
translateAndInsert(*cit, this);
+#else
+ std::vector<char> in(cmd.argument.begin(), cmd.argument.end());
+ std::vector<boost::uint32_t> const res = utf8_to_ucs4(in);
+ std::vector<boost::uint32_t>::const_iterator cit = res.begin();
+ std::vector<boost::uint32_t>::const_iterator end = res.end();
+ for (; cit != end; ++cit)
+ insertChar(bv->cursor(), *cit);
+#endif
cur.resetAnchor();
moveCursor(cur, false);
- bv->updateScrollbar();
break;
}
case LFUN_MATH_INSERT:
case LFUN_MATH_MATRIX:
- case LFUN_MATH_DELIM: {
+ case LFUN_MATH_DELIM:
+ case LFUN_MATH_BIGDELIM: {
cur.insert(new MathHullInset("simple"));
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
cur.dispatch(cmd);
break;
}
- case LFUN_ACCEPT_CHANGE: {
+ case LFUN_CHANGE_ACCEPT: {
acceptChange(cur);
break;
}
- case LFUN_REJECT_CHANGE: {
+ case LFUN_CHANGE_REJECT: {
rejectChange(cur);
break;
}
break;
}
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- if (inset) {
- FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
- inset->dispatch(cur, fr);
- }
- break;
- }
-
case LFUN_ESCAPE:
if (cur.selection()) {
cur.selection() = false;
case LFUN_HFILL_INSERT:
case LFUN_MENU_SEPARATOR_INSERT:
case LFUN_DOTS_INSERT:
- case LFUN_LINE_END_OF_SENTENCE_PERIOD_INSERT:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
code = InsetBase::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
code = InsetBase::SPACE_CODE;
break;
-#ifdef WITH_WARNINGS
-#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
-#endif
-#if 0
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- enable = inset;
- if (inset) {
- code = inset->lyxCode();
- if (!(code == InsetBase::INCLUDE_CODE
- || code == InsetBase::BIBTEX_CODE
- || code == InsetBase::FLOAT_LIST_CODE
- || code == InsetBase::TOC_CODE))
- enable = false;
- }
- break;
- }
-#endif
-
case LFUN_INSET_MODIFY:
// We need to disable this, because we may get called for a
// tabular cell via
break;
}
- case LFUN_DELETE_FORWARD_WORD_FORWARD:
- case LFUN_DELETE_FORWARD_WORD_BACKWARD:
- case LFUN_DELETE_FORWARD_LINE_FORWARD:
+ case LFUN_INSET_DISSOLVE: {
+ enable = &cur.inset() && cur.inTexted();
+ break;
+ }
+
+ case LFUN_WORD_DELETE_FORWARD:
+ case LFUN_WORD_DELETE_BACKWARD:
+ case LFUN_LINE_DELETE:
case LFUN_WORD_FORWARD:
case LFUN_WORD_BACKWARD:
case LFUN_CHAR_FORWARD:
- case LFUN_CHAR_FORWARDSEL:
+ case LFUN_CHAR_FORWARD_SELECT:
case LFUN_CHAR_BACKWARD:
- case LFUN_BACKWARD_SELECT:
+ case LFUN_CHAR_BACKWARD_SELECT:
case LFUN_UP:
case LFUN_UP_SELECT:
case LFUN_DOWN:
case LFUN_DOWN_SELECT:
- case LFUN_PARAGRAPH_UPSEL:
- case LFUN_PARAGRAPH_DOWNSEL:
- case LFUN_SCREEN_UPSEL:
- case LFUN_SCREEN_DOWNSEL:
- case LFUN_LINE_BEGINSEL:
- case LFUN_LINE_ENDSEL:
- case LFUN_WORD_FORWARDSEL:
- case LFUN_WORD_BACKWARDSEL:
+ case LFUN_PARAGRAPH_UP_SELECT:
+ case LFUN_PARAGRAPH_DOWN_SELECT:
+ case LFUN_SCREEN_UP_SELECT:
+ case LFUN_SCREEN_DOWN_SELECT:
+ case LFUN_LINE_BEGIN_SELECT:
+ case LFUN_LINE_END_SELECT:
+ case LFUN_WORD_FORWARD_SELECT:
+ case LFUN_WORD_BACKWARD_SELECT:
case LFUN_WORD_SELECT:
case LFUN_PARAGRAPH_UP:
case LFUN_PARAGRAPH_DOWN:
case LFUN_LINE_BEGIN:
case LFUN_LINE_END:
case LFUN_BREAK_LINE:
- case LFUN_DELETE_FORWARD:
+ case LFUN_CHAR_DELETE_FORWARD:
case LFUN_DELETE_FORWARD_SKIP:
- case LFUN_DELETE_FORWARD_BACKWARD:
- case LFUN_DELETE_FORWARD_BACKWARD_SKIP:
+ case LFUN_CHAR_DELETE_BACKWARD:
+ case LFUN_DELETE_BACKWARD_SKIP:
case LFUN_BREAK_PARAGRAPH:
- case LFUN_BREAK_PARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
case LFUN_BREAK_PARAGRAPH_SKIP:
case LFUN_PARAGRAPH_SPACING:
case LFUN_INSET_INSERT:
- case LFUN_SCREEN_DOWN_INSET_TOGGLE:
case LFUN_WORD_UPCASE:
case LFUN_WORD_LOWCASE:
case LFUN_WORD_CAPITALIZE:
case LFUN_SERVER_GET_FONT:
case LFUN_SERVER_GET_LAYOUT:
case LFUN_LAYOUT:
+ case LFUN_CLIPBOARD_PASTE:
case LFUN_PRIMARY_SELECTION_PASTE:
case LFUN_DATE_INSERT:
case LFUN_SELF_INSERT:
case LFUN_MATH_INSERT:
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
+ case LFUN_MATH_BIGDELIM:
case LFUN_MATH_SUBSCRIPT:
case LFUN_MATH_SUPERSCRIPT:
case LFUN_FONT_DEFAULT:
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
case LFUN_ACCENT_CIRCLE:
case LFUN_ACCENT_OGONEK:
- case LFUN_ACCEPT_CHANGE:
- case LFUN_REJECT_CHANGE:
+ case LFUN_CHANGE_ACCEPT:
+ case LFUN_CHANGE_REJECT:
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_PARAMS_APPLY:
case LFUN_ESCAPE:
case LFUN_BUFFER_END:
case LFUN_BUFFER_BEGIN:
- case LFUN_BUFFER_BEGINSEL:
- case LFUN_BUFFER_ENDSEL:
+ case LFUN_BUFFER_BEGIN_SELECT:
+ case LFUN_BUFFER_END_SELECT:
// these are handled in our dispatch()
enable = true;
break;