]> git.lyx.org Git - lyx.git/blobdiff - src/text3.C
float2string #4 (Spacing)
[lyx.git] / src / text3.C
index 679b1190ed69cd5b26fcc3f7eb81f4beb561d856..479216bda0e7a5cb9a2ee772cb7c523960b4570b 100644 (file)
 
 #include "lyxtext.h"
 
+#include "FloatList.h"
+#include "FuncStatus.h"
 #include "buffer.h"
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "cursor.h"
+#include "coordcache.h"
+#include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
 #include "factory.h"
-#include "FloatList.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "intl.h"
 #include "insets/insetcommand.h"
 #include "insets/insetfloatlist.h"
 #include "insets/insetnewline.h"
+#include "insets/insetquotes.h"
 #include "insets/insetspecialchar.h"
 #include "insets/insettext.h"
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
 #include "mathed/math_hullinset.h"
-#include "mathed/formulamacro.h"
+#include "mathed/math_macrotemplate.h"
 
 #include <clocale>
+#include <sstream>
 
 using lyx::pos_type;
 
+using lyx::cap::copySelection;
+using lyx::cap::cutSelection;
+using lyx::cap::pasteSelection;
+using lyx::cap::replaceSelection;
+
 using lyx::support::isStrUnsignedInt;
 using lyx::support::strToUnsignedInt;
 using lyx::support::atoi;
@@ -74,10 +83,6 @@ using std::vector;
 
 extern string current_layout;
 
-// the selection possible is needed, that only motion events are
-// used, where the button press event was on the drawing area too
-bool selection_possible = false;
-
 
 namespace {
 
@@ -89,23 +94,19 @@ namespace {
        void toggleAndShow(LCursor & cur, LyXText * text,
                LyXFont const & font, bool toggleall = true)
        {
-               if (!cur.bv().available())
-                       return;
-
                text->toggleFree(cur, font, toggleall);
 
                if (font.language() != ignore_language ||
                                font.number() != LyXFont::IGNORE) {
                        Paragraph & par = cur.paragraph();
-                       text->bidi.computeTables(par, *cur.bv().buffer(), cur.textRow());
+                       text->bidi.computeTables(par, cur.buffer(), cur.textRow());
                        if (cur.boundary() !=
-                                       text->bidi.isBoundary(*cur.bv().buffer(), par,
+                                       text->bidi.isBoundary(cur.buffer(), par,
                                                        cur.pos(),
                                                        text->real_current_font))
-                               text->setCursor(cur, cur.par(), cur.pos(),
+                               text->setCursor(cur, cur.pit(), cur.pos(),
                                                false, !cur.boundary());
                }
-               cur.update();
        }
 
 
@@ -119,44 +120,47 @@ namespace {
        }
 
 
-       void finishChange(LCursor & cur, bool selecting = false)
+       void finishChange(LCursor & cur, bool selecting)
        {
                finishUndo();
                moveCursor(cur, selecting);
-               cur.bv().owner()->view_state_changed();
        }
 
 
-       void mathDispatch(LCursor & cur, LyXText * text,
-               FuncRequest const & cmd, bool display)
+       void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
        {
+               recordUndo(cur);
                string sel = cur.selectionAsString(false);
                lyxerr << "selection is: '" << sel << "'" << endl;
 
                if (sel.empty()) {
+                       const int old_pos = cur.pos();
                        cur.insert(new MathHullInset);
-                       cur.dispatch(FuncRequest(LFUN_RIGHT));
+                       BOOST_ASSERT(old_pos == cur.pos());
+                       cur.nextInset()->edit(cur, true);
                        cur.dispatch(FuncRequest(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
-                       // -- I really hate "LyXfunc overloading"...
+                       // don't do that also for LFUN_MATH_MODE
+                       // unless you want end up with always changing
+                       // to mathrm when opening an inlined inset --
+                       // I really hate "LyXfunc overloading"...
                        if (display)
                                cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
                        cur.dispatch(FuncRequest(LFUN_INSERT_MATH, cmd.argument));
                } else {
-                       // create a macro if we see "\\newcommand" somewhere, and an ordinary
-                       // formula otherwise
-                       text->cutSelection(cur, true, true);
-                       if (sel.find("\\newcommand") == string::npos &&
-                                       sel.find("\\def") == string::npos)
+                       // create a macro if we see "\\newcommand"
+                       // somewhere, and an ordinary formula
+                       // otherwise
+                       cutSelection(cur, true, true);
+                       if (sel.find("\\newcommand") == string::npos
+                           && sel.find("\\def") == string::npos)
                        {
                                cur.insert(new MathHullInset);
                                cur.dispatch(FuncRequest(LFUN_RIGHT));
                                cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
                                cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
                        } else {
-                               cur.insert(new InsetFormulaMacro(sel));
-                               cur.dispatch(FuncRequest(LFUN_RIGHT));
+                               istringstream is(sel);
+                               cur.insert(new MathMacroTemplate(is));
                        }
                }
                cur.message(N_("Math editor mode"));
@@ -178,53 +182,17 @@ string const freefont2string()
 
 }
 
-
-//takes absolute x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y)
-{
-       ParagraphList::iterator pit;
-       ParagraphList::iterator end;
-
-       getParsInRange(paragraphs(),
-                      bv()->top_y() - yo_,
-                      bv()->top_y() - yo_ + bv()->workHeight(),
-                      pit, end);
-
-       lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl;
-       for ( ; pit != end; ++pit) {
-               InsetList::iterator iit = pit->insetlist.begin();
-               InsetList::iterator iend = pit->insetlist.end();
-               for ( ; iit != iend; ++iit) {
-                       InsetBase * inset = iit->inset;
-#if 1
-                       lyxerr << "examining inset " << inset
-                       //<< " xo/yo: " << inset->xo() << "/" << inset->yo()
-                               << " xo: " << inset->xo() << "..." << inset->xo() + inset->width()
-                               << " yo: " << inset->yo() - inset->ascent() << "..."
-                               << inset->yo() + inset->descent() << endl;
-#endif
-                       if (inset->covers(x, y)) {
-                               lyxerr << "Hit inset: " << inset << endl;
-                               return inset;
-                       }
-               }
-       }
-       lyxerr << "No inset hit. " << endl;
-       return 0;
-}
-
-
 bool LyXText::gotoNextInset(LCursor & cur,
-       vector<InsetOld_code> const & codes, string const & contents)
+       vector<InsetBase_code> const & codes, string const & contents)
 {
        BOOST_ASSERT(this == cur.text());
-       ParagraphList::iterator end = paragraphs().end();
-       ParagraphList::iterator pit = getPar(cur.par());
+       pit_type end = paragraphs().size();
+       pit_type pit = cur.pit();
        pos_type pos = cur.pos();
 
        InsetBase * inset;
        do {
-               if (pos + 1 < pit->size()) {
+               if (pos + 1 < pars_[pit].size()) {
                        ++pos;
                } else  {
                        ++pit;
@@ -232,23 +200,23 @@ bool LyXText::gotoNextInset(LCursor & cur,
                }
 
        } while (pit != end &&
-                !(pit->isInset(pos) &&
-                  (inset = pit->getInset(pos)) != 0 &&
+                !(pars_[pit].isInset(pos) &&
+                  (inset = pars_[pit].getInset(pos)) != 0 &&
                   find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
                   (contents.empty() ||
-                   static_cast<InsetCommand *>(pit->getInset(pos))->getContents()
+                   static_cast<InsetCommand *>(pars_[pit].getInset(pos))->getContents()
                    == contents)));
 
        if (pit == end)
                return false;
 
-       setCursor(cur, parOffset(pit), pos, false);
+       setCursor(cur, pit, pos, false);
        return true;
 }
 
 
 void LyXText::gotoInset(LCursor & cur,
-       vector<InsetOld_code> const & codes, bool same_content)
+       vector<InsetBase_code> const & codes, bool same_content)
 {
        cur.clearSelection();
 
@@ -263,45 +231,45 @@ void LyXText::gotoInset(LCursor & cur,
        }
 
        if (!gotoNextInset(cur, codes, contents)) {
-               if (cur.pos() || cur.par() != 0) {
-                       CursorSlice tmp = cur.current();
-                       cur.par() = 0;
+               if (cur.pos() || cur.pit() != 0) {
+                       CursorSlice tmp = cur.top();
+                       cur.pit() = 0;
                        cur.pos() = 0;
                        if (!gotoNextInset(cur, codes, contents)) {
-                               cursor() = tmp;
+                               cur.top() = tmp;
                                cur.message(_("No more insets"));
                        }
                } else {
                        cur.message(_("No more insets"));
                }
        }
-       cur.update();
        cur.resetAnchor();
 }
 
 
-void LyXText::gotoInset(LCursor & cur, InsetOld_code code, bool same_content)
+void LyXText::gotoInset(LCursor & cur, InsetBase_code code, bool same_content)
 {
-       gotoInset(cur, vector<InsetOld_code>(1, code), same_content);
+       gotoInset(cur, vector<InsetBase_code>(1, code), same_content);
 }
 
 
 void LyXText::cursorPrevious(LCursor & cur)
 {
        pos_type cpos = cur.pos();
-       lyx::paroffset_type cpar = cur.par();
+       lyx::pit_type cpar = cur.pit();
 
        int x = cur.x_target();
-       int y = bv()->top_y();
-       setCursorFromCoordinates(cur, x, y);
 
-       if (cpar == cur.par() && cpos == cur.pos()) {
+       setCursorFromCoordinates(cur, x, 0);
+       cursorUp(cur);
+
+       if (cpar == cur.pit() && cpos == cur.pos()) {
                // we have a row which is taller than the workarea. The
                // simplest solution is to move to the previous row instead.
-               cursorUp(cur, true);
+               cursorUp(cur);
        }
 
-       bv()->updateScrollbar();
+       cur.bv().updateScrollbar();
        finishUndo();
 }
 
@@ -309,30 +277,30 @@ void LyXText::cursorPrevious(LCursor & cur)
 void LyXText::cursorNext(LCursor & cur)
 {
        pos_type cpos = cur.pos();
-       lyx::paroffset_type cpar = cur.par();
+       lyx::pit_type cpar = cur.pit();
 
        int x = cur.x_target();
-       int y = bv()->top_y() + bv()->workHeight();
-       setCursorFromCoordinates(cur, x, y);
+       setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+       cursorDown(cur);
 
-       if (cpar == cur.par() && cpos == cur.pos()) {
+       if (cpar == cur.pit() && cpos == cur.pos()) {
                // we have a row which is taller than the workarea. The
                // simplest solution is to move to the next row instead.
-               cursorDown(cur, true);
+               cursorDown(cur);
        }
 
-       bv()->updateScrollbar();
+       cur.bv().updateScrollbar();
        finishUndo();
 }
 
 
 namespace {
 
-void specialChar(LCursor & cur, LyXText * text, InsetSpecialChar::Kind kind)
+void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
 {
-       text->replaceSelection(cur);
+       lyx::cap::replaceSelection(cur);
        cur.insert(new InsetSpecialChar(kind));
-       cur.update();
+       cur.posRight();
 }
 
 
@@ -343,18 +311,30 @@ void doInsertInset(LCursor & cur, LyXText * text,
        if (!inset)
                return;
 
+       recordUndo(cur);
        bool gotsel = false;
        if (cur.selection()) {
                cur.bv().owner()->dispatch(FuncRequest(LFUN_CUT));
                gotsel = true;
        }
        text->insertInset(cur, inset);
+
        if (edit)
                inset->edit(cur, true);
+
        if (gotsel && pastesel)
                cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
 }
 
+
+void update(LCursor & cur)
+{
+       //we don't call update(true, false) directly to save a metrics call
+       if (cur.bv().fitCursor())
+               cur.bv().update(false, true);
+}
+
+
 } // anon namespace
 
 
@@ -366,18 +346,22 @@ void LyXText::number(LCursor & cur)
 }
 
 
-bool LyXText::rtl(LCursor & cur) const
+bool LyXText::isRTL(Paragraph const & par) const
 {
-       return getPar(cur.par())->isRightToLeftPar(bv()->buffer()->params());
+       return par.isRightToLeftPar(bv()->buffer()->params());
 }
 
 
-DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
+void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 {
        lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
        //lyxerr << "*** LyXText::dispatch: cmd: " << cmd << endl;
 
+       BOOST_ASSERT(cur.text() == this);
        BufferView * bv = &cur.bv();
+       CursorSlice sl = cur.top();
+       bool sel = cur.selection();
+       bool moving = false;
 
        switch (cmd.action) {
 
@@ -386,14 +370,10 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                bool start = !par.params().startOfAppendix();
 
                // ensure that we have only one start_of_appendix in this document
-               ParagraphList::iterator tmp = paragraphs().begin();
-               ParagraphList::iterator end = paragraphs().end();
-
-               for (; tmp != end; ++tmp) {
-                       if (tmp->params().startOfAppendix()) {
-                               recUndo(parOffset(tmp));
-                               tmp->params().startOfAppendix(false);
-                               redoParagraph(tmp);
+               for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
+                       if (pars_[tmp].params().startOfAppendix()) {
+                               recUndo(tmp);
+                               pars_[tmp].params().startOfAppendix(false);
                                break;
                        }
                }
@@ -403,95 +383,147 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
 
                // we can set the refreshing parameters now
                updateCounters();
-               redoParagraph(cur);
-               cur.update();
                break;
        }
 
        case LFUN_DELETE_WORD_FORWARD:
                cur.clearSelection();
                deleteWordForward(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_DELETE_WORD_BACKWARD:
                cur.clearSelection();
                deleteWordBackward(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_DELETE_LINE_FORWARD:
                cur.clearSelection();
                deleteLineForward(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_WORDRIGHT:
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
-               if (rtl(cur))
+               if (isRTL(cur.paragraph()))
                        cursorLeftOneWord(cur);
                else
                        cursorRightOneWord(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_WORDLEFT:
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
-               if (rtl(cur))
+               if (isRTL(cur.paragraph()))
                        cursorRightOneWord(cur);
                else
                        cursorLeftOneWord(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_BEGINNINGBUF:
-               if (!cur.mark())
-                       cur.clearSelection();
-               cursorTop(cur);
-               finishChange(cur);
+               if (cur.size() == 1) {
+                       if (!cur.mark())
+                               cur.clearSelection();
+                       cursorTop(cur);
+                       finishChange(cur, false);
+               } else {
+                       cur.undispatched();
+               }
+               break;
+
+       case LFUN_BEGINNINGBUFSEL:
+               if (cur.size() == 1) {
+                       if (!cur.selection())
+                               cur.resetAnchor();
+                       cursorTop(cur);
+                       finishChange(cur, true);
+               } else {
+                       cur.undispatched();
+               }
                break;
 
        case LFUN_ENDBUF:
-               if (!cur.mark())
-                       cur.clearSelection();
-               cursorBottom(cur);
-               finishChange(cur);
+               if (cur.size() == 1) {
+                       if (!cur.mark())
+                               cur.clearSelection();
+                       cursorBottom(cur);
+                       finishChange(cur, false);
+               } else {
+                       cur.undispatched();
+               }
+               break;
+               
+       case LFUN_ENDBUFSEL:
+               if (cur.size() == 1) {
+                       if (!cur.selection())
+                               cur.resetAnchor();
+                       cursorBottom(cur);
+                       finishChange(cur, true);
+               } else {
+                       cur.undispatched();
+               }
                break;
 
+       case LFUN_RIGHT:
+               moving = true;
        case LFUN_RIGHTSEL:
-               if (!cur.selection())
-                       cur.resetAnchor();
-               if (rtl(cur))
-                       cursorLeft(cur, true);
+               //lyxerr << "handle LFUN_RIGHT[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_RIGHTSEL);
+               if (isRTL(cur.paragraph()))
+                       cursorLeft(cur);
                else
-                       cursorRight(cur, true);
-               finishChange(cur, true);
+                       cursorRight(cur);
+               if (sl == cur.top()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+               }
                break;
 
+       case LFUN_LEFT:
+               moving = true;
        case LFUN_LEFTSEL:
-               if (!cur.selection())
-                       cur.resetAnchor();
-               if (rtl(cur))
-                       cursorRight(cur, true);
+               //lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_LEFTSEL);
+               if (isRTL(cur.paragraph()))
+                       cursorRight(cur);
                else
-                       cursorLeft(cur, true);
-               finishChange(cur, true);
+                       cursorLeft(cur);
+               if (sl == cur.top()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
+               }
                break;
 
+       case LFUN_UP:
+               moving = true;
        case LFUN_UPSEL:
-               if (!cur.selection())
-                       cur.resetAnchor();
-               cursorUp(cur, true);
-               finishChange(cur, true);
+               update(cur);
+               //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_UPSEL);
+               cursorUp(cur);
+               if (sl == cur.top()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_UP);
+               }
                break;
 
+       case LFUN_DOWN:
+               moving = true;
        case LFUN_DOWNSEL:
-               if (!cur.selection())
-                       cur.resetAnchor();
-               cursorDown(cur, true);
-               finishChange(cur, true);
+               update(cur);
+               //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_DOWNSEL);
+               cursorDown(cur);
+               if (sl == cur.top()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_DOWN);
+               }
                break;
 
        case LFUN_UP_PARAGRAPHSEL:
@@ -509,6 +541,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_PRIORSEL:
+               update(cur);
                if (!cur.selection())
                        cur.resetAnchor();
                cursorPrevious(cur);
@@ -516,6 +549,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_NEXTSEL:
+               update(cur);
                if (!cur.selection())
                        cur.resetAnchor();
                cursorNext(cur);
@@ -523,6 +557,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_HOMESEL:
+               update(cur);
                if (!cur.selection())
                        cur.resetAnchor();
                cursorHome(cur);
@@ -530,6 +565,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_ENDSEL:
+               update(cur);
                if (!cur.selection())
                        cur.resetAnchor();
                cursorEnd(cur);
@@ -539,7 +575,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        case LFUN_WORDRIGHTSEL:
                if (!cur.selection())
                        cur.resetAnchor();
-               if (rtl(cur))
+               if (isRTL(cur.paragraph()))
                        cursorLeftOneWord(cur);
                else
                        cursorRightOneWord(cur);
@@ -549,7 +585,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        case LFUN_WORDLEFTSEL:
                if (!cur.selection())
                        cur.resetAnchor();
-               if (rtl(cur))
+               if (isRTL(cur.paragraph()))
                        cursorRightOneWord(cur);
                else
                        cursorLeftOneWord(cur);
@@ -562,30 +598,16 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_RIGHT:
-               finishChange(cur);
-               return moveRight(cur);
-
-       case LFUN_LEFT:
-               finishChange(cur);
-               return moveLeft(cur);
-
-       case LFUN_UP:
-               finishChange(cur);
-               return moveUp(cur);
-
-       case LFUN_DOWN:
-               finishChange(cur);
-               return moveDown(cur);
-
        case LFUN_UP_PARAGRAPH:
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
                cursorUpParagraph(cur);
-               finishChange(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_DOWN_PARAGRAPH:
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
                cursorDownParagraph(cur);
@@ -593,22 +615,32 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_PRIOR:
+               update(cur);
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
                finishChange(cur, false);
-               if (cur.par() == 0 && cur.textRow().pos() == 0)
-                       return DispatchResult(false, FINISHED_UP);
-               cursorPrevious(cur);
+               if (cur.pit() == 0 && cur.textRow().pos() == 0) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_UP);
+               } else {
+                       cursorPrevious(cur);
+               }
                break;
 
        case LFUN_NEXT:
+               update(cur);
+               moving = true;
                if (!cur.mark())
                        cur.clearSelection();
                finishChange(cur, false);
-               if (cur.par() == cur.lastpar()
-                         && cur.textRow().endpos() == cur.lastpos())
-                       return DispatchResult(false, FINISHED_DOWN);
-               cursorNext(cur);
+               if (cur.pit() == cur.lastpit()
+                         && cur.textRow().endpos() == cur.lastpos()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_DOWN);
+               } else {
+                       cursorNext(cur);
+               }
                break;
 
        case LFUN_HOME:
@@ -628,8 +660,9 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        case LFUN_BREAKLINE: {
                // Not allowed by LaTeX (labels or empty par)
                if (cur.pos() > cur.paragraph().beginOfBody()) {
-                       replaceSelection(cur);
+                       lyx::cap::replaceSelection(cur);
                        cur.insert(new InsetNewline);
+                       cur.posRight();
                        moveCursor(cur, false);
                }
                break;
@@ -645,22 +678,20 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        cutSelection(cur, true, false);
                }
                moveCursor(cur, false);
-               bv->owner()->view_state_changed();
                break;
 
        case LFUN_DELETE_SKIP:
                // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
                if (!cur.selection()) {
                        if (cur.pos() == cur.lastpos()) {
-                               cursorRight(cur, true);
-                               cursorLeft(cur, true);
+                               cursorRight(cur);
+                               cursorLeft(cur);
                        }
                        Delete(cur);
                        cur.resetAnchor();
                } else {
                        cutSelection(cur, true, false);
                }
-               cur.update();
                break;
 
 
@@ -675,75 +706,62 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                } else {
                        cutSelection(cur, true, false);
                }
-               bv->owner()->view_state_changed();
                bv->switchKeyMap();
-               cur.update();
                break;
 
        case LFUN_BACKSPACE_SKIP:
                // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
                if (!cur.selection()) {
+#ifdef WITH_WARNINGS
 #warning look here
+#endif
                        //CursorSlice cur = cursor();
                        backspace(cur);
                        //anchor() = cur;
                } else {
                        cutSelection(cur, true, false);
                }
-               cur.update();
                break;
 
        case LFUN_BREAKPARAGRAPH:
-               replaceSelection(cur);
+               lyx::cap::replaceSelection(cur);
                breakParagraph(cur, 0);
-               cur.update();
                cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
 
        case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
-               replaceSelection(cur);
+               lyx::cap::replaceSelection(cur);
                breakParagraph(cur, 1);
-               cur.update();
                cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
 
        case LFUN_BREAKPARAGRAPH_SKIP: {
                // When at the beginning of a paragraph, remove
-               // indentation and add a "defskip" at the top.
-               // Otherwise, do the same as LFUN_BREAKPARAGRAPH.
-               replaceSelection(cur);
-               if (cur.pos() == 0) {
-                       ParagraphParameters & params = cur.paragraph().params();
-                       setParagraph(cur,
-                                       params.spacing(),
-                                       params.align(),
-                                       params.labelWidthString(), 1);
-               } else {
+               // indentation.  Otherwise, do the same as LFUN_BREAKPARAGRAPH.
+               lyx::cap::replaceSelection(cur);
+               if (cur.pos() == 0)
+                       cur.paragraph().params().labelWidthString(string());
+               else
                        breakParagraph(cur, 0);
-               }
-               cur.update();
-//     anchor() = cur;
+               cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
        }
 
        case LFUN_PARAGRAPH_SPACING: {
                Paragraph & par = cur.paragraph();
                Spacing::Space cur_spacing = par.params().spacing().getSpace();
-               float cur_value = 1.0;
+               string cur_value = "1.0";
                if (cur_spacing == Spacing::Other)
-                       cur_value = par.params().spacing().getValue();
+                       cur_value = par.params().spacing().getValueAsString();
 
                istringstream is(cmd.argument);
                string tmp;
                is >> tmp;
                Spacing::Space new_spacing = cur_spacing;
-               float new_value = cur_value;
+               string new_value = cur_value;
                if (tmp.empty()) {
                        lyxerr << "Missing argument to `paragraph-spacing'"
                               << endl;
@@ -755,10 +773,10 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        new_spacing = Spacing::Double;
                } else if (tmp == "other") {
                        new_spacing = Spacing::Other;
-                       float tmpval = 0.0;
+                       string tmpval = "0.0";
                        is >> tmpval;
                        lyxerr << "new_value = " << tmpval << endl;
-                       if (tmpval != 0.0)
+                       if (tmpval != "0.0")
                                new_value = tmpval;
                } else if (tmp == "default") {
                        new_spacing = Spacing::Default;
@@ -766,103 +784,112 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        lyxerr << _("Unknown spacing argument: ")
                               << cmd.argument << endl;
                }
-               if (cur_spacing != new_spacing || cur_value != new_value) {
+               if (cur_spacing != new_spacing || cur_value != new_value) 
                        par.params().spacing(Spacing(new_spacing, new_value));
-                       redoParagraph(cur);
-                       cur.update();
-               }
                break;
        }
 
        case LFUN_INSET_APPLY: {
                string const name = cmd.getArg(0);
                InsetBase * inset = bv->owner()->getDialogs().getOpenInset(name);
-               if (inset)
-                       inset->dispatch(cur, FuncRequest(LFUN_INSET_MODIFY, cmd.argument));
-               else
-                       dispatch(cur, FuncRequest(LFUN_INSET_INSERT, cmd.argument));
+               if (inset) {
+                       FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
+                       inset->dispatch(cur, fr);
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, cmd.argument);
+                       dispatch(cur, fr);
+               }
                break;
        }
 
        case LFUN_INSET_INSERT: {
+               recordUndo(cur);
                InsetBase * inset = createInset(bv, cmd);
-               if (inset)
+               if (inset) {
                        insertInset(cur, inset);
+                       cur.posRight();
+               }
                break;
        }
 
        case LFUN_INSET_SETTINGS:
-               if (cur.inset() && cur.inset()->asUpdatableInset())
-                       cur.inset()->asUpdatableInset()->showInsetDialog(bv);
+               if (cur.inset().asUpdatableInset())
+                       cur.inset().asUpdatableInset()->showInsetDialog(bv);
+               break;
+
+       case LFUN_NEXT_INSET_TOGGLE: {
+               InsetBase * inset = cur.nextInset();
+               if (inset) {
+                       cur.clearSelection();
+                       FuncRequest fr = cmd;
+                       fr.action = LFUN_INSET_TOGGLE;
+                       inset->dispatch(cur, fr);
+               }
                break;
+       }
 
-       case LFUN_INSET_TOGGLE:
+       case LFUN_KEYMAP_TOGGLE:
                cur.clearSelection();
-               if (!toggleInset(cur))
-                       return DispatchResult(false);
-               cur.update();
                bv->switchKeyMap();
                break;
 
        case LFUN_SPACE_INSERT:
                if (cur.paragraph().layout()->free_spacing)
                        insertChar(cur, ' ');
-               else
+               else {
                        doInsertInset(cur, this, cmd, false, false);
+                       cur.posRight();
+               }
                moveCursor(cur, false);
                break;
 
        case LFUN_HYPHENATION:
-               specialChar(cur, this, InsetSpecialChar::HYPHENATION);
+               specialChar(cur, InsetSpecialChar::HYPHENATION);
                break;
 
        case LFUN_LIGATURE_BREAK:
-               specialChar(cur, this, InsetSpecialChar::LIGATURE_BREAK);
+               specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
                break;
 
        case LFUN_LDOTS:
-               specialChar(cur, this, InsetSpecialChar::LDOTS);
+               specialChar(cur, InsetSpecialChar::LDOTS);
                break;
 
        case LFUN_END_OF_SENTENCE:
-               specialChar(cur, this, InsetSpecialChar::END_OF_SENTENCE);
+               specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
                break;
 
        case LFUN_MENU_SEPARATOR:
-               specialChar(cur, this, InsetSpecialChar::MENU_SEPARATOR);
+               specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
                break;
 
        case LFUN_UPCASE_WORD:
                changeCase(cur, LyXText::text_uppercase);
-               cur.update();
                break;
 
        case LFUN_LOWCASE_WORD:
                changeCase(cur, LyXText::text_lowercase);
-               cur.update();
                break;
 
        case LFUN_CAPITALIZE_WORD:
                changeCase(cur, LyXText::text_capitalization);
-               cur.update();
                break;
 
        case LFUN_TRANSPOSE_CHARS:
                recordUndo(cur);
-               redoParagraph(cur);
-               cur.update();
                break;
 
        case LFUN_PASTE:
                cur.message(_("Paste"));
-               replaceSelection(cur);
+               lyx::cap::replaceSelection(cur);
+#ifdef WITH_WARNINGS
 #warning FIXME Check if the arg is in the domain of available selections.
+#endif
                if (isStrUnsignedInt(cmd.argument))
                        pasteSelection(cur, strToUnsignedInt(cmd.argument));
                else
                        pasteSelection(cur, 0);
                cur.clearSelection(); // bug 393
-               cur.update();
                bv->switchKeyMap();
                finishUndo();
                break;
@@ -870,7 +897,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        case LFUN_CUT:
                cutSelection(cur, true, true);
                cur.message(_("Cut"));
-               cur.update();
                break;
 
        case LFUN_COPY:
@@ -878,27 +904,9 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                cur.message(_("Copy"));
                break;
 
-       case LFUN_BEGINNINGBUFSEL:
-               if (in_inset_)
-                       return DispatchResult(false);
-               if (!cur.selection())
-                       cur.resetAnchor();
-               cursorTop(cur);
-               finishChange(cur, true);
-               break;
-
-       case LFUN_ENDBUFSEL:
-               if (in_inset_)
-                       return DispatchResult(false);
-               if (!cur.selection())
-                       cur.resetAnchor();
-               cursorBottom(cur);
-               finishChange(cur, true);
-               break;
-
        case LFUN_GETXY:
-               cur.message(tostr(cursorX(cur.current())) + ' '
-                         + tostr(cursorY(cur.current())));
+               cur.message(tostr(cursorX(cur.top())) + ' '
+                         + tostr(cursorY(cur.top())));
                break;
 
        case LFUN_SETXY: {
@@ -963,12 +971,12 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                bool change_layout = (current_layout != layout);
 
                if (!change_layout && cur.selection() &&
-                       cur.selBegin().par() != cur.selEnd().par())
+                       cur.selBegin().pit() != cur.selEnd().pit())
                {
-                       ParagraphList::iterator spit = getPar(cur.selBegin());
-                       ParagraphList::iterator epit = boost::next(getPar(cur.selEnd()));
+                       pit_type spit = cur.selBegin().pit();
+                       pit_type epit = cur.selEnd().pit() + 1;
                        while (spit != epit) {
-                               if (spit->layout()->name() != current_layout) {
+                               if (pars_[spit].layout()->name() != current_layout) {
                                        change_layout = true;
                                        break;
                                }
@@ -980,7 +988,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        current_layout = layout;
                        setLayout(cur, layout);
                        bv->owner()->setLayout(layout);
-                       cur.update();
                        bv->switchKeyMap();
                }
                break;
@@ -994,7 +1001,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                                insertStringAsParagraphs(cur, clip);
                        else
                                insertStringAsLines(cur, clip);
-                       cur.update();
                }
                break;
        }
@@ -1008,7 +1014,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                break;
 
        case LFUN_REFERENCE_GOTO: {
-               vector<InsetOld_code> tmp;
+               vector<InsetBase_code> tmp;
                tmp.push_back(InsetBase::LABEL_CODE);
                tmp.push_back(InsetBase::REF_CODE);
                gotoInset(cur, tmp, true);
@@ -1016,7 +1022,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        }
 
        case LFUN_QUOTE: {
-               replaceSelection(cur);
+               lyx::cap::replaceSelection(cur);
                Paragraph & par = cur.paragraph();
                lyx::pos_type pos = cur.pos();
                char c;
@@ -1030,16 +1036,28 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXLayout_ptr const & style = par.layout();
 
                BufferParams const & bufparams = bv->buffer()->params();
-               if (style->pass_thru ||
-                   par.getFontSettings(bufparams, pos).language()->lang() == "hebrew")
-                 cur.insert(new InsetQuotes(c, bufparams));
+               if (!style->pass_thru
+                   && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
+                       string arg = cmd.argument;
+                       if (arg == "single")
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::SingleQ));
+                       else if (arg == "double")
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::DoubleQ));
+                       else
+                               cur.insert(new InsetQuotes(c, bufparams));
+                       cur.posRight();
+               }
                else
                        bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
                break;
        }
 
        case LFUN_DATE_INSERT: {
-               replaceSelection(cur);
+               lyx::cap::replaceSelection(cur);
                time_t now_time_t = time(NULL);
                struct tm * now_tm = localtime(&now_time_t);
                setlocale(LC_TIME, "");
@@ -1062,7 +1080,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
 
        case LFUN_MOUSE_TRIPLE:
                if (cmd.button() == mouse_button::button1) {
-                       selection_possible = true;
                        cursorHome(cur);
                        cur.resetAnchor();
                        cursorEnd(cur);
@@ -1073,62 +1090,16 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
 
        case LFUN_MOUSE_DOUBLE:
                if (cmd.button() == mouse_button::button1) {
-                       selection_possible = true;
                        selectWord(cur, lyx::WHOLE_WORD_STRICT);
                        bv->haveSelection(cur.selection());
                }
                break;
 
-       case LFUN_MOUSE_MOTION: {
-               // Only use motion with button 1
-               //if (cmd.button() != mouse_button::button1)
-               //      return false;
-               // The test for not selection possible is needed, that
-               // only motion events are used, where the bottom press
-               // event was on the drawing area too
-               if (!selection_possible) {
-                       lyxerr[Debug::ACTION] << "BufferView::Pimpl::"
-                               "Dispatch: no selection possible\n";
-                       break;
-               }
-               CursorSlice old = cur.current();
-               setCursorFromCoordinates(cur, cmd.x, cmd.y);
-
-               // This is to allow jumping over large insets
-               // FIXME: shouldn't be top-text-specific
-               if (!in_inset_ && cur.current() == old) {
-                       if (cmd.y - bv->top_y() >= bv->workHeight())
-                               cursorDown(cur, true);
-                       else if (cmd.y - bv->top_y() < 0)
-                               cursorUp(cur, true);
-               }
-
-               // don't set anchor_
-               bv->cursor().cursor_ = cur.cursor_;
-               bv->cursor().setSelection();
-               break;
-       }
-
        // Single-click on work area
        case LFUN_MOUSE_PRESS: {
-               // ok ok, this is a hack (for xforms)
-               // We shouldn't go further down as we really should only do the
-               // scrolling and be done with this. Otherwise we may open some
-               // dialogs (Jug 20020424).
-               if (cmd.button() == mouse_button::button4) {
-                       bv->scroll(-lyxrc.wheel_jump);
-                       break;
-               }
-
-               if (cmd.button() == mouse_button::button5) {
-                       bv->scroll(lyxrc.wheel_jump);
-                       break;
-               }
-
                // Right click on a footnote flag opens float menu
                if (cmd.button() == mouse_button::button3) {
                        cur.clearSelection();
-                       selection_possible = false;
                        break;
                }
 
@@ -1142,21 +1113,20 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        paste_internally = true;
                }
 
-               selection_possible = true;
-
                // Clear the selection
                cur.clearSelection();
 
-               setCursorFromCoordinates(cur, cmd.x - xo_, cmd.y - yo_);
+               setCursorFromCoordinates(cur, cmd.x, cmd.y);
                cur.resetAnchor();
                finishUndo();
-               cur.x_target() = cursorX(cur.current());
+               cur.setTargetX();
 
-               // set cursor and anchor to this position
-               bv->cursor() = cur;
+               // Has the cursor just left the inset?
+               if (bv->cursor().inMathed() && !cur.inMathed())
+                       bv->cursor().inset().notifyCursorLeaves(bv->cursor());
 
-               if (bv->fitCursor())
-                       selection_possible = false;
+               // Set cursor here.
+               bv->cursor() = cur;
 
                // Insert primary selection with middle mouse
                // if there is a local selection in the current buffer,
@@ -1166,19 +1136,53 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                                bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
                        else
                                bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
-                       selection_possible = false;
                }
+
                break;
        }
 
-       case LFUN_MOUSE_RELEASE: {
-               // do nothing if we used the mouse wheel
-               if (cmd.button() == mouse_button::button4
-                || cmd.button() == mouse_button::button5)
-                       return DispatchResult(true, false);
+       case LFUN_MOUSE_MOTION: {
+               // Only use motion with button 1
+               //if (cmd.button() != mouse_button::button1)
+               //      return false;
+
+               // ignore motions deeper nested than the real anchor
+               LCursor & bvcur = cur.bv().cursor();
+               if (bvcur.anchor_.hasPart(cur)) {
+                       CursorSlice old = bvcur.top();
+
+                       int const wh = bv->workHeight();
+                       int const y = std::max(0, std::min(wh - 1, cmd.y));
+                                         
+                       setCursorFromCoordinates(cur, cmd.x, y);
+                       cur.x_target() = cmd.x;
+                       if (cmd.y >= wh)
+                               cursorDown(cur);
+                       else if (cmd.y < 0)
+                               cursorUp(cur);
+                       // This is to allow jumping over large insets
+                       if (cur.top() == old) {
+                               if (cmd.y >= wh)
+                                       cursorDown(cur);
+                               else if (cmd.y < 0)
+                                       cursorUp(cur);
+                       }
 
-               selection_possible = false;
+                       if (cur.top() == old)
+                               cur.noUpdate();
+                       else {
+                               // don't set anchor_
+                               bvcur.setCursor(cur);
+                               bvcur.selection() = true;
+                               lyxerr << "MOTION: " << bv->cursor() << endl;
+                       }
+                       
+               } else
+                       cur.undispatched();
+               break;
+       }
 
+       case LFUN_MOUSE_RELEASE: {
                if (cmd.button() == mouse_button::button2)
                        break;
 
@@ -1187,9 +1191,8 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        bv->haveSelection(cur.selection());
 
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                bv->owner()->updateMenubar();
-               bv->owner()->updateToolbar();
+               bv->owner()->updateToolbars();
                break;
        }
 
@@ -1224,7 +1227,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                // real_current_font.number can change so we need to
                // update the minibuffer
                if (old_font != real_current_font)
-                       bv->owner()->view_state_changed();
                bv->updateScrollbar();
                break;
        }
@@ -1244,9 +1246,19 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        }
 
        case LFUN_INSERT_LABEL: {
-               InsetCommandParams p("label");
+               // Try to generate a valid label
+               string const contents = cmd.argument.empty() ?
+                       cur.getPossibleLabel() : cmd.argument;
+
+               InsetCommandParams p("label", contents);
                string const data = InsetCommandMailer::params2string("label", p);
-               bv->owner()->getDialogs().show("label", data, 0);
+
+               if (cmd.argument.empty()) {
+                       bv->owner()->getDialogs().show("label", data, 0);
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, data);
+                       dispatch(cur, fr);
+               }
                break;
        }
 
@@ -1273,11 +1285,13 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                // Open the inset, and move the current selection
                // inside it.
                doInsertInset(cur, this, cmd, true, true);
+               cur.posRight();
                break;
 
        case LFUN_INDEX_INSERT:
                // Just open the inset
                doInsertInset(cur, this, cmd, true, false);
+               cur.posRight();
                break;
 
        case LFUN_INDEX_PRINT:
@@ -1287,25 +1301,28 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
        case LFUN_INSERT_PAGEBREAK:
                // do nothing fancy
                doInsertInset(cur, this, cmd, false, false);
+               cur.posRight();
                break;
 
        case LFUN_DEPTH_MIN:
-               changeDepth(cur, bv_funcs::DEC_DEPTH);
-               cur.update();
+               changeDepth(cur, DEC_DEPTH);
                break;
 
        case LFUN_DEPTH_PLUS:
-               changeDepth(cur, bv_funcs::INC_DEPTH);
-               cur.update();
+               changeDepth(cur, INC_DEPTH);
                break;
 
        case LFUN_MATH_DISPLAY:
-               mathDispatch(cur, this, cmd, true);
+               mathDispatch(cur, cmd, true);
                break;
 
        case LFUN_MATH_IMPORT_SELECTION:
        case LFUN_MATH_MODE:
-               mathDispatch(cur, this, cmd, false);
+               if (cmd.argument == "on")
+                       // don't pass "on" as argument
+                       mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
+               else
+                       mathDispatch(cur, cmd, false);
                break;
 
        case LFUN_MATH_MACRO:
@@ -1317,10 +1334,18 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        int const nargs = s1.empty() ? 0 : atoi(s1);
                        string const s2 = token(s, ' ', 2);
                        string const type = s2.empty() ? "newcommand" : s2;
-                       cur.insert(new InsetFormulaMacro(token(s, ' ', 0), nargs, s2));
-                       cur.nextInset()->edit(cur, true);
+                       cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, s2));
+                       //cur.nextInset()->edit(cur, true);
                }
                break;
+               
+       // passthrough hat and underscore outside mathed:
+       case LFUN_SUBSCRIPT:
+               mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false);
+               break;
+       case LFUN_SUPERSCRIPT:
+               mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false);
+               break;
 
        case LFUN_INSERT_MATH:
        case LFUN_INSERT_MATRIX:
@@ -1336,7 +1361,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setEmph(LyXFont::TOGGLE);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1344,7 +1368,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setSeries(LyXFont::BOLD_SERIES);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1352,7 +1375,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setNoun(LyXFont::TOGGLE);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1360,7 +1382,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1368,7 +1389,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setFamily(LyXFont::SANS_FAMILY);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1376,14 +1396,12 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setFamily(LyXFont::ROMAN_FAMILY);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
        case LFUN_DEFAULT: {
                LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1391,7 +1409,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setUnderbar(LyXFont::TOGGLE);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1399,7 +1416,6 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                LyXFont font(LyXFont::ALL_IGNORE);
                font.setLyXSize(cmd.argument);
                toggleAndShow(cur, this, font);
-               bv->owner()->view_state_changed();
                break;
        }
 
@@ -1411,13 +1427,11 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                font.setLanguage(lang);
                toggleAndShow(cur, this, font);
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
        }
 
        case LFUN_FREEFONT_APPLY:
                toggleAndShow(cur, this, freefont, toggleall);
-               bv->owner()->view_state_changed();
                cur.message(_("Character set"));
                break;
 
@@ -1430,40 +1444,28 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                        freefont = font;
                        toggleall = toggle;
                        toggleAndShow(cur, this, freefont, toggleall);
-                       bv->owner()->view_state_changed();
                        cur.message(_("Character set"));
                }
                break;
        }
 
        case LFUN_FINISHED_LEFT:
-               lyxerr << "handle LFUN_FINISHED_LEFT" << endl;
-               cur.pop(cur.currentDepth());
-               if (rtl(cur))
-                       cursorLeft(cur, true);
-               cur.bv().cursor() = cur;
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
                break;
 
        case LFUN_FINISHED_RIGHT:
-               lyxerr << "handle LFUN_FINISHED_RIGHT" << endl;
-               cur.pop(cur.currentDepth());
-               if (!rtl(cur))
-                       cursorRight(cur, true);
-               cur.bv().cursor() = cur;
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+               ++cur.pos();
                break;
 
        case LFUN_FINISHED_UP:
-               lyxerr << "handle LFUN_FINISHED_UP" << endl;
-               cur.pop(cur.currentDepth());
-               cursorUp(cur, true);
-               cur.bv().cursor() = cur;
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
+               cursorUp(cur);
                break;
 
        case LFUN_FINISHED_DOWN:
-               lyxerr << "handle LFUN_FINISHED_DOWN" << endl;
-               cur.pop(cur.currentDepth());
-               cursorDown(cur, true);
-               cur.bv().cursor() = cur;
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
+               cursorDown(cur);
                break;
 
        case LFUN_LAYOUT_PARAGRAPH: {
@@ -1481,9 +1483,8 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                params2string(cur.paragraph(), data);
 
                // Will the paragraph accept changes from the dialog?
-               InsetBase * const inset = cur.inset();
-               bool const accept =
-                       !(inset && inset->forceDefaultParagraphs(inset));
+               InsetBase & inset = cur.inset();
+               bool const accept = !inset.forceDefaultParagraphs(&inset);
 
                data = "update " + tostr(accept) + '\n' + data;
                bv->owner()->getDialogs().update("paragraph", data);
@@ -1518,19 +1519,18 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                if (tclass.floats().typeExist(cmd.argument)) {
                        // not quite sure if we want this...
                        recordUndo(cur);
-                       freezeUndo();
                        cur.clearSelection();
                        breakParagraph(cur);
 
                        if (cur.lastpos() != 0) {
-                               cursorLeft(cur, true);
+                               cursorLeft(cur);
                                breakParagraph(cur);
                        }
 
                        setLayout(cur, tclass.defaultLayoutName());
                        setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
-                       cur.insert(new InsetFloatList(cmd.argument));
-                       unFreezeUndo();
+                       insertInset(cur, new InsetFloatList(cmd.argument));
+                       cur.posRight();
                } else {
                        lyxerr << "Non-existent float type: "
                               << cmd.argument << endl;
@@ -1540,13 +1540,11 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
 
        case LFUN_ACCEPT_CHANGE: {
                acceptChange(cur);
-               cur.update();
                break;
        }
 
        case LFUN_REJECT_CHANGE: {
                rejectChange(cur);
-               cur.update();
                break;
        }
 
@@ -1579,14 +1577,390 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd)
                                         params.align(),
                                         params.labelWidthString(),
                                         params.noindent());
-               cur.update();
                cur.message(_("Paragraph layout set"));
                break;
        }
 
+       case LFUN_INSET_DIALOG_SHOW: {
+               InsetBase * inset = cur.nextInset();
+               if (inset) {
+                       FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
+                       inset->dispatch(cur, fr);
+               }
+               break;
+       }
+
+       case LFUN_ESCAPE:
+               if (cur.selection()) {
+                       cur.selection() = false;
+               } else {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
+               }
+               break;
+
+       default:
+               cur.undispatched();
+               break;
+       }
+
+       // avoid to update when navigating
+       if (moving
+           && &sl.inset() == &cur.inset()
+           && sl.idx() == cur.idx()
+           && sel == false
+           && cur.selection() == false)
+               cur.noUpdate();
+}
+
+
+bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
+                       FuncStatus & flag) const
+{
+       BOOST_ASSERT(cur.text() == this);
+       LyXFont const & font = real_current_font;
+       bool enable = true;
+
+       switch (cmd.action) {
+
+       case LFUN_DEPTH_MIN:
+               enable = changeDepthAllowed(cur, DEC_DEPTH);
+               break;
+
+       case LFUN_DEPTH_PLUS:
+               enable = changeDepthAllowed(cur, INC_DEPTH);
+               break;
+
+       case LFUN_INSET_OPTARG:
+               enable = numberOfOptArgs(cur.paragraph())
+                       < cur.paragraph().layout()->optionalargs;
+               break;
+
+       case LFUN_APPENDIX:
+               flag.setOnOff(cur.paragraph().params().startOfAppendix());
+               break;
+
+#if 0
+       // the functions which insert insets
+       InsetBase::Code code = InsetBase::NO_CODE;
+       switch (cmd.action) {
+       case LFUN_DIALOG_SHOW_NEW_INSET:
+               if (cmd.argument == "bibitem")
+                       code = InsetBase::BIBITEM_CODE;
+               else if (cmd.argument == "bibtex")
+                       code = InsetBase::BIBTEX_CODE;
+               else if (cmd.argument == "box")
+                       code = InsetBase::BOX_CODE;
+               else if (cmd.argument == "branch")
+                       code = InsetBase::BRANCH_CODE;
+               else if (cmd.argument == "citation")
+                       code = InsetBase::CITE_CODE;
+               else if (cmd.argument == "ert")
+                       code = InsetBase::ERT_CODE;
+               else if (cmd.argument == "external")
+                       code = InsetBase::EXTERNAL_CODE;
+               else if (cmd.argument == "float")
+                       code = InsetBase::FLOAT_CODE;
+               else if (cmd.argument == "graphics")
+                       code = InsetBase::GRAPHICS_CODE;
+               else if (cmd.argument == "include")
+                       code = InsetBase::INCLUDE_CODE;
+               else if (cmd.argument == "index")
+                       code = InsetBase::INDEX_CODE;
+               else if (cmd.argument == "label")
+                       code = InsetBase::LABEL_CODE;
+               else if (cmd.argument == "note")
+                       code = InsetBase::NOTE_CODE;
+               else if (cmd.argument == "ref")
+                       code = InsetBase::REF_CODE;
+               else if (cmd.argument == "toc")
+                       code = InsetBase::TOC_CODE;
+               else if (cmd.argument == "url")
+                       code = InsetBase::URL_CODE;
+               else if (cmd.argument == "vspace")
+                       code = InsetBase::VSPACE_CODE;
+               else if (cmd.argument == "wrap")
+                       code = InsetBase::WRAP_CODE;
+               break;
+
+       case LFUN_INSET_ERT:
+               code = InsetBase::ERT_CODE;
+               break;
+       case LFUN_INSET_FOOTNOTE:
+               code = InsetBase::FOOT_CODE;
+               break;
+       case LFUN_TABULAR_INSERT:
+               code = InsetBase::TABULAR_CODE;
+               break;
+       case LFUN_INSET_MARGINAL:
+               code = InsetBase::MARGIN_CODE;
+               break;
+       case LFUN_INSET_FLOAT:
+       case LFUN_INSET_WIDE_FLOAT:
+               code = InsetBase::FLOAT_CODE;
+               break;
+       case LFUN_INSET_WRAP:
+               code = InsetBase::WRAP_CODE;
+               break;
+       case LFUN_FLOAT_LIST:
+               code = InsetBase::FLOAT_LIST_CODE;
+               break;
+#if 0
+       case LFUN_INSET_LIST:
+               code = InsetBase::LIST_CODE;
+               break;
+       case LFUN_INSET_THEOREM:
+               code = InsetBase::THEOREM_CODE;
+               break;
+#endif
+       case LFUN_INSET_CAPTION:
+               code = InsetBase::CAPTION_CODE;
+               break;
+       case LFUN_INSERT_NOTE:
+               code = InsetBase::NOTE_CODE;
+               break;
+       case LFUN_INSERT_CHARSTYLE:
+               code = InsetBase::CHARSTYLE_CODE;
+               if (buf->params().getLyXTextClass().charstyles().empty())
+                       enable = false;
+               break;
+       case LFUN_INSERT_BOX:
+               code = InsetBase::BOX_CODE;
+               break;
+       case LFUN_INSERT_BRANCH:
+               code = InsetBase::BRANCH_CODE;
+               if (buf->params().branchlist().empty())
+                       enable = false;
+               break;
+       case LFUN_INSERT_LABEL:
+               code = InsetBase::LABEL_CODE;
+               break;
+       case LFUN_INSET_OPTARG:
+               code = InsetBase::OPTARG_CODE;
+               break;
+       case LFUN_ENVIRONMENT_INSERT:
+               code = InsetBase::BOX_CODE;
+               break;
+       case LFUN_INDEX_INSERT:
+               code = InsetBase::INDEX_CODE;
+               break;
+       case LFUN_INDEX_PRINT:
+               code = InsetBase::INDEX_PRINT_CODE;
+               break;
+       case LFUN_TOC_INSERT:
+               code = InsetBase::TOC_CODE;
+               break;
+       case LFUN_HTMLURL:
+       case LFUN_URL:
+               code = InsetBase::URL_CODE;
+               break;
+       case LFUN_QUOTE:
+               // always allow this, since we will inset a raw quote
+               // if an inset is not allowed.
+               break;
+       case LFUN_HYPHENATION:
+       case LFUN_LIGATURE_BREAK:
+       case LFUN_HFILL:
+       case LFUN_MENU_SEPARATOR:
+       case LFUN_LDOTS:
+       case LFUN_END_OF_SENTENCE:
+               code = InsetBase::SPECIALCHAR_CODE;
+               break;
+       case LFUN_SPACE_INSERT:
+               // slight hack: we know this is allowed in math mode
+               if (cur.inTexted())
+                       code = InsetBase::SPACE_CODE;
+               break;
+       case LFUN_INSET_DIALOG_SHOW: {
+               InsetBase * inset = cur.nextInset();
+               enable = inset;
+               if (inset) {
+                       code = inset->lyxCode();
+                       if (!(code == InsetBase::INCLUDE_CODE
+                               || code == InsetBase::BIBTEX_CODE
+                               || code == InsetBase::FLOAT_LIST_CODE
+                               || code == InsetBase::TOC_CODE))
+                               enable = false;
+               }
+               break;
+       }
        default:
-               return DispatchResult(false);
+               break;
        }
 
-       return DispatchResult(true, true);
+       if (code != InsetBase::NO_CODE
+                       && (cur.empty() || !cur.inset().insetAllowed(code)))
+               enable = false;
+
+#endif
+
+       case LFUN_DIALOG_SHOW_NEW_INSET:
+       case LFUN_INSET_ERT:
+       case LFUN_INSERT_BOX:
+       case LFUN_INSERT_BRANCH:
+       case LFUN_ENVIRONMENT_INSERT:
+       case LFUN_INDEX_INSERT:
+       case LFUN_INDEX_PRINT:
+       case LFUN_TOC_INSERT:
+       case LFUN_HTMLURL:
+       case LFUN_URL:
+       case LFUN_QUOTE:
+       case LFUN_HYPHENATION:
+       case LFUN_LIGATURE_BREAK:
+       case LFUN_HFILL:
+       case LFUN_MENU_SEPARATOR:
+       case LFUN_LDOTS:
+       case LFUN_END_OF_SENTENCE:
+       case LFUN_SPACE_INSERT:
+       case LFUN_INSET_DIALOG_SHOW:
+               break;
+
+       case LFUN_EMPH:
+               flag.setOnOff(font.emph() == LyXFont::ON);
+               break;
+
+       case LFUN_NOUN:
+               flag.setOnOff(font.noun() == LyXFont::ON);
+               break;
+
+       case LFUN_BOLD:
+               flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
+               break;
+
+       case LFUN_SANS:
+               flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
+               break;
+
+       case LFUN_ROMAN:
+               flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
+               break;
+
+       case LFUN_CODE:
+               flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
+               break;
+
+       case LFUN_DELETE_WORD_FORWARD:
+       case LFUN_DELETE_WORD_BACKWARD:
+       case LFUN_DELETE_LINE_FORWARD:
+       case LFUN_WORDRIGHT:
+       case LFUN_WORDLEFT:
+       case LFUN_RIGHT:
+       case LFUN_RIGHTSEL:
+       case LFUN_LEFT:
+       case LFUN_LEFTSEL:
+       case LFUN_UP:
+       case LFUN_UPSEL:
+       case LFUN_DOWN:
+       case LFUN_DOWNSEL:
+       case LFUN_UP_PARAGRAPHSEL:
+       case LFUN_DOWN_PARAGRAPHSEL:
+       case LFUN_PRIORSEL:
+       case LFUN_NEXTSEL:
+       case LFUN_HOMESEL:
+       case LFUN_ENDSEL:
+       case LFUN_WORDRIGHTSEL:
+       case LFUN_WORDLEFTSEL:
+       case LFUN_WORDSEL:
+       case LFUN_UP_PARAGRAPH:
+       case LFUN_DOWN_PARAGRAPH:
+       case LFUN_PRIOR:
+       case LFUN_NEXT:
+       case LFUN_HOME:
+       case LFUN_END:
+       case LFUN_BREAKLINE:
+       case LFUN_DELETE:
+       case LFUN_DELETE_SKIP:
+       case LFUN_BACKSPACE:
+       case LFUN_BACKSPACE_SKIP:
+       case LFUN_BREAKPARAGRAPH:
+       case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+       case LFUN_BREAKPARAGRAPH_SKIP:
+       case LFUN_PARAGRAPH_SPACING:
+       case LFUN_INSET_APPLY:
+       case LFUN_INSET_INSERT:
+       case LFUN_NEXT_INSET_TOGGLE:
+       case LFUN_UPCASE_WORD:
+       case LFUN_LOWCASE_WORD:
+       case LFUN_CAPITALIZE_WORD:
+       case LFUN_TRANSPOSE_CHARS:
+       case LFUN_PASTE:
+       case LFUN_CUT:
+       case LFUN_COPY:
+       case LFUN_GETXY:
+       case LFUN_SETXY:
+       case LFUN_GETFONT:
+       case LFUN_GETLAYOUT:
+       case LFUN_LAYOUT:
+       case LFUN_PASTESELECTION:
+       case LFUN_GOTOERROR:
+       case LFUN_GOTONOTE:
+       case LFUN_REFERENCE_GOTO:
+       case LFUN_DATE_INSERT:
+       case LFUN_SELFINSERT:
+       case LFUN_INSERT_LABEL:
+       case LFUN_INSERT_NOTE:
+       case LFUN_INSERT_CHARSTYLE:
+       case LFUN_INSERT_BIBITEM:
+       case LFUN_INSET_FLOAT:
+       case LFUN_INSET_FOOTNOTE:
+       case LFUN_INSET_MARGINAL:
+       case LFUN_INSET_WIDE_FLOAT:
+       case LFUN_INSET_WRAP:
+       case LFUN_TABULAR_INSERT:
+       case LFUN_INSERT_LINE:
+       case LFUN_INSERT_PAGEBREAK:
+       case LFUN_MATH_DISPLAY:
+       case LFUN_MATH_IMPORT_SELECTION:
+       case LFUN_MATH_MODE:
+       case LFUN_MATH_MACRO:
+       case LFUN_INSERT_MATH:
+       case LFUN_INSERT_MATRIX:
+       case LFUN_MATH_DELIM:
+       case LFUN_SUBSCRIPT:
+       case LFUN_SUPERSCRIPT:
+       case LFUN_DEFAULT:
+       case LFUN_UNDERLINE:
+       case LFUN_FONT_SIZE:
+       case LFUN_LANGUAGE:
+       case LFUN_FREEFONT_APPLY:
+       case LFUN_FREEFONT_UPDATE:
+       case LFUN_LAYOUT_PARAGRAPH:
+       case LFUN_PARAGRAPH_UPDATE:
+       case LFUN_UMLAUT:
+       case LFUN_CIRCUMFLEX:
+       case LFUN_GRAVE:
+       case LFUN_ACUTE:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_MACRON:
+       case LFUN_DOT:
+       case LFUN_UNDERDOT:
+       case LFUN_UNDERBAR:
+       case LFUN_CARON:
+       case LFUN_SPECIAL_CARON:
+       case LFUN_BREVE:
+       case LFUN_TIE:
+       case LFUN_HUNG_UMLAUT:
+       case LFUN_CIRCLE:
+       case LFUN_OGONEK:
+       case LFUN_FLOAT_LIST:
+       case LFUN_ACCEPT_CHANGE:
+       case LFUN_REJECT_CHANGE:
+       case LFUN_THESAURUS_ENTRY:
+       case LFUN_PARAGRAPH_APPLY:
+       case LFUN_ESCAPE:
+       case LFUN_KEYMAP_TOGGLE:
+       case LFUN_ENDBUF:
+       case LFUN_BEGINNINGBUF:
+       case LFUN_BEGINNINGBUFSEL:
+       case LFUN_ENDBUFSEL:
+               // these are handled in our dispatch()
+               enable = true;
+               break;
+
+       default:
+               return false;
+       }
+       flag.enabled(enable);
+       return true;
 }