small up/down tweaking

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 529719eb86262dd4ae02892bf69b6ec06b53a596..d2295a967eba416a6b99549e5c7b6d358bd0f352 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -227,13 +227,17 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
        x = mathcursor->targetX();
        x -= xo_;
        y -= yo_;
-       //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+       //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
 }
 
 
 void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 {
-       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+       if (!mathcursor) {
+               lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
+               return;
+       }
+       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
        if (isCursorVisible())
                hideInsetCursor(bv);
        else
@@ -243,25 +247,30 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 
 void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
 {
+       if (!mathcursor) {
+               lyxerr << "showInsetCursor impossible" << endl;
+               return;
+       }
        if (isCursorVisible())
                return;
-       fitInsetCursor(bv);
        int x, y, asc, des;
        mathcursor->getPos(x, y);
        math_font_max_dim(font_, asc, des);
        bv->showLockedInsetCursor(x, y - yo_, asc, des);
        setCursorVisible(true);
-       //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+       //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
 }
 
 
 void InsetFormulaBase::hideInsetCursor(BufferView * bv)
 {
+       if (!mathcursor)
+               return;
        if (!isCursorVisible())
                return;
        bv->hideLockedInsetCursor();
        setCursorVisible(false);
-       //lyxerr << "hideInsetCursor: \n";
+       //lyxerr << "hideInsetCursor: " << endl;
 }
 
 
@@ -273,7 +282,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
        math_font_max_dim(font_, asc, des);
        getCursorPos(bv, x, y);
        //y += yo_;
-       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << endl;
        bv->fitLockedInsetCursor(x, y, asc, des);
 }
 
@@ -305,12 +314,12 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
        BufferView * bv = cmd.view();
        hideInsetCursor(bv);
        showInsetCursor(bv);
-       bv->updateInset(this, true);
-       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << "\n";
+       bv->updateInset(this, false);
+       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
 
        if (cmd.button() == mouse_button::button3) {
                // try to dispatch to enclosed insets first
-               if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {     
+               if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {
                        // launch math panel for right mouse button
                        bv->owner()->getDialogs().showMathPanel();
                }
@@ -344,10 +353,10 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
 Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
 {
        BufferView * bv = cmd.view();
-       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << "\n";
+       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
 
        if (!mathcursor || mathcursor->formula() != this) {
-               lyxerr << "re-create cursor\n";
+               lyxerr[Debug::MATHED] << "re-create cursor" << endl;
                releaseMathCursor(bv);
                mathcursor = new MathCursor(this, cmd.x == 0);
                metrics(bv);
@@ -382,12 +391,12 @@ Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
                return DISPATCHED;
 
        // only select with button 1
-       if (cmd.button() != mouse_button::button1) 
+       if (cmd.button() != mouse_button::button1)
                return DISPATCHED;
 
        if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
                return DISPATCHED;
-       
+
        first_x = cmd.x;
        first_y = cmd.y;
 
@@ -409,7 +418,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        //      << " arg: '" << cmd.argument
        //      << " x: '" << cmd.x
        //      << " y: '" << cmd.y
-       //      << "' button: " << cmd.button() << "\n";
+       //      << "' button: " << cmd.button() << endl;
 
        switch (cmd.action) {
                case LFUN_MOUSE_PRESS:
@@ -497,6 +506,14 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                updateLocal(bv, false);
                break;
 
+       case LFUN_UP_PARAGRAPHSEL:
+       case LFUN_UP_PARAGRAPH:
+       case LFUN_DOWN_PARAGRAPHSEL:
+       case LFUN_DOWN_PARAGRAPH:
+               result = FINISHED;
+               updateLocal(bv, false);
+               break;
+
        case LFUN_HOMESEL:
        case LFUN_WORDLEFTSEL:
                sel = true; // fall through
@@ -519,7 +536,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_PRIOR:
        case LFUN_BEGINNINGBUFSEL:
        case LFUN_BEGINNINGBUF:
-               result = FINISHED_UP;
+               result = FINISHED;
                updateLocal(bv, false);
                break;
 
@@ -527,7 +544,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_NEXT:
        case LFUN_ENDBUFSEL:
        case LFUN_ENDBUF:
-               result = FINISHED_DOWN;
+               result = FINISHED_RIGHT;
                updateLocal(bv, false);
                break;
 
@@ -543,14 +560,14 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->backspace();
                updateLocal(bv, true);
                break;
 
        case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->erase();
                bv->updateInset(this, true);
                break;
@@ -662,7 +679,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                unsigned int n = 1;
                string v_align;
                string h_align;
-               istringstream is(argument);
+               istringstream is(STRCONV(argument));
                is >> m >> n >> v_align >> h_align;
                m = max(1u, m);
                n = max(1u, n);
@@ -736,7 +753,7 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                mathcursor->niceInsert(argument);
                updateLocal(bv, true);
                break;
-       
+
        case -1:
        case LFUN_SELFINSERT:
                if (!argument.empty()) {
@@ -949,7 +966,7 @@ bool InsetFormulaBase::display() const
 
 string InsetFormulaBase::selectionAsString() const
 {
-       return mathcursor ? mathcursor->grabSelection() : string(); 
+       return mathcursor ? mathcursor->grabSelection() : string();
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -1025,13 +1042,13 @@ void mathDispatch(FuncRequest const & cmd)
                        }
                        break;
 
-               case LFUN_GREEK: 
-               case LFUN_INSERT_MATH: 
-               case LFUN_INSERT_MATRIX: 
+               case LFUN_GREEK:
+               case LFUN_INSERT_MATH:
+               case LFUN_INSERT_MATRIX:
                case LFUN_MATH_DELIM: {
                        InsetFormula * f = new InsetFormula(bv);
                        if (openNewInset(bv, f)) {
-                               bv->theLockingInset()-> 
+                               bv->theLockingInset()->
                                        localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
                                bv->theLockingInset()->localDispatch(cmd);
                        }