for (size_t i = 0; ; ++i) {
int xo;
int yo;
- it.inset().cursorPos(it.top(), c.boundary() && ((i+1) == it.depth()), xo, yo);
+ InsetBase const * inset = &it.inset();
+ Point o = theCoords.getInsets().xy(inset);
+ inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ // Convert to absolute
+ xo += o.x_;
+ yo += o.y_;
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
double best_dist = std::numeric_limits<double>::max();;
DocIterator best_cursor = et;
- for ( ; it != et; it.forwardPos()) {
+ for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting
if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
&& (!cursor.selection() || positionable(it, cursor.anchor_))) {
}
+// Don't use this routine. It is erroneous: LFUN_PASTE should be called with
+// buffer number, not data to be inserted -- MV 26.02.2006
void LCursor::paste(string const & data)
{
if (!data.empty())
{
if (!selection())
return *this;
- return anchor() < top() ? anchor_ : *this;
+ DocIterator di = (anchor() < top() ? anchor_ : *this);
+ di.resize(depth());
+ return di;
}
{
if (!selection())
return *this;
- return anchor() > top() ? anchor_ : *this;
+ DocIterator di = (anchor() > top() ? anchor_ : *this);
+ if (di.depth() > depth()) {
+ di.resize(depth());
+ ++di.pos();
+ }
+ return di;
}
// be careful here: don't use 'pushLeft(t)' as this we need to
// push the clone, not the original
pushLeft(*nextInset());
- paste(safe);
+ // We may not use niceInsert here (recursion)
+ MathArray ar;
+ asArray(safe, ar);
+ insert(ar);
}
}
}
// 'clever' UI hack: only erase large items if previously slected
- if (pos() != lastpos() && inset().nargs() > 0) {
+ if (pos() != lastpos() && nextAtom()->nargs() > 0) {
resetAnchor();
selection() = true;
++pos();
}
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
{
if (!inMacroMode())
- return;
+ return false;
MathUnknownInset * p = activeMacro();
p->finalize();
string const s = p->name();
// do nothing if the macro name is empty
if (s == "\\")
- return;
-
- string const name = s.substr(1);
+ return false;
// prevent entering of recursive macros
// FIXME: this is only a weak attempt... only prevents immediate
// recursion
+ string const name = s.substr(1);
InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
if (macro && macro->getInsetName() == name)
lyxerr << "can't enter recursive macro" << endl;
plainInsert(createMathInset(name));
+ return true;
}
// try to find an inset that knows better then we
while (true) {
- lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
+ //lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
// ask inset first
if (inset().idxUpDown(*this, up)) {
- lyxerr << "idxUpDown triggered" << endl;
+ //lyxerr << "idxUpDown triggered" << endl;
// try to find best position within this inset
if (!selection())
setCursor(bruteFind2(*this, xo, yo));
// no such inset found, just take something "above"
if (!popLeft()) {
- lyxerr << "updown: popleft failed (strange case)" << endl;
+ //lyxerr << "updown: popleft failed (strange case)" << endl;
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
- lyxerr << "updown: popLeft succeeded" << endl;
+ //lyxerr << "updown: popLeft succeeded" << endl;
int xnew;
int ynew;
getPos(xnew, ynew);
return result;
}
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
+ if (inMathed())
+ return lyx::cap::grabSelection(*this);
+
return string();
}