Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 81a5ab2d5bb677fb64225c6dc9923f68aa701853..f0c6fc86c0ae4636fd558733850dbed11e9ed5af 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -57,10 +57,10 @@
 #include "insets/insetcaption.h"
 #include "insets/insetfloatlist.h"
 #include "insets/insetspecialchar.h"
-#include "mathed/formulamacro.h"
-#include "mathed/formula.h"
 #include "gettext.h"
 #include "ParagraphParameters.h"
+#include "undo_funcs.h"
+#include "mathed/formulabase.h"
 
 extern LyXTextClass::size_type current_layout;
 extern int greek_kb_flag;
@@ -82,9 +82,10 @@ extern BufferList bufferlist;
 extern char ascii_type;
 
 extern bool math_insert_greek(BufferView *, char);
-extern void sigchldhandler(pid_t pid, int * status);
+extern void sigchldchecker(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
+
 namespace {
 
 const unsigned int saved_positions_num = 20;
@@ -198,7 +199,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                        updateScreen();
                        updateScrollbar();
                }
-               bv_->text->first = screen_->TopCursorVisible(bv_->text);
+               bv_->text->first = screen_->topCursorVisible(bv_->text);
                owner_->updateMenubar();
                owner_->updateToolbar();
                // Similarly, buffer-dependent dialogs should be updated or
@@ -257,7 +258,7 @@ bool BufferView::Pimpl::fitCursor(LyXText * text)
 
        bv_->owner()->getDialogs()->updateParagraph();
 
-       bool const ret = screen_->FitCursor(text, bv_);
+       bool const ret = screen_->fitCursor(text, bv_);
        if (ret)
            updateScrollbar();
        return ret;
@@ -305,6 +306,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                the_locking_inset = bv_->theLockingInset();
                delete bv_->text;
                bv_->text = new LyXText(bv_);
+               bv_->text->init(bv_);
        } else {
                // See if we have a text in TextCache that fits
                // the new buffer_ with the correct width.
@@ -320,6 +322,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                                textcache.show(lyxerr, "resizeCurrentBuffer");
                } else {
                        bv_->text = new LyXText(bv_);
+                       bv_->text->init(bv_);
                }
        }
        updateScreen();
@@ -343,7 +346,7 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                // remake the inset locking
                bv_->theLockingInset(the_locking_inset);
        }
-       bv_->text->first = screen_->TopCursorVisible(bv_->text);
+       bv_->text->first = screen_->topCursorVisible(bv_->text);
        buffer_->resizeInsets(bv_);
        // this will scroll the screen such that the cursor becomes visible
        updateScrollbar();
@@ -380,35 +383,29 @@ void BufferView::Pimpl::updateScrollbar()
                return;
        }
 
-       static unsigned long text_height;
-       static unsigned long work_height;
-
-       unsigned long const tmp_text_height = bv_->text->height;
-       long const tmp_scrollbar_value = bv_->text->first;
-       
-       // check if anything has changed.
-       if (text_height == tmp_text_height
-           && work_height == workarea_.height()
-           && current_scrollbar_value == tmp_scrollbar_value)
-               return; // no
+       long const text_height = bv_->text->height;
 
-       // update values
-       text_height = tmp_text_height;
-       work_height = workarea_.height();
-       current_scrollbar_value = tmp_scrollbar_value;
+       double const lineh = bv_->text->defaultHeight();
+       double const slider_size = 1.0 / double(text_height);
 
-       long const height_diff = text_height - work_height;
+       static long old_text_height;
+       static double old_lineh;
+       static double old_slider_size;
 
-       if (height_diff <= 0) {
-               workarea_.setScrollbar(0, 1.0);
-               return;
+       if (text_height != old_text_height) {
+               workarea_.setScrollbarBounds(0, text_height - workarea_.height());
+               old_text_height = text_height;
+       }
+       if (lineh != old_lineh) {
+               workarea_.setScrollbarIncrements(lineh);
+               old_lineh = lineh;
+       }
+       if (current_scrollbar_value != bv_->text->first
+           || slider_size != old_slider_size) {
+               current_scrollbar_value = bv_->text->first;
+               workarea_.setScrollbar(current_scrollbar_value, slider_size);
+               old_slider_size = slider_size;
        }
-       
-       workarea_.setScrollbarBounds(0, height_diff);
-       double const lineh = bv_->text->defaultHeight();
-       workarea_.setScrollbarIncrements(lineh);
-       double const slider_size = 1.0 / (double(height_diff) + work_height);
-       workarea_.setScrollbar(current_scrollbar_value, slider_size);
 }
 
 
@@ -424,7 +421,7 @@ void BufferView::Pimpl::scrollCB(double value)
        if (!screen_.get())
                return;
 
-       screen_->Draw(bv_->text, bv_, current_scrollbar_value);
+       screen_->draw(bv_->text, bv_, current_scrollbar_value);
 
        if (!lyxrc.cursor_follows_scrollbar) {
                waitForX();
@@ -541,7 +538,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
        if (!selection_possible)
                return;
  
-       screen_->HideCursor();
+       screen_->hideCursor();
 
        bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first);
       
@@ -549,9 +546,9 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
                update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
       
        bv_->text->setSelection(bv_);
-       screen_->ToggleToggle(bv_->text, bv_);
+       screen_->toggleToggle(bv_->text, bv_);
        fitCursor(bv_->text);
-       screen_->ShowCursor(bv_->text, bv_);
+       screen_->showCursor(bv_->text, bv_);
 }
 
 
@@ -593,7 +590,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        
        if (!inset_hit)
                selection_possible = true;
-       screen_->HideCursor();
+       screen_->hideCursor();
 
        int const screen_first = bv_->text->first;
        
@@ -601,15 +598,15 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        bool paste_internally = false;
        if (button == 2
            && bv_->text->selection.set()) {
-               owner_->getLyXFunc()->Dispatch(LFUN_COPY);
+               owner_->getLyXFunc()->dispatch(LFUN_COPY);
                paste_internally = true;
        }
        
        // Clear the selection
-       screen_->ToggleSelection(bv_->text, bv_);
+       screen_->toggleSelection(bv_->text, bv_);
        bv_->text->clearSelection(bv_);
        bv_->text->fullRebreak(bv_);
-       screen_->Update(bv_->text, bv_);
+       screen_->update(bv_->text, bv_);
        updateScrollbar();
        
        // Single left click in math inset?
@@ -633,7 +630,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        
        if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
                bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first);
-       bv_->text->finishUndo();
+       finishUndo();
        bv_->text->selection.cursor = bv_->text->cursor;
        bv_->text->cursor.x_fix(bv_->text->cursor.x());
        
@@ -647,9 +644,9 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        // insert this
        if (button == 2) {
                if (paste_internally)
-                       owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+                       owner_->getLyXFunc()->dispatch(LFUN_PASTE);
                else
-                       owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+                       owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
                                                       "paragraph");
                selection_possible = false;
                return;
@@ -670,10 +667,10 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 
        if (screen_.get() && button == 1) {
            if (text->bv_owner) {
-               screen_->HideCursor();
-               screen_->ToggleSelection(text, bv_);
+               screen_->hideCursor();
+               screen_->toggleSelection(text, bv_);
                text->selectWord(bv_);
-               screen_->ToggleSelection(text, bv_, false);
+               screen_->toggleSelection(text, bv_, false);
            } else {
                text->selectWord(bv_);
            }
@@ -696,13 +693,13 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
            return;
 
        if (screen_.get() && (button == 1)) {
-               screen_->HideCursor();
-               screen_->ToggleSelection(text, bv_);
+               screen_->hideCursor();
+               screen_->toggleSelection(text, bv_);
                text->cursorHome(bv_);
                text->selection.cursor = text->cursor;
                text->cursorEnd(bv_);
                text->setSelection(bv_);
-               screen_->ToggleSelection(text, bv_, false);
+               screen_->toggleSelection(text, bv_, false);
                /* This will fit the cursor on the screen
                 * if necessary */
                update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -778,7 +775,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                // ...or maybe the SetCursorParUndo()
                // below isn't necessary at all anylonger?
                if (inset_hit->lyxCode() == Inset::REF_CODE) {
-                       bv_->text->setCursorParUndo(buffer_);
+                       setCursorParUndo(bv_);
                }
 
                owner_->message(inset_hit->editMessage());
@@ -936,7 +933,7 @@ void BufferView::Pimpl::workAreaExpose()
                        // The main window size has changed, repaint most stuff
                        redraw();
                } else if (screen_.get())
-                   screen_->Redraw(bv_->text, bv_);
+                   screen_->redraw(bv_->text, bv_);
        } else {
                // Grey box when we don't have a buffer
                workarea_.greyOut();
@@ -954,7 +951,7 @@ void BufferView::Pimpl::update()
        if (screen_.get() &&
                (!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
        {
-               screen_->Update(bv_->text, bv_);
+               screen_->update(bv_->text, bv_);
        }
 }
 
@@ -1037,7 +1034,7 @@ void BufferView::Pimpl::cursorToggle()
        if (pid == -1) // error find out what is wrong
                ; // ignore it for now.
        else if (pid > 0)
-               sigchldhandler(pid, &status);
+               sigchldchecker(pid, &status);
 
        updatelist.update(bv_);
        
@@ -1047,7 +1044,7 @@ void BufferView::Pimpl::cursorToggle()
        }
 
        if (!bv_->theLockingInset()) {
-               screen_->CursorToggle(bv_->text, bv_);
+               screen_->cursorToggle(bv_->text, bv_);
        } else {
                bv_->theLockingInset()->toggleInsetCursor(bv_);
        }
@@ -1066,14 +1063,14 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text)
                y += bv_->text->first;
        Row * cursorrow = text->cursor.row();
        text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
-       bv_->text->finishUndo();
+       finishUndo();
        // This is to allow jumping over large insets
        if ((cursorrow == text->cursor.row()))
                text->cursorUp(bv_);
        
        if (text->inset_owner ||
            text->cursor.row()->height() < workarea_.height())
-               screen_->Draw(bv_->text, bv_,
+               screen_->draw(bv_->text, bv_,
                              text->cursor.y()
                              - text->cursor.row()->baseline()
                              + text->cursor.row()->height()
@@ -1094,14 +1091,14 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
     
        Row * cursorrow = text->cursor.row();
        text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
-       bv_->text->finishUndo();
+       finishUndo();
        // This is to allow jumping over large insets
        if ((cursorrow == bv_->text->cursor.row()))
                text->cursorDown(bv_);
        
        if (text->inset_owner ||
            text->cursor.row()->height() < workarea_.height())
-               screen_->Draw(bv_->text, bv_, text->cursor.y() -
+               screen_->draw(bv_->text, bv_, text->cursor.y() -
                              text->cursor.row()->baseline());
        updateScrollbar();
 }
@@ -1152,7 +1149,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
                if (b != 0 ) buffer(b);
        }
 
-       Paragraph * par = bv_->text->getParFromID(saved_positions[i].par_id);
+       Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
        if (!par)
                return;
 
@@ -1223,7 +1220,7 @@ void BufferView::Pimpl::insetUnlock()
                if (!inset_slept)
                        bv_->theLockingInset()->insetUnlock(bv_);
                bv_->theLockingInset(0);
-               bv_->text->finishUndo();
+               finishUndo();
                inset_slept = false;
        }
 }
@@ -1256,28 +1253,31 @@ bool BufferView::Pimpl::belowMouse() const
 void BufferView::Pimpl::showCursor()
 {
        if (screen_.get())
-               screen_->ShowCursor(bv_->text, bv_);
+               screen_->showCursor(bv_->text, bv_);
 }
 
 
 void BufferView::Pimpl::hideCursor()
 {
        if (screen_.get())
-               screen_->HideCursor();
+               screen_->hideCursor();
 }
 
 
 void BufferView::Pimpl::toggleSelection(bool b)
 {
-       if (screen_.get())
-               screen_->ToggleSelection(bv_->text, bv_, b);
+       if (screen_.get()) {
+               if (bv_->theLockingInset())
+                       bv_->theLockingInset()->toggleSelection(bv_, b);
+               screen_->toggleSelection(bv_->text, bv_, b);
+       }
 }
 
 
 void BufferView::Pimpl::toggleToggle()
 {
        if (screen_.get())
-               screen_->ToggleToggle(bv_->text, bv_);
+               screen_->toggleToggle(bv_->text, bv_);
 }
 
 
@@ -1285,9 +1285,9 @@ void BufferView::Pimpl::center()
 {
        beforeChange(bv_->text);
        if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
-               screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
+               screen_->draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
        } else {
-               screen_->Draw(bv_->text, bv_, 0);
+               screen_->draw(bv_->text, bv_, 0);
        }
        update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
        redraw();
@@ -1298,7 +1298,7 @@ void BufferView::Pimpl::pasteClipboard(bool asPara)
 {
        if (!buffer_) return;
 
-       screen_->HideCursor();
+       screen_->hideCursor();
        beforeChange(bv_->text);
        
        string const clip(workarea_.getClipboard());
@@ -1823,7 +1823,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                }
                if (!is_rtl)
                        lt->cursorRight(bv_, false);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1865,7 +1865,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                if  (is_rtl)
                        lt->cursorRight(bv_, false);
 
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1879,7 +1879,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                lt->cursorUp(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1893,7 +1893,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                lt->cursorDown(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1907,7 +1907,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                lt->cursorUpParagraph(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1921,7 +1921,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                lt->cursorDownParagraph(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1935,7 +1935,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                cursorPrevious(lt);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1949,7 +1949,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::UPDATE);
                cursorNext(lt);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1963,7 +1963,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        beforeChange(lt);
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                lt->cursorHome(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1978,7 +1978,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorEnd(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -1994,7 +1994,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorTab(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -2011,7 +2011,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorLeftOneWord(bv_);
                else
                        lt->cursorRightOneWord(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -2028,7 +2028,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorRightOneWord(bv_);
                else
                        lt->cursorLeftOneWord(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -2043,7 +2043,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorTop(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -2058,7 +2058,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorBottom(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(false);
                owner_->showState();
        }
@@ -2075,7 +2075,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorLeft(bv_);
                else
                        lt->cursorRight(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2091,7 +2091,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorRight(bv_);
                else
                        lt->cursorLeft(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2104,7 +2104,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorUp(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2117,7 +2117,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorDown(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2130,7 +2130,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorUpParagraph(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2143,7 +2143,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorDownParagraph(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2155,7 +2155,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                cursorPrevious(lt);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2167,7 +2167,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                cursorNext(lt);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2179,7 +2179,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                lt->cursorHome(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2191,7 +2191,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                lt->cursorEnd(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2206,7 +2206,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorLeftOneWord(bv_);
                else
                        lt->cursorRightOneWord(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2221,7 +2221,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        lt->cursorRightOneWord(bv_);
                else
                        lt->cursorLeftOneWord(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2235,7 +2235,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        break;
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                lt->cursorTop(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2250,7 +2250,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                update(lt,
                       BufferView::SELECT|BufferView::FITCUR);
                lt->cursorBottom(bv_);
-               lt->finishUndo();
+               finishUndo();
                moveCursorUpdate(true);
                owner_->showState();
        }
@@ -2637,6 +2637,18 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
        }
        break;
        
+       case LFUN_INSET_TOGGLE:
+       {
+               LyXText * lt = bv_->getLyXText();
+               hideCursor();
+               beforeChange(lt);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               lt->toggleInset(bv_);
+               update(lt, BufferView::SELECT|BufferView::FITCUR);
+               setState();
+       }       
+               break;
+
        case LFUN_QUOTE:
                bv_->insertCorrectQuote();
                break;
@@ -2908,61 +2920,34 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                }
                break;
        
-       // --- insert characters ----------------------------------------
-       
+       case LFUN_MATH_MACRO:
+               mathDispatchMathMacro(bv_, argument);
+               break;
+
        case LFUN_MATH_DELIM:     
+               mathDispatchMathDelim(bv_, argument);
+               break;
+
        case LFUN_INSERT_MATRIX:
-       {          
-               if (available()) { 
-                       if (open_new_inset(new InsetFormula, false)) {
-                               bv_->theLockingInset()
-                                       ->localDispatch(bv_, action, argument);
-                       }
-               }
-       }          
-       break;
-              
+               mathDispatchInsertMatrix(bv_, argument);
+               break;
+
        case LFUN_INSERT_MATH:
-       {
-               if (!available())
-                       break;
- 
-               InsetFormula * f = new InsetFormula(LM_OT_EQUATION);
-               open_new_inset(f);
-               f->localDispatch(bv_, LFUN_INSERT_MATH, argument);
-       }
-       break;
-       
-       case LFUN_MATH_DISPLAY:
-       {       
-               if (available())
-                       open_new_inset(new InsetFormula(LM_OT_EQUATION), false);
+               mathDispatchInsertMath(bv_, argument);
                break;
-       }
-                   
-       case LFUN_MATH_MACRO:
-       {
-               if (available()) {
-                       string s(argument);
-                       if (s.empty())
-                               owner_->getLyXFunc()->setErrorMessage(N_("Missing argument"));
-                       else {
-                               string const s1 = token(s, ' ', 1);
-                               int const na = s1.empty() ? 0 : lyx::atoi(s1);
-                               open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na), false);
-                       }
-               }
-       }
-       break;
 
-       case LFUN_MATH_MODE:   // Open or create a math inset
-       {               
-               if (available())
-                       open_new_inset(new InsetFormula, false);
-               owner_->getLyXFunc()->setMessage(N_("Math editor mode"));
-       }
-       break;
-         
+       case LFUN_MATH_IMPORT_SELECTION: // Imports LaTeX from the X selection
+               mathDispatchMathImportSelection(bv_, argument);
+               break;
+
+       case LFUN_MATH_DISPLAY:          // Open or create a displayed math inset
+               mathDispatchMathDisplay(bv_, argument);
+               break;
+
+       case LFUN_MATH_MODE:             // Open or create an inlined math inset 
+               mathDispatchMathMode(bv_, argument);
+               break;
+               
        case LFUN_CITATION_INSERT:
        {
                InsetCommandParams p;
@@ -3339,7 +3324,7 @@ bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
        LyXText * lt = bv_->getLyXText();
        
        beforeChange(lt);
-       lt->finishUndo();
+       finishUndo();
        if (!insertInset(new_inset)) {
                delete new_inset;
                return false;
@@ -3358,14 +3343,14 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
        // if we are in a locking inset we should try to insert the
        // inset there otherwise this is a illegal function now
        if (bv_->theLockingInset()) {
-               if (bv_->theLockingInset()->insertInsetAllowed(inset))
+               if (bv_->theLockingInset()->insetAllowed(inset))
                    return bv_->theLockingInset()->insertInset(bv_, inset);
                return false;
        }
 
        // not quite sure if we want this...
-       bv_->text->setCursorParUndo(buffer_);
-       bv_->text->freezeUndo();
+       setCursorParUndo(bv_);
+       freezeUndo();
        
        beforeChange(bv_->text);
        if (!lout.empty()) {
@@ -3409,7 +3394,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
        bv_->text->insertInset(bv_, inset);
        update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
-       bv_->text->unFreezeUndo();
+       unFreezeUndo();
        return true;
 }