}
-void InsetFormulaBase::getCursorPos(int & x, int & y) const
+void InsetFormulaBase::getCursorPos(int, int & x, int & y) const
{
if (!mathcursor) {
lyxerr << "getCursorPos - should not happen";
lyxerr << "Called FormulaBase::edit" << endl;
releaseMathCursor(bv);
mathcursor = new MathCursor(this, left);
- bv->cursor().push(this);
+ bv->fullCursor().push(this);
// if that is removed, we won't get the magenta box when entering an
// inset for the first time
bv->update();
mathcursor = new MathCursor(this, true);
//metrics(bv);
mathcursor->setPos(x + xo_, y + yo_);
- bv->cursor().push(this);
+ bv->fullCursor().push(this);
// if that is removed, we won't get the magenta box when entering an
// inset for the first time
bv->update();
case LFUN_RIGHTSEL:
sel = true; // fall through...
case LFUN_RIGHT:
- result = mathcursor->right(sel) ? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
+ result = mathcursor->right(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
//lyxerr << "calling scroll 20" << endl;
//scroll(bv, 20);
// write something to the minibuffer
case LFUN_LEFTSEL:
sel = true; // fall through
case LFUN_LEFT:
- result = mathcursor->left(sel) ? DispatchResult(true, true) : DispatchResult(true, FINISHED);
+ result = mathcursor->left(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED);
break;
case LFUN_UPSEL:
sel = true; // fall through
case LFUN_UP:
- result = mathcursor->up(sel) ? DispatchResult(true, true) : DispatchResult(false, FINISHED_UP);
+ result = mathcursor->up(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_UP);
break;
case LFUN_DOWNSEL:
sel = true; // fall through
case LFUN_DOWN:
- result = mathcursor->down(sel) ? DispatchResult(true, true) : DispatchResult(false, FINISHED_DOWN);
+ result = mathcursor->down(sel) ?
+ DispatchResult(true, true) : DispatchResult(false, FINISHED_DOWN);
break;
case LFUN_WORDSEL:
result = DispatchResult(false);
else
bv->owner()->getDialogs().show(name, data, 0);
+ break;
}
- break;
case LFUN_INSET_APPLY: {
string const name = cmd.getArg(0);
result = DispatchResult(false);
}
}
+ break;
+ }
+
+ case LFUN_WORD_REPLACE:
+ case LFUN_WORD_FIND: {
+ result =
+ searchForward(cmd.view(), cmd.getArg(0), false, false)
+ ? DispatchResult(true, true) : DispatchResult(false);
+ break;
}
- break;
default:
result = DispatchResult(false);
#warning pretty ugly
#endif
static InsetFormulaBase * lastformula = 0;
- static MathIterator current = MathIterator(ibegin(par().nucleus()));
+ static CursorBase current = CursorBase(ibegin(par().nucleus()));
static MathArray ar;
static string laststr;
ar.clear();
mathed_parse_cell(ar, str);
} else {
- ++current;
+ increment(current);
}
//lyxerr << "searching '" << str << "' in " << this << ar << endl;
- for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
- if (it.cell().matchpart(ar, it.back().pos_)) {
+ for (CursorBase it = current; it != iend(par().nucleus()); increment(it)) {
+ CursorSlice & top = it.back();
+ MathArray const & a = top.asMathInset()->cell(top.idx_);
+ if (a.matchpart(ar, top.pos_)) {
delete mathcursor;
mathcursor = new MathCursor(this, true);
//metrics(bv);
mathcursor->setSelection(it, ar.size());
current = it;
- it.jump(ar.size());
+ top.pos_ += ar.size();
bv->update();
return true;
}
if (sel.empty()) {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- bv->cursor().innerInset()->
+ bv->fullCursor().innerInset()->
dispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
// don't do that also for LFUN_MATH_MODE unless you want end up with
// always changing to mathrm when opening an inlined inset
case LFUN_MATH_DELIM: {
InsetFormula * f = new InsetFormula(bv);
if (openNewInset(bv, f)) {
- UpdatableInset * inset = bv->cursor().innerInset();
+ UpdatableInset * inset = bv->fullCursor().innerInset();
inset->dispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
inset->dispatch(cmd);
}