do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 9fb01eda4f153259b3307df1a09148b06d5424b3..f7d9a8806df63939c6974acf49b38d85feff05fc 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -198,48 +198,58 @@ string const freefont2string()
 
 }
 
-bool LyXText::cursorPrevious(LCursor & cur)
+void LyXText::cursorPrevious(LCursor & cur)
 {
        pos_type cpos = cur.pos();
        pit_type cpar = cur.pit();
 
        int x = cur.x_target();
 
+       // FIXME: there would maybe a need for this 'updated' boolean in the future...
        bool updated = setCursorFromCoordinates(cur, x, 0);
-       if (updated)
-               cur.bv().update();
-       updated |= cursorUp(cur);
+       if (cur.inMathed())
+               updated |= cur.up();
+       else
+               updated |= 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.
-               updated |= cursorUp(cur);
+               if (cur.inMathed())
+                       updated |= cur.up();
+               else
+                       updated |= cursorUp(cur);
        }
 
        finishUndo();
-       return updated;
+       cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
 
-bool LyXText::cursorNext(LCursor & cur)
+void LyXText::cursorNext(LCursor & cur)
 {
        pos_type cpos = cur.pos();
        pit_type cpar = cur.pit();
 
        int x = cur.x_target();
+       // FIXME: there would maybe a need for this 'updated' boolean in the future...
        bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
-       if (updated)
-               cur.bv().update();
-       updated |= cursorDown(cur);
+       if (cur.inMathed())
+               updated |= cur.down();
+       else
+               updated |= cursorDown(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 next row instead.
-               updated |= cursorDown(cur);
+               if (cur.inMathed())
+                       updated |= cur.down();
+               else
+                       updated |= cursorDown(cur);
        }
 
        finishUndo();
-       return updated;
+       cur.updateFlags(Update::Force | Update::FitCursor);
 }
 
 
@@ -500,7 +510,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_UP);
                } else {
-                       needsUpdate |= cursorPrevious(cur);
+                       cursorPrevious(cur);
                }
                break;
 
@@ -512,7 +522,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_DOWN);
                } else {
-                       needsUpdate |= cursorNext(cur);
+                       cursorNext(cur);
                }
                break;
 
@@ -981,7 +991,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        paste_internally = true;
                }
 
-               bv->mouseSetCursor(cur);
+               // we have to update after dePM triggered
+               bool update = bv->mouseSetCursor(cur);
 
                // Insert primary selection with middle mouse
                // if there is a local selection in the current buffer,
@@ -993,7 +1004,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                                lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
                }
 
-               if (cmd.button() == mouse_button::button1) {
+               if (!update && cmd.button() == mouse_button::button1) {
                        needsUpdate = false;
                        cur.noUpdate();
                }
@@ -1189,6 +1200,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_HFILL_INSERT:
        case LFUN_LINE_INSERT:
        case LFUN_PAGEBREAK_INSERT:
+       case LFUN_CLEARPAGE_INSERT:
+       case LFUN_CLEARDOUBLEPAGE_INSERT:
                // do nothing fancy
                doInsertInset(cur, this, cmd, false, false);
                cur.posRight();
@@ -1518,7 +1531,16 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
            && oldTopSlice.idx() == cur.idx()
            && !sel // sel is a backup of cur.selection() at the biginning of the function.
            && !cur.selection())
-               cur.noUpdate();
+               // FIXME: it would be better if we could just do this
+               //
+               //if (cur.result().update() != Update::FitCursor)
+               //      cur.noUpdate();
+               // 
+               // But some LFUNs do not set Update::FitCursor when needed, so we
+               // do it for all. This is not very harmfull as FitCursor will provoke
+               // a full redraw only if needed but still, a proper review of all LFUN
+               // should be done and this needsUpdate boolean can then be removed.
+               cur.updateFlags(Update::FitCursor);
        else
                cur.updateFlags(Update::Force | Update::FitCursor);
 }
@@ -1744,7 +1766,13 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 
        case LFUN_CHANGE_ACCEPT:
        case LFUN_CHANGE_REJECT:
-               enable = true; // FIXME: Change tracking (MG)
+               // TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
+               // In principle, these LFUNs should only be enabled if there
+               // is a change at the current position/in the current selection.
+               // However, without proper optimizations, this will inevitably
+               // result in unacceptable performance - just imagine a user who
+               // wants to select the complete content of a long document.
+               enable = true;
                break;
 
        case LFUN_WORD_DELETE_FORWARD:
@@ -1800,6 +1828,8 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
        case LFUN_SELF_INSERT:
        case LFUN_LINE_INSERT:
        case LFUN_PAGEBREAK_INSERT:
+       case LFUN_CLEARPAGE_INSERT:
+       case LFUN_CLEARDOUBLEPAGE_INSERT:
        case LFUN_MATH_DISPLAY:
        case LFUN_MATH_IMPORT_SELECTION:
        case LFUN_MATH_MODE: