don't rm emergency saves ever

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 6d41f5c558ae7fe5e82fa1c7acd87af8e27db630..ff12e1fcb6bda77e34c5838ac477e9bd4ecf2a32 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -43,6 +43,7 @@
 using std::endl;
 using std::find;
 using std::vector;
+using lyx::pos_type;
 
 extern string current_layout;
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
@@ -67,11 +68,8 @@ namespace {
                }
                if (!lt->isInInset()) {
                        bv->update(lt, BufferView::SELECT);
-                       bv->showCursor();
                } else if (bv->text->refreshStatus() != LyXText::REFRESH_NONE) {
-                       bv->theLockingInset()->hideInsetCursor(bv);
                        bv->update(BufferView::SELECT);
-                       bv->showCursor();
                }
 
                if (!lt->selection.set())
@@ -170,28 +168,29 @@ Inset * LyXText::checkInsetHit(int & x, int & y)
 bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
                            string const & contents)
 {
-       LyXCursor res = cursor;
+       ParagraphList::iterator end = ownerParagraphs().end();
+       ParagraphList::iterator pit = cursor.par();
+       pos_type pos = cursor.pos();
+
        Inset * inset;
        do {
-               if (res.pos() < res.par()->size() - 1) {
-                       res.pos(res.pos() + 1);
+               if (pos + 1 < pit->size()) {
+                       ++pos;
                } else  {
-                       res.par(boost::next(res.par()));
-                       res.pos(0);
+                       ++pit;
+                       pos = 0;
                }
 
-       } while (res.par() != ownerParagraphs().end()&&
-                !(res.par()->isInset(res.pos())
-                  && (inset = res.par()->getInset(res.pos())) != 0
-                  && find(codes.begin(), codes.end(), inset->lyxCode())
-                  != codes.end()
-                  && (contents.empty() ||
-                      static_cast<InsetCommand *>(
-                                                       res.par()->getInset(res.pos()))->getContents()
-                      == contents)));
-
-       if (res.par() != ownerParagraphs().end()) {
-               setCursor(res.par(), res.pos(), false);
+       } while (pit != end &&
+                !(pit->isInset(pos) &&
+                  (inset = pit->getInset(pos)) != 0 &&
+                  find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
+                  (contents.empty() ||
+                   static_cast<InsetCommand *>(pit->getInset(pos))->getContents()
+                   == contents)));
+
+       if (pit != end) {
+               setCursor(pit, pos, false);
                return true;
        }
        return false;
@@ -199,14 +198,14 @@ bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
 
 
 void LyXText::gotoInset(vector<Inset::Code> const & codes,
-                                 bool same_content)
+                       bool same_content)
 {
-       bv()->hideCursor();
        bv()->beforeChange(this);
        update();
 
        string contents;
-       if (same_content && cursor.par()->isInset(cursor.pos())) {
+       if (same_content && cursor.pos() < cursor.par()->size()
+           && cursor.par()->isInset(cursor.pos())) {
                Inset const * inset = cursor.par()->getInset(cursor.pos());
                if (find(codes.begin(), codes.end(), inset->lyxCode())
                    != codes.end())
@@ -362,7 +361,6 @@ namespace {
 
 void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
 {
-       bv->hideCursor();
        lt->update();
        InsetSpecialChar * new_inset = new InsetSpecialChar(kind);
        if (!bv->insertInset(new_inset))
@@ -416,7 +414,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
                for (; tmp != end; ++tmp) {
                        if (tmp->params().startOfAppendix()) {
-                               setUndo(bv, Undo::EDIT, &*tmp, &*boost::next(tmp));
+                               setUndo(bv, Undo::EDIT, tmp, boost::next(tmp));
                                tmp->params().startOfAppendix(false);
                                int tmpy;
                                setHeightOfRow(getRow(tmp, 0, tmpy));
@@ -424,7 +422,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        }
                }
 
-               setUndo(bv, Undo::EDIT, &*pit, &*boost::next(pit));
+               setUndo(bv, Undo::EDIT, pit, boost::next(pit));
                pit->params().startOfAppendix(start);
 
                // we can set the refreshing parameters now
@@ -730,7 +728,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        update();
                        // It is possible to make it a lot faster still
                        // just comment out the line below...
-                       bv->showCursor();
                } else {
                        update();
                        cutSelection(bv, true);
@@ -788,7 +785,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                                update();
                                // It is possible to make it a lot faster still
                                // just comment out the line below...
-                               bv->showCursor();
                        }
                } else {
                        update();
@@ -915,8 +911,12 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                break;
        }
 
+       case LFUN_INSET_SETTINGS:
+               lyx::Assert(bv->theLockingInset());
+               bv->theLockingInset()->getLockingInset()->showInsetDialog(bv);
+               break;
+
        case LFUN_INSET_TOGGLE:
-               bv->hideCursor();
                bv->beforeChange(this);
                update();
                toggleInset();
@@ -1016,7 +1016,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
        case LFUN_PASTE:
                cmd.message(_("Paste"));
-               bv->hideCursor();
                // clear the selection
                bv->toggleSelection();
                clearSelection();
@@ -1028,7 +1027,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                break;
 
        case LFUN_CUT:
-               bv->hideCursor();
                update();
                cutSelection(bv, true);
                update();
@@ -1134,7 +1132,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        }
                }
                if (change_layout) {
-                       bv->hideCursor();
                        current_layout = layout;
                        update();
                        setLayout(layout);
@@ -1148,7 +1145,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_PASTESELECTION: {
                if (!bv->buffer())
                        break;
-               bv->hideCursor();
                // this was originally a beforeChange(bv->text), i.e
                // the outermost LyXText!
                bv->beforeChange(this);
@@ -1192,7 +1188,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                else
                        c = pit->getChar(pos - 1);
 
-               bv->hideCursor();
                LyXLayout_ptr const & style = pit->layout();
 
                if (style->pass_thru ||
@@ -1232,7 +1227,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                if (cmd.button() == mouse_button::button1) {
                        if (!isInInset()) {
-                               bv->screen().hideCursor();
                                bv->screen().toggleSelection(this, bv);
                        }
                        cursorHome();
@@ -1253,7 +1247,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                if (cmd.button() == mouse_button::button1) {
                        if (!isInInset()) {
-                               bv->screen().hideCursor();
                                bv->screen().toggleSelection(this, bv);
                                selectWord(LyXText::WHOLE_WORD_STRICT);
                                bv->screen().toggleSelection(this, bv, false);
@@ -1300,8 +1293,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                }
 
-               bv->screen().hideCursor();
-
                RowList::iterator cursorrow = bv->text->cursor.row();
                bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->text->top_y());
        #if 0
@@ -1327,7 +1318,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                bv->text->setSelection();
                bv->screen().toggleToggle(bv->text, bv);
                bv->fitCursor();
-               bv->showCursor();
                break;
        }
 
@@ -1381,7 +1371,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
                if (!inset_hit)
                        selection_possible = true;
-               bv->screen().hideCursor();
 
                // Clear the selection
                bv->screen().toggleSelection(bv->text, bv);
@@ -1396,9 +1385,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
                        selection_possible = false;
                        bv->owner()->message(inset->editMessage());
-                       //inset->edit(bv, x, y, cmd.button());
                        // We just have to lock the inset before calling a PressEvent on it!
-                       // we don't need the edit() call here! (Jug20020329)
                        if (!bv->lockInset(inset))
                                lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
                        FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());