#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "TextMetrics.h"
-#include "Undo.h"
#include "VSpace.h"
#include "ParIterator.h"
static void finishChange(Cursor & cur, bool selecting)
{
- finishUndo();
+ cur.finishUndo();
moveCursor(cur, selecting);
}
static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
{
- recordUndo(cur);
+ cur.recordUndo();
docstring sel = cur.selectionAsString(false);
// It may happen that sel is empty but there is a selection
static void specialChar(Cursor & cur, InsetSpecialChar::Kind kind)
{
- recordUndo(cur);
+ cur.recordUndo();
cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
cur.posRight();
if (!inset)
return false;
- recordUndo(cur);
+ cur.recordUndo();
if (cmd.action == LFUN_INDEX_INSERT) {
docstring ds = support::subst(text->getStringToIndex(cur), '\n', ' ');
text->insertInset(cur, inset);
case LFUN_PARAGRAPH_MOVE_DOWN: {
pit_type const pit = cur.pit();
recUndo(cur, pit, pit + 1);
- finishUndo();
+ cur.finishUndo();
std::swap(pars_[pit], pars_[pit + 1]);
updateLabels(cur.buffer());
needsUpdate = true;
case LFUN_PARAGRAPH_MOVE_UP: {
pit_type const pit = cur.pit();
recUndo(cur, pit - 1, pit);
- finishUndo();
+ cur.finishUndo();
std::swap(pars_[pit], pars_[pit - 1]);
updateLabels(cur.buffer());
--cur.pit();
}
}
- recordUndo(cur);
+ cur.recordUndo();
par.params().startOfAppendix(start);
// we can set the refreshing parameters now
//lyxerr << BOOST_CURRENT_FUNCTION
// << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
- if (reverseDirectionNeeded(cur))
- needsUpdate |= cursorLeft(cur);
- else
- needsUpdate |= cursorRight(cur);
+ needsUpdate |= cursorForward(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ cmd = FuncRequest(LFUN_FINISHED_FORWARD);
}
break;
case LFUN_CHAR_BACKWARD_SELECT:
//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
- if (reverseDirectionNeeded(cur))
- needsUpdate |= cursorRight(cur);
- else
- needsUpdate |= cursorLeft(cur);
+ needsUpdate |= cursorBackward(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
+ }
+ break;
+
+ case LFUN_CHAR_LEFT:
+ case LFUN_CHAR_LEFT_SELECT:
+ //FIXME: for visual cursor, really move left
+ if (reverseDirectionNeeded(cur)) {
+ lyx::dispatch(FuncRequest(
+ cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
+ } else {
+ lyx::dispatch(FuncRequest(
+ cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ }
+ break;
+
+ case LFUN_CHAR_RIGHT:
+ case LFUN_CHAR_RIGHT_SELECT:
+ //FIXME: for visual cursor, really move right
+ if (reverseDirectionNeeded(cur)) {
+ lyx::dispatch(FuncRequest(
+ cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ } else {
+ lyx::dispatch(FuncRequest(
+ cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
}
break;
// this avoids a double undo
// FIXME: should not be needed, ideally
if (!cur.selection())
- recordUndo(cur);
+ cur.recordUndo();
cap::replaceSelection(cur);
cur.insert(new InsetNewline);
cur.posRight();
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
if (cur.pos() == cur.lastpos()) {
- cursorRight(cur);
- cursorLeft(cur);
+ cursorForward(cur);
+ cursorBackward(cur);
}
erase(cur);
cur.resetAnchor();
}
case LFUN_INSET_INSERT: {
- recordUndo(cur);
+ cur.recordUndo();
Inset * inset = createInset(bv, cmd);
if (inset) {
// FIXME (Abdel 01/02/2006):
}
bv->buffer().errors("Paste");
cur.clearSelection(); // bug 393
- finishUndo();
+ cur.finishUndo();
break;
case LFUN_CUT:
// this avoids a double undo
// FIXME: should not be needed, ideally
if (!cur.selection())
- recordUndo(cur);
+ cur.recordUndo();
cap::replaceSelection(cur);
pos = cur.pos();
char_type c;
bv->buffer().errorList("Paste"));
bv->buffer().errors("Paste");
bv->buffer().markDirty();
- finishUndo();
+ bv->cursor().finishUndo();
} else {
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
}
}
case LFUN_HYPERLINK_INSERT: {
- InsetCommandParams p("href");
+ InsetCommandParams p(HYPERLINK_CODE);
docstring content;
if (cur.selection()) {
content = cur.selectionAsString(false);
}
case LFUN_LABEL_INSERT: {
- InsetCommandParams p("label");
+ InsetCommandParams p(LABEL_CODE);
// Try to generate a valid label
p["name"] = (cmd.argument().empty()) ?
cur.getPossibleLabel() :
Inset * inset = createInset(&cur.bv(), cmd);
if (!inset)
break;
- recordUndo(cur);
+ cur.recordUndo();
cur.clearSelection();
insertInset(cur, inset);
// Show the dialog for the nomenclature entry, since the
}
break;
+ case LFUN_FINISHED_BACKWARD:
+ LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_BACKWARD:\n" << cur << endl;
+ break;
+
+ case LFUN_FINISHED_FORWARD:
+ LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_FORWARD:\n" << cur << endl;
+ ++cur.pos();
+ cur.setCurrentFont();
+ break;
+
case LFUN_LAYOUT_PARAGRAPH: {
string data;
params2string(cur.paragraph(), data);
case LFUN_FLOAT_LIST: {
TextClass const & tclass = bv->buffer().params().getTextClass();
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
- recordUndo(cur);
+ cur.recordUndo();
if (cur.selection())
cutSelection(cur, true, false);
breakParagraph(cur);
if (cur.lastpos() != 0) {
- cursorLeft(cur);
+ cursorBackward(cur);
breakParagraph(cur);
}
cur.selection() = false;
} else {
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ // This used to be LFUN_FINISHED_RIGHT, I think FORWARD is more
+ // correct, but I'm not 100% sure -- dov, 071019
+ cmd = FuncRequest(LFUN_FINISHED_FORWARD);
}
break;
break;
case LFUN_BRANCH_INSERT:
code = BRANCH_CODE;
- if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
+ if (cur.buffer().masterBuffer()->params().branchlist().empty())
enable = false;
break;
case LFUN_LABEL_INSERT:
break;
case LFUN_OPTIONAL_INSERT:
code = OPTARG_CODE;
- enable = numberOfOptArgs(cur.paragraph())
+ enable = cur.paragraph().numberOfOptArgs()
< cur.paragraph().layout()->optionalargs;
break;
case LFUN_ENVIRONMENT_INSERT:
case LFUN_INSET_DISSOLVE:
if (!cmd.argument().empty()) {
InsetLayout il = cur.inset().getLayout(cur.buffer().params());
- enable = (cur.inset().lyxCode() == FLEX_CODE)
- && (il.lyxtype == to_utf8(cmd.argument()));
- } else
+ enable = cur.inset().lyxCode() == FLEX_CODE
+ && il.lyxtype == to_utf8(cmd.argument());
+ } else {
enable = !isMainText(cur.bv().buffer())
- && cur.inset().nargs() == 1;
+ && cur.inset().nargs() == 1;
+ }
break;
case LFUN_CHANGE_ACCEPT:
case LFUN_CHAR_FORWARD_SELECT:
case LFUN_CHAR_BACKWARD:
case LFUN_CHAR_BACKWARD_SELECT:
+ case LFUN_CHAR_LEFT:
+ case LFUN_CHAR_LEFT_SELECT:
+ case LFUN_CHAR_RIGHT:
+ case LFUN_CHAR_RIGHT_SELECT:
case LFUN_UP:
case LFUN_UP_SELECT:
case LFUN_DOWN:
{
cur.clearSelection();
if (!clip.empty()) {
- recordUndo(cur);
+ cur.recordUndo();
if (asParagraphs)
insertStringAsParagraphs(cur, clip);
else