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 877e0cd4d8e2150fb271b373367e638e55eb8e8a..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;
@@ -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();
@@ -595,7 +598,7 @@ 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;
        }
        
@@ -627,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());
        
@@ -641,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;
@@ -772,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());
@@ -1031,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_);
        
@@ -1060,7 +1063,7 @@ 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_);
@@ -1088,7 +1091,7 @@ 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_);
@@ -1146,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;
 
@@ -1217,7 +1220,7 @@ void BufferView::Pimpl::insetUnlock()
                if (!inset_slept)
                        bv_->theLockingInset()->insetUnlock(bv_);
                bv_->theLockingInset(0);
-               bv_->text->finishUndo();
+               finishUndo();
                inset_slept = false;
        }
 }
@@ -1263,8 +1266,11 @@ void BufferView::Pimpl::hideCursor()
 
 void BufferView::Pimpl::toggleSelection(bool b)
 {
-       if (screen_.get())
+       if (screen_.get()) {
+               if (bv_->theLockingInset())
+                       bv_->theLockingInset()->toggleSelection(bv_, b);
                screen_->toggleSelection(bv_->text, bv_, b);
+       }
 }
 
 
@@ -1817,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();
        }
@@ -1859,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();
        }
@@ -1873,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();
        }
@@ -1887,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();
        }
@@ -1901,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();
        }
@@ -1915,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();
        }
@@ -1929,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();
        }
@@ -1943,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();
        }
@@ -1957,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();
        }
@@ -1972,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();
        }
@@ -1988,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();
        }
@@ -2005,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();
        }
@@ -2022,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();
        }
@@ -2037,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();
        }
@@ -2052,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();
        }
@@ -2069,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();
        }
@@ -2085,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();
        }
@@ -2098,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();
        }
@@ -2111,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();
        }
@@ -2124,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();
        }
@@ -2137,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();
        }
@@ -2149,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();
        }
@@ -2161,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();
        }
@@ -2173,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();
        }
@@ -2185,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();
        }
@@ -2200,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();
        }
@@ -2215,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();
        }
@@ -2229,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();
        }
@@ -2244,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();
        }
@@ -2631,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;
@@ -2902,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;
@@ -3333,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;
@@ -3352,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()) {
@@ -3403,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;
 }