]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_nestinset.C
the DocIterator stuff
[lyx.git] / src / mathed / math_nestinset.C
index f2f485a81c8872c3da9095166dee5c9a33bf4c23..099f31766c0558d2c0a7b62dc6a56d4ca42983ff 100644 (file)
 
 #include "math_nestinset.h"
 
+#include "math_arrayinset.h"
+#include "math_braceinset.h"
+#include "math_commentinset.h"
+#include "math_data.h"
+#include "math_deliminset.h"
+#include "math_factory.h"
+#include "math_hullinset.h"
+#include "math_mathmlstream.h"
+#include "math_parser.h"
+#include "math_scriptinset.h"
+#include "math_spaceinset.h"
+#include "math_support.h"
+#include "math_mboxinset.h"
+#include "math_unknowninset.h"
+
 #include "BufferView.h"
-#include "LColor.h"
+#include "bufferview_funcs.h"
 #include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
+#include "gettext.h"
+#include "LColor.h"
 #include "undo.h"
 
+#include "support/std_sstream.h"
+#include "support/lstrings.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
 
+using std::endl;
+using std::string;
+using std::istringstream;
+
+
+namespace {
+
+// local global
+int first_x;
+int first_y;
+
+} // namespace anon
+
+
+
+
 MathNestInset::MathNestInset(idx_type nargs)
        : cells_(nargs), lock_(false)
 {}
@@ -49,13 +84,15 @@ MathArray const & MathNestInset::cell(idx_type i) const
 }
 
 
-void MathNestInset::getScreenPos(idx_type idx, pos_type pos, int & x, int & y) const
+void MathNestInset::getCursorPos(CursorSlice const & cur,
+       int & x, int & y) const
 {
-       MathArray const & ar = cell(idx);
-       x = ar.xo() + ar.pos2x(pos);
+       BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+       MathArray const & ar = cur.cell();
+       x = ar.xo() + ar.pos2x(cur.pos());
        y = ar.yo();
        // move cursor visually into empty cells ("blue rectangles");
-       if (cell(idx).empty())
+       if (cur.cell().empty())
                x += 2;
 }
 
@@ -77,7 +114,8 @@ void MathNestInset::metrics(MetricsInfo const & mi) const
 
 bool MathNestInset::idxNext(LCursor & cur) const
 {
-       if (cur.idx() + 1 >= nargs())
+       BOOST_ASSERT(ptr_cmp(cur.inset(), this));
+       if (cur.idx() == cur.lastidx())
                return false;
        ++cur.idx();
        cur.pos() = 0;
@@ -93,6 +131,7 @@ bool MathNestInset::idxRight(LCursor & cur) const
 
 bool MathNestInset::idxPrev(LCursor & cur) const
 {
+       BOOST_ASSERT(ptr_cmp(cur.inset(), this));
        if (cur.idx() == 0)
                return false;
        --cur.idx();
@@ -109,6 +148,7 @@ bool MathNestInset::idxLeft(LCursor & cur) const
 
 bool MathNestInset::idxFirst(LCursor & cur) const
 {
+       BOOST_ASSERT(ptr_cmp(cur.inset(), this));
        if (nargs() == 0)
                return false;
        cur.idx() = 0;
@@ -119,27 +159,10 @@ bool MathNestInset::idxFirst(LCursor & cur) const
 
 bool MathNestInset::idxLast(LCursor & cur) const
 {
+       BOOST_ASSERT(ptr_cmp(cur.inset(), this));
        if (nargs() == 0)
                return false;
-       cur.idx() = nargs() - 1;
-       cur.pos() = cur.lastpos();
-       return true;
-}
-
-
-bool MathNestInset::idxHome(LCursor & cur) const
-{
-       if (cur.pos() == 0)
-               return false;
-       cur.pos() = 0;
-       return true;
-}
-
-
-bool MathNestInset::idxEnd(LCursor & cur) const
-{
-       if (cur.lastpos() == cur.lastpos())
-               return false;
+       cur.idx() = cur.lastidx();
        cur.pos() = cur.lastpos();
        return true;
 }
@@ -168,19 +191,26 @@ void MathNestInset::draw(PainterInfo &, int, int) const
 }
 
 
-void MathNestInset::drawSelection(PainterInfo & pi,
-               idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const
+void MathNestInset::drawSelection(PainterInfo & pi, int, int) const
 {
-       if (idx1 == idx2) {
-               MathArray const & c = cell(idx1);
-               int x1 = c.xo() + c.pos2x(pos1);
+       // this should use the x/y values given, not the cached values
+       LCursor & cur = pi.base.bv->cursor();
+       if (!cur.selection())
+               return;
+       if (!ptr_cmp(cur.inset(), this))
+               return;
+       CursorSlice & s1 = cur.selBegin();
+       CursorSlice & s2 = cur.selEnd();
+       if (s1.idx() == s2.idx()) {
+               MathArray const & c = cell(s1.idx());
+               int x1 = c.xo() + c.pos2x(s1.pos());
                int y1 = c.yo() - c.ascent();
-               int x2 = c.xo() + c.pos2x(pos2);
+               int x2 = c.xo() + c.pos2x(s2.pos());
                int y2 = c.yo() + c.descent();
                pi.pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
        } else {
                for (idx_type i = 0; i < nargs(); ++i) {
-                       if (idxBetween(i, idx1, idx2)) {
+                       if (idxBetween(i, s1.idx(), s2.idx())) {
                                MathArray const & c = cell(i);
                                int x1 = c.xo();
                                int y1 = c.yo() - c.ascent();
@@ -216,12 +246,6 @@ bool MathNestInset::contains(MathArray const & ar) const
 }
 
 
-bool MathNestInset::editing(BufferView * bv) const
-{
-       return bv->cursor().isInside(this);
-}
-
-
 bool MathNestInset::lock() const
 {
        return lock_;
@@ -278,199 +302,292 @@ void MathNestInset::notifyCursorLeaves(idx_type idx)
 }
 
 
-DispatchResult
-MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathNestInset::handleFont
+       (LCursor & cur, string const & arg, string const & font)
 {
-       //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
-       //      << " arg: '" << cmd.argument
-       //      << "' x: '" << cmd.x
-       //      << " y: '" << cmd.y
-       //      << "' button: " << cmd.button() << endl;
+       // this whole function is a hack and won't work for incremental font
+       // changes...
+       //recordUndo(cur, Undo::ATOMIC);
+
+       if (cur.inset()->asMathInset()->name() == font)
+               cur.handleFont(font);
+       else {
+               cur.handleNest(createMathInset(font));
+               cur.insert(arg);
+       }
+}
+
+
+void MathNestInset::handleFont2(LCursor & cur, string const & arg)
+{
+       //recordUndo(cur, Undo::ATOMIC);
+       LyXFont font;
+       bool b;
+       bv_funcs::string2font(arg, font, b);
+       if (font.color() != LColor::inherit) {
+               MathAtom at = createMathInset("color");
+               asArray(lcolor.getGUIName(font.color()), at.nucleus()->cell(0));
+               cur.handleNest(at, 1);
+       }
+}
+
+
+void MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+{
+       lyxerr << "MathNestInset: request: " << cmd << std::endl;
+       //CursorSlice sl = cur.current();
 
        switch (cmd.action) {
 
+       case LFUN_PASTE:
+               if (!cmd.argument.empty()) {
+                       MathArray ar;
+                       mathed_parse_cell(ar, cmd.argument);
+                       cur.cell().insert(cur.pos(), ar);
+                       cur.pos() += ar.size();
+               }
+               break;
+/*
        case LFUN_PASTE: {
-               MathArray ar;
-               mathed_parse_cell(ar, cmd.argument);
-               cur.cell().insert(cur.pos(), ar);
-               cur.pos() += ar.size();
-               return DispatchResult(true, true);
+               size_t n = 0;
+               istringstream is(cmd.argument.c_str());
+               is >> n;
+               if (was_macro)
+                       cur.macroModeClose();
+               //recordUndo(cur, Undo::ATOMIC);
+               cur.selPaste(n);
+               break;
        }
+*/
 
        case LFUN_PASTESELECTION:
-               return dispatch(cur, FuncRequest(LFUN_PASTE, cur.bv().getClipboard())); 
+               dispatch(cur, FuncRequest(LFUN_PASTE, cur.bv().getClipboard()));
+               break;
 
        case LFUN_MOUSE_PRESS:
-               if (cmd.button() == mouse_button::button2)
-                       return priv_dispatch(cur, FuncRequest(LFUN_PASTESELECTION));
-               return DispatchResult(false);
+               lfunMousePress(cur, cmd);
+               break;
+
+       case LFUN_MOUSE_MOTION:
+               lfunMouseMotion(cur, cmd);
+               break;
+
+       case LFUN_MOUSE_RELEASE:
+               lfunMouseRelease(cur, cmd);
+               break;
+
+       case LFUN_MOUSE_DOUBLE:
+       case LFUN_MOUSE_TRIPLE:
+               //lyxerr << "Mouse double" << endl;
+               //lyxerr << "Mouse triple" << endl;
+               dispatch(cur, FuncRequest(LFUN_WORDSEL));
+               break;
+
+       case LFUN_FINISHED_LEFT:
+               cur.bv().cursor() = cur;
+               break;
+
+       case LFUN_FINISHED_RIGHT:
+               ++cur.pos();
+               cur.bv().cursor() = cur;
+               break;
+
+       case LFUN_FINISHED_UP:
+               //idxUpDown(cur, true);
+               cur.bv().cursor() = cur;
+               break;
+
+       case LFUN_FINISHED_DOWN:
+               //idxUpDown(cur, false);
+               cur.bv().cursor() = cur;
+               break;
 
        case LFUN_RIGHTSEL:
-               cur.selection() = true; // fall through...
        case LFUN_RIGHT:
-               return cur.right() ?
-                       DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
-               //lyxerr << "calling scroll 20" << endl;
-               //scroll(&cur.bv(), 20);
-               // write something to the minibuffer
-               //cur.bv().owner()->message(cur.info());
+               lyxerr << "mathnest RIGHT: from:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_RIGHTSEL);
+               cur.autocorrect() = false;
+               cur.clearTargetX();
+               if (cur.inMacroMode())
+                       cur.macroModeClose();
+               else if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
+                       cur.pushLeft(cur.nextAtom().nucleus());
+                       cur.inset()->idxFirst(cur);
+               } else if (cur.posRight() || idxRight(cur)
+                       || cur.popRight() || cur.selection())
+                       ;
+               else
+                       cur.dispatched(FINISHED_RIGHT);
+               lyxerr << "mathnest RIGHT: to:\n" << cur << endl;
+               break;
 
        case LFUN_LEFTSEL:
-               cur.selection() = true; // fall through
        case LFUN_LEFT:
-               return cur.left() ?
-                       DispatchResult(true, true) : DispatchResult(false, FINISHED);
+               cur.selHandle(cmd.action == LFUN_LEFTSEL);
+               cur.autocorrect() = false;
+               cur.clearTargetX();
+               if (cur.inMacroMode())
+                       cur.macroModeClose();
+               else if (cur.pos() != 0 && cur.openable(cur.prevAtom())) {
+                       cur.posLeft();
+                       cur.push(cur.nextAtom().nucleus());
+                       cur.inset()->idxLast(cur);
+               } else if (cur.posLeft() || idxLeft(cur)
+                       || cur.popLeft() || cur.selection())
+                       ;
+               else
+                       cur.dispatched(FINISHED_LEFT);
+               break;
 
        case LFUN_UPSEL:
-               cur.selection() = true; // fall through
        case LFUN_UP:
-               return cur.up() ?
-                       DispatchResult(true, true) : DispatchResult(false, FINISHED_UP);
+               cur.selHandle(cmd.action == LFUN_UPSEL);
+               if (!cur.up())
+                       cur.dispatched(FINISHED_UP);
+               break;
 
        case LFUN_DOWNSEL:
-               cur.selection() = true; // fall through
        case LFUN_DOWN:
-               return cur.down() ?
-                       DispatchResult(true, true) : DispatchResult(false, FINISHED_DOWN);
+               cur.selHandle(cmd.action == LFUN_DOWNSEL);
+               if (!cur.down())
+                       cur.dispatched(FINISHED_DOWN);
+               break;
 
        case LFUN_WORDSEL:
-               cur.home();
+               cur.pos() = 0;
+               cur.idx() = 0;
+               cur.resetAnchor();
                cur.selection() = true;
-               cur.end();
-               return DispatchResult(true, true);
+               cur.pos() = cur.lastpos();
+               cur.idx() = cur.lastidx();
+               break;
 
        case LFUN_UP_PARAGRAPHSEL:
        case LFUN_UP_PARAGRAPH:
        case LFUN_DOWN_PARAGRAPHSEL:
        case LFUN_DOWN_PARAGRAPH:
-               return DispatchResult(true, FINISHED);
+               break;
 
        case LFUN_HOMESEL:
-       case LFUN_WORDLEFTSEL:
-               cur.selection() = true; // fall through
        case LFUN_HOME:
+       case LFUN_WORDLEFTSEL:
        case LFUN_WORDLEFT:
-               return cur.home()
-                       ? DispatchResult(true, true) : DispatchResult(true, FINISHED);
+               cur.selHandle(cmd.action == LFUN_WORDLEFTSEL || cmd.action == LFUN_HOMESEL);
+               cur.macroModeClose();
+               if (cur.pos() != 0) {
+                       cur.pos() = 0;
+               } else if (cur.col() != 0) {
+                       cur.idx() -= cur.col();
+                       cur.pos() = 0;
+               } else if (cur.idx() != 0) {
+                       cur.idx() = 0;
+                       cur.pos() = 0;
+               } else {
+                       cur.dispatched(FINISHED_LEFT);
+               }
+               break;
 
-       case LFUN_ENDSEL:
        case LFUN_WORDRIGHTSEL:
-               cur.selection() = true; // fall through
-       case LFUN_END:
        case LFUN_WORDRIGHT:
-               return cur.end()
-                       ? DispatchResult(true, true) : DispatchResult(false, FINISHED_RIGHT);
+       case LFUN_ENDSEL:
+       case LFUN_END:
+               cur.selHandle(cmd.action == LFUN_WORDRIGHTSEL || cmd.action == LFUN_ENDSEL);
+               cur.macroModeClose();
+               cur.clearTargetX();
+               if (cur.pos() != cur.lastpos()) {
+                       cur.pos() = cur.lastpos();
+               } else if (cur.col() != cur.lastcol()) {
+                       cur.idx() = cur.idx() - cur.col() + cur.lastcol();
+                       cur.pos() = cur.lastpos();
+               } else if (cur.idx() != cur.lastidx()) {
+                       cur.idx() = cur.lastidx();
+                       cur.pos() = cur.lastpos();
+               } else {
+                       cur.dispatched(FINISHED_RIGHT);
+               }
+               break;
 
        case LFUN_PRIORSEL:
        case LFUN_PRIOR:
        case LFUN_BEGINNINGBUFSEL:
        case LFUN_BEGINNINGBUF:
-               return DispatchResult(true, FINISHED);
+               cur.dispatched(FINISHED_LEFT);
+               break;
 
        case LFUN_NEXTSEL:
        case LFUN_NEXT:
        case LFUN_ENDBUFSEL:
        case LFUN_ENDBUF:
-               return DispatchResult(false, FINISHED_RIGHT);
+               cur.dispatched(FINISHED_RIGHT);
+               break;
 
        case LFUN_CELL_FORWARD:
                cur.inset()->idxNext(cur);
-               return DispatchResult(true, true);
+               break;
 
        case LFUN_CELL_BACKWARD:
                cur.inset()->idxPrev(cur);
-               return DispatchResult(true, true);
+               break;
 
        case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
-               recordUndo(cur, Undo::ATOMIC);
+               //recordUndo(cur, Undo::ATOMIC);
                cur.backspace();
-               return DispatchResult(true, true);
+               break;
 
        case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
-               recordUndo(cur, Undo::ATOMIC);
+               //recordUndo(cur, Undo::ATOMIC);
                cur.erase();
-               return DispatchResult(true, FINISHED);
+               cur.dispatched(FINISHED_LEFT);
+               break;
 
        case LFUN_ESCAPE:
-               if (!cur.selection())
-                       return DispatchResult(true, true);
-               cur.selClear();
-               return DispatchResult(false);
+               if (cur.selection()) 
+                       cur.selClear();
+               else 
+                       cur.dispatched(FINISHED_LEFT);
+               break;
 
        case LFUN_INSET_TOGGLE:
-               cur.lockToggle();
-               return DispatchResult(true, true);
+               //lockToggle();
+               if (cur.pos() != cur.lastpos()) {
+                       // toggle previous inset ...
+                       cur.nextAtom().nucleus()->lock(!cur.nextAtom()->lock());
+               } else if (cur.popLeft() && cur.pos() != cur.lastpos()) {
+                       // ... or enclosing inset if we are in the last inset position
+                       cur.nextAtom().nucleus()->lock(!cur.nextAtom()->lock());
+                       ++cur.pos();
+               }
+               break;
 
        case LFUN_SELFINSERT:
-               if (!cmd.argument.empty()) {
-                       recordUndo(cur, Undo::ATOMIC);
-                       if (cmd.argument.size() == 1) {
-                               if (cur.interpret(cmd.argument[0]))
-                                       return DispatchResult(true, true);
-                               else
-                                       return DispatchResult(false, FINISHED_RIGHT);
-                       }
+               if (cmd.argument.empty()) {
+                       cur.dispatched(FINISHED_RIGHT);
+                       break;
+               }
+               //recordUndo(cur, Undo::ATOMIC);
+               if (cmd.argument.size() != 1) {
                        cur.insert(cmd.argument);
+                       break;
                }
-               return DispatchResult(false, FINISHED_RIGHT);
-
+               if (!interpret(cur, cmd.argument[0]))
+                       cur.dispatched(FINISHED_RIGHT);
+               break;
 
 #if 0
 //
-// this needs to bee incorporated
+// this needs to be incorporated
 //
-       //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
-       //      << " arg: '" << cmd.argument
-       //      << "' x: '" << cmd.x
-       //      << " y: '" << cmd.y
-       //      << "' button: " << cmd.button() << endl;
-
        // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
        bool remove_inset = false;
 
-       switch (cmd.action) {
-               case LFUN_MOUSE_PRESS:
-                       //lyxerr << "Mouse single press" << endl;
-                       return lfunMousePress(cur, cmd);
-               case LFUN_MOUSE_MOTION:
-                       //lyxerr << "Mouse motion" << endl;
-                       return lfunMouseMotion(cur, cmd);
-               case LFUN_MOUSE_RELEASE:
-                       //lyxerr << "Mouse single release" << endl;
-                       return lfunMouseRelease(cur, cmd);
-               case LFUN_MOUSE_DOUBLE:
-                       //lyxerr << "Mouse double" << endl;
-                       return dispatch(cur, FuncRequest(LFUN_WORDSEL));
-               default:
-                       break;
-       }
-
        DispatchResult result(true);
-       string argument    = cmd.argument;
        bool was_macro     = cur.inMacroMode();
 
        cur.normalize();
        cur.touch();
-
-       switch (cmd.action) {
-
-       case LFUN_MATH_MUTATE:
-       case LFUN_MATH_DISPLAY:
-       case LFUN_MATH_NUMBER:
-       case LFUN_MATH_NONUMBER:
-       case LFUN_CELL_SPLIT:
-       case LFUN_BREAKLINE:
-       case LFUN_DELETE_LINE_FORWARD:
-       case LFUN_INSERT_LABEL:
-       case LFUN_MATH_EXTERN:
-       case LFUN_TABULAR_FEATURE:
-       case LFUN_PASTESELECTION:
-       case LFUN_MATH_LIMITS:
-               recordUndo(cur, Undo::ATOMIC);
-               cur.dispatch(cmd);
-               break;
+#endif
 
        //    case LFUN_GETXY:
        //      sprintf(dispatch_buffer, "%d %d",);
@@ -486,19 +603,8 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_PASTE: {
-               size_t n = 0;
-               istringstream is(cmd.argument.c_str());
-               is >> n;
-               if (was_macro)
-                       cur.macroModeClose();
-               recordUndo(cur, Undo::ATOMIC);
-               cur.selPaste(n);
-               break;
-       }
-
        case LFUN_CUT:
-               recordUndo(cur, Undo::DELETE);
+               //recordUndo(cur, Undo::DELETE);
                cur.selCut();
                break;
 
@@ -506,15 +612,14 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                cur.selCopy();
                break;
 
-
        // Special casing for superscript in case of LyX handling
        // dead-keys:
        case LFUN_CIRCUMFLEX:
                if (cmd.argument.empty()) {
                        // do superscript if LyX handles
                        // deadkeys
-                       recordUndo(cur, Undo::ATOMIC);
-                       cur.script(true);
+                       //recordUndo(cur, Undo::ATOMIC);
+                       script(cur, true);
                }
                break;
 
@@ -540,44 +645,74 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                handleFont2(cur, cmd.argument);
                break;
 
-       case LFUN_BOLD:         handleFont(cur, cmd.argument, "mathbf"); break;
-       case LFUN_SANS:         handleFont(cur, cmd.argument, "mathsf"); break;
-       case LFUN_EMPH:         handleFont(cur, cmd.argument, "mathcal"); break;
-       case LFUN_ROMAN:        handleFont(cur, cmd.argument, "mathrm"); break;
-       case LFUN_CODE:         handleFont(cur, cmd.argument, "texttt"); break;
-       case LFUN_FRAK:         handleFont(cur, cmd.argument, "mathfrak"); break;
-       case LFUN_ITAL:         handleFont(cur, cmd.argument, "mathit"); break;
-       case LFUN_NOUN:         handleFont(cur, cmd.argument, "mathbb"); break;
-       //case LFUN_FREEFONT_APPLY:  handleFont(cur, cmd.argument, "textrm"); break;
-       case LFUN_DEFAULT:      handleFont(cur, cmd.argument, "textnormal"); break;
+       case LFUN_BOLD:
+               handleFont(cur, cmd.argument, "mathbf");
+               break;
+       case LFUN_SANS:
+               handleFont(cur, cmd.argument, "mathsf");
+               break;
+       case LFUN_EMPH:
+               handleFont(cur, cmd.argument, "mathcal");
+               break;
+       case LFUN_ROMAN:
+               handleFont(cur, cmd.argument, "mathrm");
+               break;
+       case LFUN_CODE:
+               handleFont(cur, cmd.argument, "texttt");
+               break;
+       case LFUN_FRAK:
+               handleFont(cur, cmd.argument, "mathfrak");
+               break;
+       case LFUN_ITAL:
+               handleFont(cur, cmd.argument, "mathit");
+               break;
+       case LFUN_NOUN:
+               handleFont(cur, cmd.argument, "mathbb");
+               break;
+       //case LFUN_FREEFONT_APPLY:
+               handleFont(cur, cmd.argument, "textrm");
+               break;
+       case LFUN_DEFAULT:
+               handleFont(cur, cmd.argument, "textnormal");
+               break;
 
        case LFUN_MATH_MODE:
-               if (cur.currentMode() == InsetBase::TEXT_MODE)
+#if 1
+               cur.macroModeClose();
+               cur.selClearOrDel();
+               cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
+               cur.posLeft();
+               cur.pushLeft(cur.nextInset());
+#else
+               if (currentMode() == InsetBase::TEXT_MODE)
                        cur.niceInsert(MathAtom(new MathHullInset("simple")));
                else
                        handleFont(cur, cmd.argument, "textrm");
                //cur.owner()->message(_("math text mode toggled"));
+#endif
                break;
 
        case LFUN_MATH_SIZE:
 #if 0
                if (!arg.empty()) {
-                       recordUndo(cur, Undo::ATOMIC);
+                       //recordUndo(cur, Undo::ATOMIC);
                        cur.setSize(arg);
                }
 #endif
                break;
 
        case LFUN_INSERT_MATRIX: {
-               recordUndo(cur, Undo::ATOMIC);
+               //recordUndo(cur, Undo::ATOMIC);
                unsigned int m = 1;
                unsigned int n = 1;
                string v_align;
                string h_align;
-               istringstream is(argument);
+               istringstream is(cmd.argument);
                is >> m >> n >> v_align >> h_align;
-               m = max(1u, m);
-               n = max(1u, n);
+               if (m < 1)
+                       m = 1;
+               if (n < 1)
+                       n = 1;
                v_align += 'c';
                cur.niceInsert(
                        MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
@@ -585,74 +720,54 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
        }
 
        case LFUN_MATH_DELIM: {
-               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'" << endl;
+               lyxerr << "MathNestInset::LFUN_MATH_DELIM" << endl;
                string ls;
-               string rs = split(cmd.argument, ls, ' ');
+               string rs = lyx::support::split(cmd.argument, ls, ' ');
                // Reasonable default values
                if (ls.empty())
                        ls = '(';
                if (rs.empty())
                        rs = ')';
-               recordUndo(cur, Undo::ATOMIC);
+               //recordUndo(cur, Undo::ATOMIC);
                cur.handleNest(MathAtom(new MathDelimInset(ls, rs)));
                break;
        }
 
        case LFUN_SPACE_INSERT:
        case LFUN_MATH_SPACE:
-               recordUndo(cur, Undo::ATOMIC);
+               //recordUndo(cur, Undo::ATOMIC);
                cur.insert(MathAtom(new MathSpaceInset(",")));
                break;
 
        case LFUN_UNDO:
-               cur.bv().owner()->message(_("Invalid action in math mode!"));
-               break;
-
-
-       case LFUN_EXEC_COMMAND:
-               result = DispatchResult(false);
+#warning look here
+               //cur.bv().owner()->message(_("Invalid action in math mode!"));
                break;
 
        case LFUN_INSET_ERT:
                // interpret this as if a backslash was typed
-               recordUndo(cur, Undo::ATOMIC);
-               cur.interpret('\\');
+               //recordUndo(cur, Undo::ATOMIC);
+               interpret(cur, '\\');
                break;
 
-       case LFUN_BREAKPARAGRAPH:
-       case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
-       case LFUN_BREAKPARAGRAPH_SKIP:
-               argument = "\n";
-               // fall through
-
 // FIXME: We probably should swap parts of "math-insert" and "self-insert"
 // handling such that "self-insert" works on "arbitrary stuff" too, and
 // math-insert only handles special math things like "matrix".
        case LFUN_INSERT_MATH:
-               recordUndo(cur, Undo::ATOMIC);
-               cur.niceInsert(argument);
-               break;
-
-       case LFUN_INSET_TOGGLE:
-               cur.lockToggle();
-               break;
-
-       case LFUN_DIALOG_SHOW:
-               result = DispatchResult(false);
+               //recordUndo(cur, Undo::ATOMIC);
+               cur.niceInsert(cmd.argument);
                break;
 
        case LFUN_DIALOG_SHOW_NEW_INSET: {
-               string const & name = argument;
+               string const & name = cmd.argument;
                string data;
+#if 0
                if (name == "ref") {
                        RefInset tmp(name);
                        data = tmp.createDialogStr(name);
                }
-
-               if (data.empty())
-                       result = DispatchResult(false);
-               else
-                       cur.bv().owner()->getDialogs().show(name, data, 0);
+#endif
+               cur.bv().owner()->getDialogs().show(name, data, 0);
                break;
        }
 
@@ -661,45 +776,26 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                InsetBase * base = cur.bv().owner()->getDialogs().getOpenInset(name);
 
                if (base) {
-                       FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
-                       result = base->dispatch(cur, fr);
-               } else {
-                       MathArray ar;
-                       if (createMathInset_fromDialogStr(cmd.argument, ar)) {
-                               cur.insert(ar);
-                               result = DispatchResult(true, true);
-                       } else {
-                               result = DispatchResult(false);
-                       }
+                       base->dispatch(cur, FuncRequest(LFUN_INSET_MODIFY, cmd.argument));
+                       break;
                }
-               break;
-       }
-
-       case LFUN_WORD_REPLACE:
-       case LFUN_WORD_FIND: {
-               result = 
-                       searchForward(&cur.bv(), cmd.getArg(0), false, false)
-                               ? DispatchResult(true, true) : DispatchResult(false);
-               break;
-       }
-
-       case LFUN_INSERT_MATH:
-       case LFUN_INSERT_MATRIX:
-       case LFUN_MATH_DELIM: {
-               MathHullInset * f = new MathHullInset;
-               if (openNewInset(cur, f)) {
-                       cur.inset()->dispatch(cur, FuncRequest(LFUN_MATH_MUTATE, "simple"));
-                       cur.inset()->dispatch(cur, cmd);
+               MathArray ar;
+               if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                       cur.insert(ar);
+                       break;
                }
+               cur.undispatched();
                break;
        }
 
-       default:
-               result = DispatchResult(false);
-       }
+#warning look here
+#if 0
 
-       if (result == DispatchResult(true, true))
-               cur.bv().update();
+       case LFUN_WORD_REPLACE:
+       case LFUN_WORD_FIND:
+               if (!searchForward(&cur.bv(), cmd.getArg(0), false, false))
+                       cur.undispatched();
+               break;
 
        cur.normalize();
        cur.touch();
@@ -710,57 +806,300 @@ MathNestInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                revealCodes(cur);
                cur.bv().stuffClipboard(cur.grabSelection());
        } else {
-               cur.releaseMathCursor();
                if (remove_inset)
                        cur.bv().owner()->dispatch(FuncRequest(LFUN_DELETE));
        }
-
-       return result;  // original version
+       break;
 #endif
 
        default:
-               return MathInset::priv_dispatch(cur, cmd);
+               MathDimInset::priv_dispatch(cur, cmd);
+               break;
        }
 }
 
 
-void MathNestInset::metricsMarkers(int) const
+void MathNestInset::edit(LCursor & cur, bool left)
 {
-       dim_.wid += 2;
-       dim_.asc += 1;
+       cur.push(this);
+       cur.idx() = left ? 0 : cur.lastidx();
+       cur.pos() = left ? 0 : cur.lastpos();
+       cur.resetAnchor();
 }
 
 
-void MathNestInset::metricsMarkers2(int) const
+InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y)
 {
-       dim_.wid += 2;
-       dim_.asc += 1;
-       dim_.des += 1;
+       int idx_min = 0;
+       int dist_min = 1000000;
+       for (idx_type i = 0; i < nargs(); ++i) {
+               int d = cell(i).dist(x, y);
+               if (d < dist_min) {
+                       dist_min = d;
+                       idx_min = i;
+               }
+       }
+       MathArray & ar = cell(idx_min);
+       cur.push(this);
+       cur.idx() = idx_min;
+       cur.pos() = ar.x2pos(x - ar.xo());
+       lyxerr << "found cell : " << idx_min << " pos: " << cur.pos() << endl;
+       if (dist_min == 0) {
+               // hit inside cell
+               for (pos_type i = 0, n = ar.size(); i < n; ++i)
+                       if (ar[i]->covers(x, y))
+                               return ar[i].nucleus()->editXY(cur, x, y);
+       }
+       return this;
 }
 
 
-void MathNestInset::drawMarkers(PainterInfo & pi, int x, int y) const
+void MathNestInset::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
 {
-       if (!editing(pi.base.bv))
+       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
+
+       if (cmd.button() == mouse_button::button1) {
+               // try to dispatch to enclosed insets first
+               //cur.bv().stuffClipboard(cur.grabSelection());
                return;
-       int t = x + dim_.width() - 1;
-       int d = y + dim_.descent();
-       pi.pain.line(x, d - 3, x, d, LColor::mathframe);
-       pi.pain.line(t, d - 3, t, d, LColor::mathframe);
-       pi.pain.line(x, d, x + 3, d, LColor::mathframe);
-       pi.pain.line(t - 3, d, t, d, LColor::mathframe);
+       }
+
+       if (cmd.button() == mouse_button::button2) {
+               MathArray ar;
+               asArray(cur.bv().getClipboard(), ar);
+               cur.selClear();
+               cur.setScreenPos(cmd.x, cmd.y);
+               cur.insert(ar);
+               cur.bv().update();
+               return;
+       }
+
+       if (cmd.button() == mouse_button::button3) {
+               // try to dispatch to enclosed insets first
+               cur.bv().owner()->getDialogs().show("mathpanel");
+               return;
+       }
+
+       cur.undispatched();
+}
+
+
+void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest const & cmd)
+{
+       lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
+       if (cmd.button() == mouse_button::button1) {
+               first_x = cmd.x;
+               first_y = cmd.y;
+               cur.selClear();
+               //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
+               lyxerr << "lfunMousePress: setting cursor to: " << cur << endl;
+               cur.bv().cursor() = cur;
+       }
+
+       if (cmd.button() == mouse_button::button2) {
+               priv_dispatch(cur, FuncRequest(LFUN_PASTESELECTION));
+       }
 }
 
 
-void MathNestInset::drawMarkers2(PainterInfo & pi, int x, int y) const
+void MathNestInset::lfunMouseMotion(LCursor & cur, FuncRequest const & cmd)
 {
-       if (!editing(pi.base.bv))
+       // only select with button 1
+       if (cmd.button() != mouse_button::button1)
+               return;
+
+       if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
                return;
-       drawMarkers(pi, x, y);
-       int t = x + dim_.width() - 1;
-       int a = y - dim_.ascent();
-       pi.pain.line(x, a + 3, x, a, LColor::mathframe);
-       pi.pain.line(t, a + 3, t, a, LColor::mathframe);
-       pi.pain.line(x, a, x + 3, a, LColor::mathframe);
-       pi.pain.line(t - 3, a, t, a, LColor::mathframe);
+
+       first_x = cmd.x;
+       first_y = cmd.y;
+
+       if (!cur.selection())
+               cur.selBegin();
+
+       //cur.setScreenPos(cmd.x + xo_, cmd.y + yo_);
+       cur.bv().cursor().setCursor(cur, true);
+}
+
+
+bool MathNestInset::interpret(LCursor & cur, char c)
+{
+       //lyxerr << "interpret 2: '" << c << "'" << endl;
+       cur.clearTargetX();
+       if (cur.inMacroArgMode()) {
+               cur.posLeft();
+               cur.plainErase();
+#warning FIXME
+#if 0
+               int n = c - '0';
+               MathMacroTemplate const * p = formula()->asMacroTemplate();
+               if (p && 1 <= n && n <= p->numargs())
+                       cur.insert(MathAtom(new MathMacroArgument(c - '0')));
+               else {
+                       cur.insert(createMathInset("#"));
+                       interpret(cur, c); // try again
+               }
+#endif
+               return true;
+       }
+
+       // handle macroMode
+       if (cur.inMacroMode()) {
+               string name = cur.macroName();
+               //lyxerr << "interpret name: '" << name << "'" << endl;
+
+               if (isalpha(c)) {
+                       cur.activeMacro()->setName(cur.activeMacro()->name() + c);
+                       return true;
+               }
+
+               // handle 'special char' macros
+               if (name == "\\") {
+                       // remove the '\\'
+                       cur.backspace();
+                       if (c == '\\') {
+                               if (currentMode() == MathInset::TEXT_MODE)
+                                       cur.niceInsert(createMathInset("textbackslash"));
+                               else
+                                       cur.niceInsert(createMathInset("backslash"));
+                       } else if (c == '{') {
+                               cur.niceInsert(MathAtom(new MathBraceInset));
+                       } else {
+                               cur.niceInsert(createMathInset(string(1, c)));
+                       }
+                       return true;
+               }
+
+               // leave macro mode and try again if necessary
+               cur.macroModeClose();
+               if (c == '{')
+                       cur.niceInsert(MathAtom(new MathBraceInset));
+               else if (c != ' ')
+                       interpret(cur, c);
+               return true;
+       }
+
+       // This is annoying as one has to press <space> far too often.
+       // Disable it.
+
+#if 0
+               // leave autocorrect mode if necessary
+               if (autocorrect() && c == ' ') {
+                       autocorrect() = false;
+                       return true;
+               }
+#endif
+
+       // just clear selection on pressing the space bar
+       if (cur.selection() && c == ' ') {
+               cur.selection() = false;
+               return true;
+       }
+
+       cur.selClearOrDel();
+
+       if (c == '\\') {
+               //lyxerr << "starting with macro" << endl;
+               cur.insert(MathAtom(new MathUnknownInset("\\", false)));
+               return true;
+       }
+
+       if (c == '\n') {
+               if (currentMode() == MathInset::TEXT_MODE)
+                       cur.insert(c);
+               return true;
+       }
+
+       if (c == ' ') {
+               if (currentMode() == MathInset::TEXT_MODE) {
+                       // insert spaces in text mode,
+                       // but suppress direct insertion of two spaces in a row
+                       // the still allows typing  '<space>a<space>' and deleting the 'a', but
+                       // it is better than nothing...
+                       if (!cur.pos() != 0 || cur.prevAtom()->getChar() != ' ')
+                               cur.insert(c);
+                       return true;
+               }
+               if (cur.pos() != 0 && cur.prevAtom()->asSpaceInset()) {
+                       cur.prevAtom().nucleus()->asSpaceInset()->incSpace();
+                       return true;
+               }
+               if (cur.popRight())
+                       return true;
+               // if are at the very end, leave the formula
+               return cur.pos() != cur.lastpos();
+       }
+
+       if (c == '_') {
+               script(cur, false);
+               return true;
+       }
+
+       if (c == '^') {
+               script(cur, true);
+               return true;
+       }
+
+       if (c == '{' || c == '}' || c == '#' || c == '&' || c == '$') {
+               cur.niceInsert(createMathInset(string(1, c)));
+               return true;
+       }
+
+       if (c == '%') {
+               cur.niceInsert(MathAtom(new MathCommentInset));
+               return true;
+       }
+
+       // try auto-correction
+       //if (autocorrect() && hasPrevAtom() && math_autocorrect(prevAtom(), c))
+       //      return true;
+
+       // no special circumstances, so insert the character without any fuss
+       cur.insert(c);
+       cur.autocorrect() = true;
+       return true;
+}
+
+
+bool MathNestInset::script(LCursor & cur, bool up)
+{
+       // Hack to get \\^ and \\_ working
+       lyxerr << "handling script: up: " << up << endl;
+       if (cur.inMacroMode() && cur.macroName() == "\\") {
+               if (up)
+                       cur.niceInsert(createMathInset("mathcircumflex"));
+               else
+                       interpret(cur, '_');
+               return true;
+       }
+
+       cur.macroModeClose();
+       string safe = cur.grabAndEraseSelection();
+       if (asScriptInset() && cur.idx() == 2) {
+               // we are in a nucleus of a script inset, move to _our_ script
+               asScriptInset()->ensure(up);
+               cur.idx() = up;
+               cur.pos() = 0;
+       } else if (cur.pos() != 0 && cur.prevAtom()->asScriptInset()) {
+               --cur.pos();
+               cur.nextAtom().nucleus()->asScriptInset()->ensure(up);
+               cur.push(cur.nextInset());
+               cur.idx() = up;
+               cur.pos() = cur.lastpos();
+       } else if (cur.pos() != 0) {
+               --cur.pos();
+               cur.cell()[cur.pos()] = MathAtom(new MathScriptInset(cur.nextAtom(), up));
+               cur.push(cur.nextInset());
+               cur.idx() = up;
+               cur.pos() = 0;
+       } else {
+               cur.plainInsert(MathAtom(new MathScriptInset(up)));
+               --cur.pos();
+               cur.nextAtom().nucleus()->asScriptInset()->ensure(up);
+               cur.push(cur.nextInset());
+               cur.idx() = up;
+               cur.pos() = 0;
+       }
+       cur.paste(safe);
+       return true;
 }