]> git.lyx.org Git - lyx.git/blobdiff - src/cursor.C
remove part of old texted<->mathed interface
[lyx.git] / src / cursor.C
index 810fdc4eef85586a69099fdcddbc6a7d7ccb7e70..3049ea89d552dcdd1c6fbec01656dbebc124fd06 100644 (file)
 
 #include <config.h>
 
-#include "buffer.h"
 #include "BufferView.h"
+#include "buffer.h"
 #include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
+#include "encoding.h"
 #include "funcrequest.h"
 #include "iterators.h"
+#include "language.h"
 #include "lfuns.h"
+#include "lyxfont.h"
 #include "lyxfunc.h" // only for setMessage()
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "paragraph_funcs.h"
 
 #include "insets/updatableinset.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 
 #include "mathed/math_data.h"
-#include "mathed/math_hullinset.h"
 #include "mathed/math_support.h"
+#include "mathed/math_inset.h"
 
 #include "support/limited_stack.h"
 #include "support/std_sstream.h"
@@ -56,8 +60,28 @@ using std::swap;
 limited_stack<string> theCutBuffer;
 
 
+namespace {
+
+void region(CursorSlice const & i1, CursorSlice const & i2,
+       LCursor::row_type & r1, LCursor::row_type & r2,
+       LCursor::col_type & c1, LCursor::col_type & c2)
+{
+       InsetBase & p = i1.inset();
+       c1 = p.col(i1.idx_);
+       c2 = p.col(i2.idx_);
+       if (c1 > c2)
+               swap(c1, c2);
+       r1 = p.row(i1.idx_);
+       r2 = p.row(i2.idx_);
+       if (r1 > r2)
+               swap(r1, r2);
+}
+
+}
+
+
 LCursor::LCursor(BufferView & bv)
-       : DocumentIterator(bv), anchor_(bv),
+       : DocumentIterator(), bv_(&bv), anchor_(),
          cached_y_(0), x_target_(-1), selection_(false), mark_(false)
 {}
 
@@ -85,93 +109,64 @@ void LCursor::setCursor(DocumentIterator const & cur, bool sel)
 
 DispatchResult LCursor::dispatch(FuncRequest const & cmd0)
 {
-       lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
-       BOOST_ASSERT(pos() <= lastpos());
-       BOOST_ASSERT(idx() <= lastidx());
-       BOOST_ASSERT(par() <= lastpar());
+       if (empty())
+               return DispatchResult();
+
+       //lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
        FuncRequest cmd = cmd0;
        nopop_ = false;
-       DocumentIterator orig = *this;
-       disp_.update(true);
-       disp_.val(NONE);
-       while (size() != 1) {
-               // the inset's dispatch() is supposed to reset the update and
-               // val flags if necessary 
-               inset()->dispatch(*this, cmd);
-               
-               // "Mutate" the request for semi-handled requests that need
-               // additional handling in outer levels.
-               switch (disp_.val()) {
-                       case NONE:
-                               // the inset handled the event fully
-                               return DispatchResult(true, true);
-                       case FINISHED_LEFT:
-                               // the inset handled the event partially
-                               cmd = FuncRequest(LFUN_FINISHED_LEFT);
-                               break;
-                       case FINISHED_RIGHT:
-                               cmd = FuncRequest(LFUN_FINISHED_RIGHT);
-                               break;
-                       case FINISHED_UP:
-                               cmd = FuncRequest(LFUN_FINISHED_UP);
-                               break;
-                       case FINISHED_DOWN:
-                               cmd = FuncRequest(LFUN_FINISHED_DOWN);
-                               break;
-                       default:
-                               //lyxerr << "not handled on level " << depth()
-                               //      << " val: " << disp_.val() << endl;
-                               break;
-               }
+       LCursor safe = *this;
+
+       for ( ; size(); pop()) {
+               lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+               BOOST_ASSERT(pos() <= lastpos());
+               BOOST_ASSERT(idx() <= lastidx());
+               BOOST_ASSERT(par() <= lastpar());
+
+               // The common case is 'LFUN handled, need update', so make the 
+               // LFUN handler's life easier by assuming this as default value.
+               // The handler can reset the update and val flags if necessary.
+               disp_.update(true);
+               disp_.dispatched(true);
+               inset().dispatch(*this, cmd);
+               if (disp_.dispatched())
+                       break;
        }
-       bv().text()->dispatch(*this, cmd);
-       if (nopop_)
-               setCursor(orig, false);
-       //lyxerr << "   result: " << res.val() << endl;
+       // it completely to get a 'bomb early' behaviour in case this
+       // object will be used again.
+       if (nopop_ || !disp_.dispatched())
+               operator=(safe);
        return disp_;
 }
 
 
 bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
 {
-       lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
-       DocumentIterator orig = *this;
-       BOOST_ASSERT(pos() <= lastpos());
-       BOOST_ASSERT(idx() <= lastidx());
-       BOOST_ASSERT(par() <= lastpar());
-       for ( ; size() != 0; pop_back()) {
-               // the inset's getStatus() will return 'true' if it made
+       LCursor safe = *this;
+       for ( ; size(); pop()) {
+               //lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
+               BOOST_ASSERT(pos() <= lastpos());
+               BOOST_ASSERT(idx() <= lastidx());
+               BOOST_ASSERT(par() <= lastpar());
+
+               // The inset's getStatus() will return 'true' if it made
                // a definitive decision on whether it want to handle the
                // request or not. The result of this decision is put into
                // the 'status' parameter.
-               bool const res = inset()->getStatus(*this, cmd, status);
-               if (res) {
-                       setCursor(orig, false);
-                       return true;
-               }
+               if (inset().getStatus(*this, cmd, status))
+                       break;
        }
-       bool const res = bv().text()->getStatus(*this, cmd, status);
-       setCursor(orig, false);
-       return res;
+       operator=(safe);
+       return true;
 }
 
 
 BufferView & LCursor::bv() const
 {
-       return DocumentIterator::bv();
+       return *bv_;
 }
 
 
-/*
-void LCursor::pop(int depth)
-{
-       while (int(size()) > depth + 1)
-               pop();
-       lyxerr << "LCursor::pop() result: " << *this << endl;
-}
-*/
-
-
 void LCursor::pop()
 {
        BOOST_ASSERT(size() >= 1);
@@ -180,18 +175,18 @@ void LCursor::pop()
 }
 
 
-void LCursor::push(InsetBase * p)
+void LCursor::push(InsetBase & p)
 {
        push_back(CursorSlice(p));
 }
 
 
-void LCursor::pushLeft(InsetBase * p)
+void LCursor::pushLeft(InsetBase & p)
 {
        BOOST_ASSERT(!empty());
        //lyxerr << "Entering inset " << t << " left" << endl;
        push(p);
-       p->idxFirst(*this);
+       p.idxFirst(*this);
 }
 
 
@@ -199,12 +194,9 @@ bool LCursor::popLeft()
 {
        BOOST_ASSERT(!empty());
        //lyxerr << "Leaving inset to the left" << endl;
-       if (depth() <= 1) {
-               if (depth() == 1)
-                       inset()->notifyCursorLeaves(idx());
+       inset().notifyCursorLeaves(idx());
+       if (depth() == 1)
                return false;
-       }
-       inset()->notifyCursorLeaves(idx());
        pop();
        return true;
 }
@@ -214,12 +206,9 @@ bool LCursor::popRight()
 {
        BOOST_ASSERT(!empty());
        //lyxerr << "Leaving inset to the right" << endl;
-       if (depth() <= 1) {
-               if (depth() == 1)
-                       inset()->notifyCursorLeaves(idx());
+       inset().notifyCursorLeaves(idx());
+       if (depth() == 1)
                return false;
-       }
-       inset()->notifyCursorLeaves(idx());
        pop();
        ++pos();
        return true;
@@ -229,12 +218,12 @@ bool LCursor::popRight()
 int LCursor::currentMode()
 {
        BOOST_ASSERT(!empty());
-       for (int i = size() - 1; i >= 1; --i) {
-               int res = operator[](i).inset()->currentMode();
-               if (res != MathInset::UNDECIDED_MODE)
+       for (int i = size() - 1; i >= 0; --i) {
+               int res = operator[](i).inset().currentMode();
+               if (res != InsetBase::UNDECIDED_MODE)
                        return res;
        }
-       return MathInset::TEXT_MODE;
+       return InsetBase::TEXT_MODE;
 }
 
 
@@ -242,55 +231,46 @@ void LCursor::updatePos()
 {
        BOOST_ASSERT(!empty());
        if (size() > 1)
-               cached_y_ = bv().top_y() + back().inset()->yo();
-               //cached_y_ = back().inset()->yo();
+               cached_y_ = bv().top_y() + back().inset().yo();
+               //cached_y_ = back().inset().yo();
 }
 
 
 void LCursor::getDim(int & asc, int & des) const
 {
-       BOOST_ASSERT(!empty());
        if (inMathed()) {
-               BOOST_ASSERT(inset());
-               BOOST_ASSERT(inset()->asMathInset());
-               //inset()->asMathInset()->getCursorDim(asc, des);
+               BOOST_ASSERT(inset().asMathInset());
+               //inset().asMathInset()->getCursorDim(asc, des);
                asc = 10;
                des = 10;
-       } else {
+       } else if (inTexted()) {
                Row const & row = textRow();
                asc = row.baseline();
                des = row.height() - asc;
+       } else {
+               lyxerr << "should this happen?" << endl;
+               asc = 10;
+               des = 10;
        }
 }
 
 
 void LCursor::getPos(int & x, int & y) const
 {
-       BOOST_ASSERT(!empty());
        x = 0;
        y = 0;
-       if (size() == 1) {
-               x = bv().text()->cursorX(front());
-               y = bv().text()->cursorY(front());
-       } else {
-               if (!inset()) {
-                       lyxerr << "#### LCursor::getPos: " << *this << endl;
-                       BOOST_ASSERT(inset());
-               }
-               inset()->getCursorPos(back(), x, y);
-               // getCursorPos gives _screen_ coordinates. We need to add
-               // top_y to get document coordinates. This is hidden in cached_y_.
-               //y += cached_y_ - inset()->yo();
-               // The rest is non-obvious. The reason we have to have these
-               // extra computation is that the getCursorPos() calls rely
-               // on the inset's own knowledge of its screen position.
-               // If we scroll up or down in a big enough increment,
-               // inset->draw() is not called: this doesn't update
-               // inset.yo_, so getCursor() returns an old value.
-               // Ugly as you like.
-       }
-       //lyxerr << "#### LCursor::getPos: " << *this 
-       // << " x: " << x << " y: " << y << endl;
+       if (!empty())
+               inset().getCursorPos(back(), x, y);
+       // getCursorPos gives _screen_ coordinates. We need to add
+       // top_y to get document coordinates. This is hidden in cached_y_.
+       //y += cached_y_ - inset().yo();
+       // The rest is non-obvious. The reason we have to have these
+       // extra computation is that the getCursorPos() calls rely
+       // on the inset's own knowledge of its screen position.
+       // If we scroll up or down in a big enough increment,
+       // inset->draw() is not called: this doesn't update
+       // inset.yo_, so getCursor() returns an old value.
+       // Ugly as you like.
 }
 
 
@@ -420,7 +400,7 @@ void LCursor::clearTargetX()
 void LCursor::info(std::ostream & os) const
 {
        for (int i = 1, n = depth(); i < n; ++i) {
-               operator[](i).inset()->infoize(os);
+               operator[](i).inset().infoize(os);
                os << "  ";
        }
        if (pos() != 0)
@@ -430,26 +410,6 @@ void LCursor::info(std::ostream & os) const
 }
 
 
-namespace {
-
-void region(CursorSlice const & i1, CursorSlice const & i2,
-       LCursor::row_type & r1, LCursor::row_type & r2,
-       LCursor::col_type & c1, LCursor::col_type & c2)
-{
-       InsetBase * p = i1.inset();
-       c1 = p->col(i1.idx_);
-       c2 = p->col(i2.idx_);
-       if (c1 > c2)
-               swap(c1, c2);
-       r1 = p->row(i1.idx_);
-       r2 = p->row(i2.idx_);
-       if (r1 > r2)
-               swap(r1, r2);
-}
-
-}
-
-
 string LCursor::grabSelection()
 {
        if (!selection())
@@ -459,7 +419,7 @@ string LCursor::grabSelection()
        CursorSlice i2 = selEnd();
 
        if (i1.idx_ == i2.idx_) {
-               if (i1.inset()->asMathInset()) {
+               if (i1.inset().asMathInset()) {
                        MathArray::const_iterator it = i1.cell().begin();
                        return asString(MathArray(it + i1.pos_, it + i2.pos_));
                } else {
@@ -472,7 +432,7 @@ string LCursor::grabSelection()
        region(i1, i2, r1, r2, c1, c2);
 
        string data;
-       if (i1.inset()->asMathInset()) {
+       if (i1.inset().asMathInset()) {
                for (row_type row = r1; row <= r2; ++row) {
                        if (row > r1)
                                data += "\\\\";
@@ -495,7 +455,7 @@ void LCursor::eraseSelection()
        CursorSlice const & i1 = selBegin();
        CursorSlice const & i2 = selEnd();
 #warning FIXME
-       if (i1.inset()->asMathInset()) {
+       if (i1.inset().asMathInset()) {
                if (i1.idx_ == i2.idx_) {
                        i1.cell().erase(i1.pos_, i2.pos_);
                } else {
@@ -625,7 +585,7 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 bool LCursor::isInside(InsetBase const * p)
 {
        for (unsigned i = 0; i < depth(); ++i)
-               if (operator[](i).inset() == p)
+               if (&operator[](i).inset() == p)
                        return true;
        return false;
 }
@@ -645,7 +605,7 @@ bool LCursor::openable(MathAtom const & t) const
        // we can't move into anything new during selection
        if (depth() == anchor_.size())
                return false;
-       if (!ptr_cmp(t.nucleus(), anchor_[depth()].inset()))
+       if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
                return false;
 
        return true;
@@ -661,7 +621,7 @@ bool positionable(DocumentIterator const & cursor,
 
        // anchor might be deeper, should have same path then
        for (size_t i = 0; i < cursor.size(); ++i)
-               if (cursor[i].inset() != anchor[i].inset())
+               if (&cursor[i].inset() != &anchor[i].inset())
                        return false;
 
        // position should be ok.
@@ -671,14 +631,8 @@ bool positionable(DocumentIterator const & cursor,
 
 void LCursor::setScreenPos(int x, int y)
 {
-       bool res = bruteFind(x, y, formula()->xlow(), formula()->xhigh(),
-               formula()->ylow(), formula()->yhigh());
-       if (!res) {
-               // this can happen on creation of "math-display"
-               idx() = 0;
-               pos() = 0;
-       }
-       clearTargetX();
+       x_target() = x;
+       bruteFind(x, y, 0, bv().workWidth(), 0, bv().workHeight());
 }
 
 
@@ -711,23 +665,21 @@ void LCursor::plainInsert(MathAtom const & t)
 void LCursor::insert(string const & str)
 {
        lyxerr << "LCursor::insert str '" << str << "'" << endl;
-       selClearOrDel();
-#if 0
        for (string::const_iterator it = str.begin(); it != str.end(); ++it)
-               plainInsert(MathAtom(new MathCharInset(*it)));
-#else
-       MathArray ar;
-       asArray(str, ar);
-       insert(ar);
-#endif
+               insert(*it);
 }
 
 
 void LCursor::insert(char c)
 {
        //lyxerr << "LCursor::insert char '" << c << "'" << endl;
-       selClearOrDel();
-       plainInsert(MathAtom(new MathCharInset(c)));
+       BOOST_ASSERT(!empty());
+       if (inMathed()) {
+               selClearOrDel();
+               plainInsert(MathAtom(new MathCharInset(c)));
+       } else {
+               text()->insertChar(*this, c);
+       }
 }
 
 
@@ -770,7 +722,7 @@ void LCursor::niceInsert(MathAtom const & t)
                posLeft();
                // be careful here: don't use 'pushLeft(t)' as this we need to
                // push the clone, not the original
-               pushLeft(nextAtom().nucleus());
+               pushLeft(*nextInset());
                paste(safe);
        }
 }
@@ -796,7 +748,7 @@ bool LCursor::backspace()
        }
 
        if (pos() == 0) {
-               if (inset()->nargs() == 1 && depth() == 1 && lastpos() == 0)
+               if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0)
                        return false;
                pullArg();
                return true;
@@ -835,23 +787,23 @@ bool LCursor::erase()
        }
 
        // delete empty cells if possible
-       if (pos() == lastpos() && inset()->idxDelete(idx()))
+       if (pos() == lastpos() && inset().idxDelete(idx()))
                return true;
 
        // special behaviour when in last position of cell
        if (pos() == lastpos()) {
-               bool one_cell = inset()->nargs() == 1;
+               bool one_cell = inset().nargs() == 1;
                if (one_cell && depth() == 1 && lastpos() == 0)
                        return false;
                // remove markup
                if (one_cell)
                        pullArg();
                else
-                       inset()->idxGlue(idx());
+                       inset().idxGlue(idx());
                return true;
        }
 
-       if (pos() != lastpos() && inset()->nargs() > 0) {
+       if (pos() != lastpos() && inset().nargs() > 0) {
                selection() = true;
                ++pos();
        } else {
@@ -924,7 +876,7 @@ void LCursor::handleNest(MathAtom const & a, int c)
        asArray(grabAndEraseSelection(), t.nucleus()->cell(c));
        insert(t);
        posLeft();
-       pushLeft(nextAtom().nucleus());
+       pushLeft(*nextInset());
 }
 
 
@@ -939,17 +891,6 @@ int LCursor::targetX() const
 }
 
 
-MathHullInset * LCursor::formula() const
-{
-       for (int i = size() - 1; i >= 1; --i) {
-               MathInset * inset = operator[](i).inset()->asMathInset();
-               if (inset && inset->asHullInset())
-                       return static_cast<MathHullInset *>(inset);
-       }
-       return 0;
-}
-
-
 void LCursor::adjust(pos_type from, int diff)
 {
        if (pos() > from)
@@ -986,7 +927,7 @@ bool LCursor::inMacroArgMode() const
 MathGridInset * LCursor::enclosingGrid(idx_type & idx) const
 {
        for (MathInset::difference_type i = depth() - 1; i >= 0; --i) {
-               MathInset * m = operator[](i).inset()->asMathInset();
+               MathInset * m = operator[](i).inset().asMathInset();
                if (!m)
                        return 0;
                MathGridInset * p = m->asGridInset();
@@ -1030,7 +971,7 @@ void LCursor::normalize()
        if (idx() >= nargs()) {
                lyxerr << "this should not really happen - 1: "
                       << idx() << ' ' << nargs()
-                      << " in: " << inset() << endl;
+                      << " in: " << &inset() << endl;
        }
        idx() = min(idx(), lastidx());
 
@@ -1039,7 +980,7 @@ void LCursor::normalize()
                        << pos() << ' ' << lastpos() <<  " in idx: " << idx()
                       << " in atom: '";
                WriteStream wi(lyxerr, false, true);
-               inset()->asMathInset()->write(wi);
+               inset().asMathInset()->write(wi);
                lyxerr << endl;
        }
        pos() = min(pos(), lastpos());
@@ -1068,6 +1009,7 @@ bool LCursor::goUpDown(bool up)
        // fragile. A distance of one pixel or a '<' vs '<=' _really
        // matters. So fiddle around with it only if you think you know
        // what you are doing!
+
   int xo = 0;
        int yo = 0;
        getPos(xo, yo);
@@ -1107,7 +1049,7 @@ bool LCursor::goUpDown(bool up)
        }
 
        // try current cell for e.g. text insets
-       if (inset()->idxUpDown2(*this, up))
+       if (inset().idxUpDown2(*this, up))
                return true;
 
        //xarray().boundingBox(xlow, xhigh, ylow, yhigh);
@@ -1122,9 +1064,9 @@ bool LCursor::goUpDown(bool up)
 
        // try to find an inset that knows better then we
        while (1) {
-               //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)) {
+               if (inset().idxUpDown(*this, up)) {
                        // try to find best position within this inset
                        if (!selection())
                                bruteFind2(xo, yo);
@@ -1134,13 +1076,9 @@ bool LCursor::goUpDown(bool up)
                // no such inset found, just take something "above"
                //lyxerr << "updown: handled by strange case" << endl;
                if (!popLeft()) {
-                       return
-                               bruteFind(xo, yo,
-                                       formula()->xlow(),
-                                       formula()->xhigh(),
-                                       up ? formula()->ylow() : yo + 4,
-                                       up ? yo - 4 : formula()->yhigh()
-                               );
+                       int ylow  = up ? 0 : yo + 1;
+                       int yhigh = up ? yo - 1 : bv().workHeight();
+                       return bruteFind(xo, yo, 0, bv().workWidth(), ylow, yhigh);
                }
 
                // any improvement so far?
@@ -1154,34 +1092,47 @@ bool LCursor::goUpDown(bool up)
 
 bool LCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
 {
-       DocumentIterator best_cursor(bv());
-       double best_dist = 1e10;
-
-       DocumentIterator it = bufferBegin(bv());
-       DocumentIterator et = bufferEnd();
-       while (1) {
+       BOOST_ASSERT(!empty());
+       ParagraphList::iterator beg;
+       ParagraphList::iterator end;
+       CursorSlice bottom = operator[](0); 
+       LyXText * text = bottom.text();
+       BOOST_ASSERT(text);
+       getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
+
+       DocumentIterator it = insetBegin(bv().buffer()->inset());
+       DocumentIterator et;
+       lyxerr << "x: " << x << " y: " << y << endl;
+       lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
+       lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
+
+       it.par() = text->parOffset(beg);
+       //et.par() = text->parOffset(end);
+
+       double best_dist = 10e10;
+       DocumentIterator best_cursor = it;
+
+       for ( ; it != et; it.forwardPos()) {
                // avoid invalid nesting when selecting
                if (!selection() || positionable(it, anchor_)) {
-                       int xo, yo;
+                       int xo = 0, yo = 0;
                        CursorSlice & cur = it.back();
-                       cur.inset()->getCursorPos(cur, xo, yo);
+                       cur.inset().getCursorPos(cur, xo, yo);
                        if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
                                double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
-                               //lyxerr << "x: " << x << " y: " << y << " d: " << endl;
+                               lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
                                // '<=' 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;
                                        best_dist   = d;
                                        best_cursor = it;
                                }
                        }
                }
-
-               if (it == et)
-                       break;
-               it.forwardPos();
        }
 
+       lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
        if (best_dist < 1e10)
                setCursor(best_cursor, false);
        return best_dist < 1e10;
@@ -1199,7 +1150,7 @@ void LCursor::bruteFind2(int x, int y)
        for (int i = 0; ; ++i) {
                int xo, yo;
                CursorSlice & cur = it.back();
-               cur.inset()->getCursorPos(cur, xo, yo);
+               cur.inset().getCursorPos(cur, xo, yo);
                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'
@@ -1234,38 +1185,6 @@ CursorSlice LCursor::normalAnchor()
 }
 
 
-/*
-DispatchResult dispatch(LCursor & cur, FuncRequest const & cmd)
-{
-       // mouse clicks are somewhat special
-       // check
-       switch (cmd.action) {
-       case LFUN_MOUSE_PRESS:
-       case LFUN_MOUSE_MOTION:
-       case LFUN_MOUSE_RELEASE:
-       case LFUN_MOUSE_DOUBLE: {
-               CursorSlice & pos = back();
-               int x = 0;
-               int y = 0;
-               getPos(x, y);
-               if (x < cmd.x && pos() != 0) {
-                       DispatchResult const res = prevAtom().nucleus()->dispatch(cmd);
-                       if (res.dispatched())
-                               return res;
-               }
-               if (x > cmd.x && pos() != lastpos()) {
-                       DispatchResult const res = inset()->dispatch(cmd);
-                       if (res.dispatched())
-                               return res;
-               }
-       }
-       default:
-       break;
-       }
-}
-*/
-
-
 void LCursor::handleFont(string const & font)
 {
        lyxerr << "LCursor::handleFont: " << font << endl;
@@ -1345,7 +1264,7 @@ string LCursor::selectionAsString(bool label) const
                return result;
        }
 
-#warning an mathed?
+#warning and mathed?
        return string();
 }
 
@@ -1357,7 +1276,11 @@ string LCursor::currentState()
                info(os);
                return os.str();
        }
-       return text() ? text()->currentState(*this) : string();
+
+       if (inTexted())
+        return text()->currentState(*this);
+
+       return string();
 }
 
 
@@ -1388,15 +1311,30 @@ string LCursor::getPossibleLabel()
 }
 
 
-void LCursor::undispatched()
+Encoding const * LCursor::getEncoding() const
 {
-       disp_.dispatched(false);
+       if (empty())
+               return 0;
+       if (!bv().buffer())
+               return 0;
+       int s = 0;
+       // go up until first non-0 text is hit
+       // (innermost text is 0 in mathed)
+       for (s = size() - 1; s >= 0; --s)
+               if (operator[](s).text())
+                       break;
+       CursorSlice const & sl = operator[](s);
+       LyXText & text = *sl.text();
+       ParagraphList::iterator pit = text.getPar(sl.par());
+       LyXFont font = pit->getFont(
+               bv().buffer()->params(), sl.pos(), outerFont(pit, text.paragraphs()));  
+       return font.language()->encoding();
 }
 
 
-void LCursor::dispatched(dispatch_result_t res)
+void LCursor::undispatched()
 {
-       disp_.val(res);
+       disp_.dispatched(false);
 }
 
 
@@ -1404,9 +1342,3 @@ void LCursor::noUpdate()
 {
        disp_.update(false);
 }
-
-
-void LCursor::noPop()
-{
-       nopop_ = true;
-}