fix #1073

[lyx.git] / src / mathed / formulabase.C

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 8bdb9e11ebcdbe27b1fb727c456be6ff753f0825..d6e350fd819e31463ab17ba947b227bb9dfcb4e6 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -29,7 +29,7 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "math_support.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "support/lstrings.h"
 #include "frontends/LyXView.h"
 #include "frontends/font_metrics.h"
@@ -91,7 +91,7 @@ InsetFormulaBase::InsetFormulaBase()
        // This is needed as long the math parser is not re-entrant
        initMath();
        //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
-       //lyxerr << "sizeof MathMetricsInfo: " << sizeof(MathMetricsInfo) << "\n";
+       //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << "\n";
        //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
        //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
 }
@@ -125,22 +125,21 @@ void InsetFormulaBase::handleFont
        // this whole function is a hack and won't work for incremental font
        // changes...
        bv->lockedInsetStoreUndo(Undo::EDIT);
-       if (mathcursor->par()->name() == font) {
+       if (mathcursor->par()->name() == font)
                mathcursor->handleFont(font);
-               updateLocal(bv, true);
-       } else {
-               bool sel = mathcursor->selection();
-               if (sel)
-                       updateLocal(bv, true);
+       else {
                mathcursor->handleNest(createMathInset(font));
                mathcursor->insert(arg);
-               if (!sel)
-                       updateLocal(bv, false);
        }
 }
 
 
-// Check if uses AMS macros
+BufferView * InsetFormulaBase::view() const
+{
+       return view_.lock().get();
+}
+
+
 void InsetFormulaBase::validate(LaTeXFeatures &) const
 {}
 
@@ -156,7 +155,7 @@ void InsetFormulaBase::metrics(BufferView * bv) const
 {
        if (bv)
                view_ = bv->owner()->view();
-       MathMetricsInfo mi;
+       MetricsInfo mi;
        mi.base.style = LM_ST_TEXT;
        mi.base.font  = font_;
        mi.base.font.setColor(LColor::math);
@@ -180,7 +179,7 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int y, mouse_button::state)
        mathcursor->setPos(x + xo_, y + yo_);
        // if that is removed, we won't get the magenta box when entering an
        // inset for the first time
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -191,7 +190,7 @@ void InsetFormulaBase::edit(BufferView * bv, bool front)
        releaseMathCursor(bv);
        mathcursor = new MathCursor(this, front);
        metrics(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -200,12 +199,12 @@ void InsetFormulaBase::insetUnlock(BufferView * bv)
        if (mathcursor) {
                if (mathcursor->inMacroMode()) {
                        mathcursor->macroModeClose();
-                       updateLocal(bv, true);
+                       bv->updateInset(this);
                }
                releaseMathCursor(bv);
        }
        generatePreview();
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -286,7 +285,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
 void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
 {
        if (mathcursor)
-               bv->updateInset(this, false);
+               bv->updateInset(this);
 }
 
 
@@ -296,12 +295,6 @@ vector<string> const InsetFormulaBase::getLabelList() const
 }
 
 
-void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
-{
-       bv->updateInset(this, dirty);
-}
-
-
 dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
 {
        if (!mathcursor)
@@ -310,7 +303,7 @@ dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
        BufferView * bv = cmd.view();
        hideInsetCursor(bv);
        showInsetCursor(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
        //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
 
        if (cmd.button() == mouse_button::button3) {
@@ -327,7 +320,7 @@ dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
                mathcursor->selClear();
                mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
                mathcursor->insert(asArray(bv->getClipboard()));
-               bv->updateInset(this, true);
+               bv->updateInset(this);
                return DISPATCHED;
        }
 
@@ -374,7 +367,7 @@ dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
                return DISPATCHED;
        }
 
-       bv->updateInset(this, false);
+       bv->updateInset(this);
        return DISPATCHED;
 }
 
@@ -404,7 +397,7 @@ dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
        hideInsetCursor(bv);
        mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
        showInsetCursor(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
        return DISPATCHED;
 }
 
@@ -425,7 +418,8 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                        //lyxerr << "Mouse single press\n";
                        return lfunMousePress(cmd);
                case LFUN_MOUSE_MOTION:
-                       //return lfunMouseMotion(cmd);
+                       //lyxerr << "Mouse motion\n";
+                       return lfunMouseMotion(cmd);
                case LFUN_MOUSE_RELEASE:
                        //lyxerr << "Mouse single release\n";
                        return lfunMouseRelease(cmd);
@@ -457,7 +451,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_MATH_DISPLAY:
        case LFUN_MATH_NUMBER:
        case LFUN_MATH_NONUMBER:
-       case LFUN_TABINSERT:
+       case LFUN_CELL_SPLIT:
        case LFUN_BREAKLINE:
        case LFUN_DELETE_LINE_FORWARD:
        case LFUN_INSERT_LABEL:
@@ -467,7 +461,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_MATH_LIMITS:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->dispatch(cmd);
-               updateLocal(bv, true);
                break;
 
        case LFUN_RIGHTSEL:
@@ -476,7 +469,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
                //lyxerr << "calling scroll 20\n";
                //scroll(bv, 20);
-               updateLocal(bv, false);
                // write something to the minibuffer
                //bv->owner()->message(mathcursor->info());
                break;
@@ -485,27 +477,23 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                sel = true; // fall through
        case LFUN_LEFT:
                result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_UPSEL:
                sel = true; // fall through
        case LFUN_UP:
                result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
-               updateLocal(bv, false);
                break;
 
        case LFUN_DOWNSEL:
                sel = true; // fall through
        case LFUN_DOWN:
                result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
-               updateLocal(bv, false);
                break;
 
        case LFUN_WORDSEL:
                mathcursor->home(false);
                mathcursor->end(true);
-               updateLocal(bv, false);
                break;
 
        case LFUN_UP_PARAGRAPHSEL:
@@ -513,7 +501,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_DOWN_PARAGRAPHSEL:
        case LFUN_DOWN_PARAGRAPH:
                result = FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_HOMESEL:
@@ -522,7 +509,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_HOME:
        case LFUN_WORDLEFT:
                result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_ENDSEL:
@@ -531,7 +517,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_END:
        case LFUN_WORDRIGHT:
                result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
-               updateLocal(bv, false);
                break;
 
        case LFUN_PRIORSEL:
@@ -539,7 +524,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_BEGINNINGBUFSEL:
        case LFUN_BEGINNINGBUF:
                result = FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_NEXTSEL:
@@ -547,41 +531,32 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_ENDBUFSEL:
        case LFUN_ENDBUF:
                result = FINISHED_RIGHT;
-               updateLocal(bv, false);
                break;
 
-       case LFUN_TAB:
+       case LFUN_CELL_FORWARD:
                mathcursor->idxNext();
-               updateLocal(bv, false);
                break;
 
-       case LFUN_SHIFT_TAB:
+       case LFUN_CELL_BACKWARD:
                mathcursor->idxPrev();
-               updateLocal(bv, false);
                break;
 
        case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               if (mathcursor->backspace()) {
-                       result = DISPATCHED;
-               } else {
+               if (!mathcursor->backspace()) {
                        result = FINISHED;
                        remove_inset = true;
                }
-               updateLocal(bv, true);
                break;
 
        case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               if (mathcursor->erase()) {
-                       result = DISPATCHED;
-               } else {
+               if (!mathcursor->erase()) {
                        result = FINISHED;
                        remove_inset = true;
                }
-               updateLocal(bv, true);
                break;
 
        //    case LFUN_GETXY:
@@ -595,22 +570,23 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                istringstream is(cmd.argument.c_str());
                is >> x >> y;
                mathcursor->setPos(x, y);
-               updateLocal(bv, false);
                break;
        }
 
-       case LFUN_PASTE:
+       case LFUN_PASTE: {
+               int n = 0;
+               istringstream is(cmd.argument.c_str());
+               is >> n;
                if (was_macro)
                        mathcursor->macroModeClose();
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               mathcursor->selPaste();
-               updateLocal(bv, true);
+               mathcursor->selPaste(n);
                break;
+       }
 
        case LFUN_CUT:
                bv->lockedInsetStoreUndo(Undo::DELETE);
                mathcursor->selCut();
-               updateLocal(bv, true);
                break;
 
        case LFUN_COPY:
@@ -626,7 +602,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                        // deadkeys
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        mathcursor->script(true);
-                       updateLocal(bv, true);
                }
                break;
 
@@ -647,7 +622,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                break;
 
        //  Math fonts
-       case LFUN_GREEK_TOGGLE: handleFont(bv, cmd.argument, "lyxgreek"); break;
        case LFUN_BOLD:         handleFont(bv, cmd.argument, "mathbf"); break;
        case LFUN_SANS:         handleFont(bv, cmd.argument, "mathsf"); break;
        case LFUN_EMPH:         handleFont(bv, cmd.argument, "mathcal"); break;
@@ -656,22 +630,14 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_FRAK:         handleFont(bv, cmd.argument, "mathfrak"); break;
        case LFUN_ITAL:         handleFont(bv, cmd.argument, "mathit"); break;
        case LFUN_NOUN:         handleFont(bv, cmd.argument, "mathbb"); break;
-       case LFUN_FREE:         handleFont(bv, cmd.argument, "textrm"); break;
+       case LFUN_FREEFONT_APPLY:  handleFont(bv, cmd.argument, "textrm"); break;
        case LFUN_DEFAULT:      handleFont(bv, cmd.argument, "textnormal"); break;
 
-       case LFUN_GREEK:
-               handleFont(bv, cmd.argument, "lyxgreek1");
-               if (cmd.argument.size())
-                       mathcursor->insert(asArray(cmd.argument));
-               break;
-
        case LFUN_MATH_MODE:
-               if (mathcursor->currentMode() == MathInset::TEXT_MODE) {
+               if (mathcursor->currentMode() == MathInset::TEXT_MODE)
                        mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
-                       updateLocal(bv, true);
-               } else {
+               else
                        handleFont(bv, cmd.argument, "textrm");
-               }
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
@@ -680,7 +646,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                if (!arg.empty()) {
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        mathcursor->setSize(arg);
-                       updateLocal(bv, true);
                }
 #endif
                break;
@@ -698,7 +663,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                v_align += 'c';
                mathcursor->niceInsert(
                        MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
-                       updateLocal(bv, true);
                break;
        }
 
@@ -707,7 +671,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        {
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
-               updateLocal(bv, true);
                break;
        }
 
@@ -724,7 +687,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->handleNest(MathAtom(new MathDelimInset(ls, rs)));
-               updateLocal(bv, true);
                break;
        }
 
@@ -732,7 +694,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_MATH_SPACE:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->insert(MathAtom(new MathSpaceInset(",")));
-               updateLocal(bv, true);
                break;
 
        case LFUN_UNDO:
@@ -748,7 +709,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                // interpret this as if a backslash was typed
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->interpret('\\');
-               updateLocal(bv, true);
                break;
 
        case LFUN_BREAKPARAGRAPH:
@@ -763,7 +723,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_INSERT_MATH:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->niceInsert(argument);
-               updateLocal(bv, true);
                break;
 
        case -1:
@@ -774,7 +733,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                                result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
                        else
                                mathcursor->insert(asArray(argument));
-                       updateLocal(bv, true);
                }
                break;
 
@@ -791,23 +749,27 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_INSET_TOGGLE:
                mathcursor->insetToggle();
-               updateLocal(bv, true);
                break;
 
        case LFUN_DIALOG_SHOW_NEW_INSET: {
                string const & name = argument;
+               string data;
                if (name == "ref") {
-                       RefInset tmp;
-                       string const data = tmp.createDialogStr(name);
-                       bv->owner()->getDialogs().show(name, data, 0);
-               } else
+                       RefInset tmp(name);
+                       data = tmp.createDialogStr(name);
+               }
+
+               if (data.empty())
                        result = UNDISPATCHED;
+               else {
+                       bv->owner()->getDialogs().show(name, data, 0);
+               }
        }
        break;
 
        case LFUN_INSET_APPLY: {
                string const name = cmd.getArg(0);
-               InsetBase * base = 
+               InsetBase * base =
                        bv->owner()->getDialogs().getOpenInset(name);
 
                if (base) {
@@ -822,8 +784,6 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                                result = UNDISPATCHED;
                        }
                }
-               if (result == DISPATCHED)
-                       updateLocal(bv, true);
        }
        break;
 
@@ -831,6 +791,9 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                result = UNDISPATCHED;
        }
 
+       if (result == DISPATCHED)
+               bv->updateInset(this);
+
        mathcursor->normalize();
        mathcursor->touch();
 
@@ -960,7 +923,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
                        mathcursor->setSelection(it, ar.size());
                        current = it;
                        it.jump(ar.size());
-                       updateLocal(bv, false);
+                       bv->updateInset(this);
                        return true;
                }
        }
@@ -1063,7 +1026,6 @@ void mathDispatch(FuncRequest const & cmd)
                        }
                        break;
 
-               case LFUN_GREEK:
                case LFUN_INSERT_MATH:
                case LFUN_INSERT_MATRIX:
                case LFUN_MATH_DELIM: {
@@ -1075,6 +1037,7 @@ void mathDispatch(FuncRequest const & cmd)
                        }
                        break;
                }
+
                default:
                        break;
        }