remove indirection from LyXView::viewStatusMessage().

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 86d1ba6a11416e14845f576ef4675395058d0f27..7963262a159b37c51349e82e9853c5c1e9025f85 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -48,9 +48,7 @@
 
 #include "frontends/Application.h"
 #include "frontends/Clipboard.h"
-#include "frontends/LyXView.h"
 #include "frontends/Selection.h"
-#include "frontends/WorkArea.h"
 
 #include "insets/InsetCollapsable.h"
 #include "insets/InsetCommand.h"
@@ -204,13 +202,14 @@ void regexpDispatch(Cursor & cur, FuncRequest const & cmd)
                return;
        }
        cur.recordUndo();
-       docstring const save_selection = grabAndEraseSelection(cur);
-       selClearOrDel(cur);
-       // replaceSelection(cur);
+       docstring sel = cur.selectionAsString(false);
+
+       // It may happen that sel is empty but there is a selection
+       replaceSelection(cur);
 
        cur.insert(new InsetMathHull(hullRegexp));
        cur.nextInset()->edit(cur, true);
-       cur.niceInsert(save_selection);
+       cur.niceInsert(sel);
 
        cur.message(_("Regexp editor mode"));
 }
@@ -388,10 +387,6 @@ static void outline(OutlineOp mode, Cursor & cur)
                        break;
        }
 
-       // Do we need to set insets' buffer_ members, because we copied
-       // some stuff? We'll assume we do and reset it otherwise.
-       bool set_buffers = true;
-
        switch (mode) {
                case OutlineUp: {
                        if (start == pars.begin())
@@ -415,10 +410,8 @@ static void outline(OutlineOp mode, Cursor & cur)
                        pit_type const len = distance(start, finish);
                        pit_type const deletepit = pit + len;
                        buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
-                       pars.insert(dest, start, finish);
-                       start = boost::next(pars.begin(), deletepit);
-                       pit = newpit;
-                       pars.erase(start, finish);
+                       pars.splice(dest, start, finish);
+                       cur.pit() = newpit;
                        break;
                }
                case OutlineDown: {
@@ -436,12 +429,10 @@ static void outline(OutlineOp mode, Cursor & cur)
                        }
                        // One such was found:
                        pit_type newpit = distance(bgn, dest);
-                       pit_type const len = distance(start, finish);
                        buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
-                       pars.insert(dest, start, finish);
-                       start = boost::next(bgn, pit);
-                       pit = newpit - len;
-                       pars.erase(start, finish);
+                       pit_type const len = distance(start, finish);
+                       pars.splice(dest, start, finish);
+                       cur.pit() = newpit - len;
                        break;
                }
                case OutlineIn: {
@@ -461,7 +452,6 @@ static void outline(OutlineOp mode, Cursor & cur)
                                        }
                                }
                        }
-                       set_buffers = false;
                        break;
                }
                case OutlineOut: {
@@ -481,20 +471,9 @@ static void outline(OutlineOp mode, Cursor & cur)
                                        }
                                }
                        }
-                       set_buffers = false;
                        break;
                }
        }
-       if (set_buffers)
-               // FIXME This only really needs doing for the newly introduced 
-               // paragraphs. Something like:
-               //      pit_type const numpars = distance(start, finish);
-               //      start = boost::next(bgn, pit);
-               //      finish = boost::next(start, numpars);
-               //      for (; start != finish; ++start)
-               //              start->setBuffer(buf);
-               // But while this seems to work, it is kind of fragile.
-               buf.inset().setBuffer(buf);
 }
 
 
@@ -643,7 +622,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_BEGIN:
        case LFUN_INSET_BEGIN_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_INSET_BEGIN_SELECT);
-               if (cur.depth() == 1 || cur.pos() > 0)
+               if (cur.depth() == 1 || !cur.top().at_begin())
                        needsUpdate |= cursorTop(cur);
                else
                        cur.undispatched();
@@ -653,13 +632,25 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_END:
        case LFUN_INSET_END_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_INSET_END_SELECT);
-               if (cur.depth() == 1 || cur.pos() < cur.lastpos())
+               if (cur.depth() == 1 || !cur.top().at_end())
                        needsUpdate |= cursorBottom(cur);
                else
                        cur.undispatched();
                cur.updateFlags(Update::FitCursor);
                break;
 
+       case LFUN_INSET_SELECT_ALL:
+               if (cur.depth() == 1 || !cur.selection() || !cur.selBegin().at_begin()
+                         || !cur.selEnd().at_end()) {
+                       needsUpdate |= cur.selHandle(false);
+                       needsUpdate |= cursorTop(cur);
+                       needsUpdate |= cur.selHandle(true);
+                       needsUpdate |= cursorBottom(cur);
+               } else 
+                       cur.undispatched();
+               cur.updateFlags(Update::FitCursor);
+               break;
+
        case LFUN_CHAR_FORWARD:
        case LFUN_CHAR_FORWARD_SELECT:
                //LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
@@ -2146,10 +2137,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       if (lyxrc.spellcheck_continuously && cur.inTexted())
-               // Take this opportunity to spellcheck current word.
-               cur.paragraph().isMisspelled(cur.pos());
-
        needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
 
        // FIXME: The cursor flag is reset two lines below
@@ -2696,6 +2683,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_END:
        case LFUN_INSET_BEGIN_SELECT:
        case LFUN_INSET_END_SELECT:
+       case LFUN_INSET_SELECT_ALL:
        case LFUN_UNICODE_INSERT:
                // these are handled in our dispatch()
                enable = true;
@@ -2750,11 +2738,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_UWAVE:
        case LFUN_LABEL_GOTO:
        case LFUN_LAYOUT_TABULAR:
-       case LFUN_MENU_OPEN:
        case LFUN_NOACTION:
        case LFUN_NOTE_NEXT:
        case LFUN_REFERENCE_NEXT:
-       case LFUN_SERVER_GOTO_FILE_ROW:
        case LFUN_SERVER_NOTIFY:
        case LFUN_SERVER_SET_XY:
        case LFUN_TEXTSTYLE_APPLY: