* src/cursor.C

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index 111fb78a9a977ab6aca1ae37f9db0af73e50e47b..a7fb543984224de44319a7c642fad6edb8a82205 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -97,7 +97,12 @@ namespace {
                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'
@@ -122,16 +127,26 @@ namespace {
                BOOST_ASSERT(!cursor.empty());
                InsetBase & inset = cursor[0].inset();
 
-               DocIterator it = doc_iterator_begin(inset);
-               DocIterator const et = doc_iterator_end(inset);
+               CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+               // Get an iterator on the first paragraph in the cache
+               DocIterator it(inset);
+               it.push_back(CursorSlice(inset));
+               it.pit() = cache.begin()->first;
+               // Get an iterator after the last paragraph in the cache
+               DocIterator et(inset);
+               et.push_back(CursorSlice(inset));
+               et.pit() = boost::prior(cache.end())->first;
+               if (et.pit() >= et.lastpit())
+                       et = doc_iterator_end(inset);
+               else 
+                       ++et.pit();
 
                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_))) {
+                       if (!cursor.selection() || positionable(it, cursor.anchor_)) {
                                Point p = bv_funcs::getPos(it, false);
                                int xo = p.x_;
                                int yo = p.y_;
@@ -142,7 +157,7 @@ namespace {
                                        // '<=' in order to take the last possible position
                                        // this is important for clicking behind \sum in e.g. '\sum_i a'
                                        if (d <= best_dist) {
-                                               lyxerr << "*" << endl;
+                                               //      lyxerr << "*" << endl;
                                                best_dist   = d;
                                                best_cursor = it;
                                        }
@@ -374,13 +389,6 @@ void LCursor::getPos(int & x, int & y) const
 }
 
 
-void LCursor::paste(string const & data)
-{
-       if (!data.empty())
-               dispatch(FuncRequest(LFUN_PASTE, data));
-}
-
-
 void LCursor::resetAnchor()
 {
        anchor_ = *this;
@@ -707,7 +715,10 @@ void LCursor::niceInsert(MathAtom const & t)
                // 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);
        }
 }
 
@@ -825,10 +836,10 @@ bool LCursor::down()
 }
 
 
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
 {
        if (!inMacroMode())
-               return;
+               return false;
        MathUnknownInset * p = activeMacro();
        p->finalize();
        string const s = p->name();
@@ -837,7 +848,7 @@ void LCursor::macroModeClose()
 
        // do nothing if the macro name is empty
        if (s == "\\")
-               return;
+               return false;
 
        // prevent entering of recursive macros
        // FIXME: this is only a weak attempt... only prevents immediate
@@ -847,11 +858,8 @@ void LCursor::macroModeClose()
        if (macro && macro->getInsetName() == name)
                lyxerr << "can't enter recursive macro" << endl;
 
-       // Going back and forth between LCursor and mathed is a bit
-       // ridiculous, but the alternative was to duplicate the code
-       // in MathNestInset::doDispatch/LFUN_INSERT_MATH (which puts
-       // the cursor in the newly created inset). (JMarc 2005/12/20)
-       dispatch(FuncRequest(LFUN_INSERT_MATH, s));
+       plainInsert(createMathInset(name));
+       return true;
 }
 
 
@@ -1022,10 +1030,10 @@ bool LCursor::goUpDown(bool up)
 
        // 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));
@@ -1034,14 +1042,14 @@ bool LCursor::goUpDown(bool up)
 
                // 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);