Revert last patch for time being. This gives 0 vertical size of widget by default.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index a207abd936603557052e6b8e3ed6526af19e24b6..e21eddffe62a5e4ef3cee109571a3a56c85de5a5 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -424,7 +424,7 @@ void BufferView::processUpdateFlags(Update::flags flags)
 
        if (flags == Update::Decoration) {
                d->update_strategy_ = DecorationUpdate;
-               buffer_.changed();
+               buffer_.changed(false);
                return;
        }
 
@@ -437,7 +437,7 @@ void BufferView::processUpdateFlags(Update::flags flags)
                }
                if (flags & Update::Decoration) {
                        d->update_strategy_ = DecorationUpdate;
-                       buffer_.changed();
+                       buffer_.changed(false);
                        return;
                }
                // no screen update is needed.
@@ -453,13 +453,13 @@ void BufferView::processUpdateFlags(Update::flags flags)
 
        if (!(flags & Update::FitCursor)) {
                // Nothing to do anymore. Trigger a redraw and return
-               buffer_.changed();
+               buffer_.changed(false);
                return;
        }
 
        // updateMetrics() does not update paragraph position
        // This is done at draw() time. So we need a redraw!
-       buffer_.changed();
+       buffer_.changed(false);
 
        if (fitCursor()) {
                // The cursor is off screen so ensure it is visible.
@@ -573,8 +573,7 @@ void BufferView::scrollDocView(int value)
        // If the offset is less than 2 screen height, prefer to scroll instead.
        if (abs(offset) <= 2 * height_) {
                d->anchor_ypos_ -= offset;
-               updateMetrics();
-               buffer_.changed();
+               buffer_.changed(true);
                return;
        }
 
@@ -765,7 +764,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
                // To center the screen on this new position we need the
                // paragraph position which is computed at draw() time.
                // So we need a redraw!
-               buffer_.changed();
+               buffer_.changed(false);
                if (fitCursor())
                        showCursor();
        }
@@ -811,7 +810,7 @@ void BufferView::showCursor()
 void BufferView::showCursor(DocIterator const & dit, bool recenter)
 {
        if (scrollToCursor(dit, recenter))
-               buffer_.changed();
+               buffer_.changed(false);
 }
 
 
@@ -1015,7 +1014,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
        case LFUN_SCREEN_SHOW_CURSOR:
        case LFUN_BIBTEX_DATABASE_ADD:
        case LFUN_BIBTEX_DATABASE_DEL:
-       case LFUN_NOTES_MUTATE:
        case LFUN_ALL_INSETS_TOGGLE:
        case LFUN_STATISTICS:
        case LFUN_BRANCH_ADD_INSERT:
@@ -1040,18 +1038,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                break;
        }
 
-       case LFUN_NEXT_INSET_MODIFY: {
-               // this is the real function we want to invoke
-               FuncRequest tmpcmd = cmd;
-               tmpcmd.action = LFUN_INSET_MODIFY;
-               // if there is an inset at cursor, see whether it
-               // handles the lfun, other start from scratch
-               Inset * inset = cur.nextInset();
-               if (!inset || !inset->getStatus(cur, tmpcmd, flag))
-                       flag = lyx::getStatus(tmpcmd);
-               break;
-       }
-
        case LFUN_LABEL_GOTO: {
                flag.setEnabled(!cmd.argument().empty()
                    || getInsetByCode<InsetRef>(cur, REF_CODE));
@@ -1504,9 +1490,16 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_WORD_FINDADV:
-               findAdv(this, cmd);
+       case LFUN_WORD_FINDADV: {
+               FindAndReplaceOptions opt;
+               istringstream iss(to_utf8(cmd.argument()));
+               iss >> opt;
+               if (findAdv(this, opt))
+                       cur.dispatched();
+               else
+                       cur.undispatched();
                break;
+       }
 
        case LFUN_MARK_OFF:
                cur.clearSelection();
@@ -1624,31 +1617,6 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_NEXT_INSET_MODIFY: {
-               // create the the real function we want to invoke
-               FuncRequest tmpcmd = cmd;
-               tmpcmd.action = LFUN_INSET_MODIFY;
-               // if there is an inset at cursor, see whether it
-               // can be modified.
-               Inset * inset = cur.nextInset();
-               if (inset) {
-                       cur.recordUndo();
-                       inset->dispatch(cur, tmpcmd);
-               }
-               // if it did not work, try the underlying inset.
-               if (!inset || !cur.result().dispatched()) {
-                       cur.recordUndo();
-                       cur.dispatch(tmpcmd);
-               }
-
-               if (!cur.result().dispatched())
-                       // It did not work too; no action needed.
-                       break;
-               cur.clearSelection();
-               processUpdateFlags(Update::Force | Update::FitCursor);
-               break;
-       }
-
        case LFUN_SCREEN_UP:
        case LFUN_SCREEN_DOWN: {
                Point p = getPos(cur, cur.boundary());
@@ -1668,8 +1636,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                Cursor old = cur;
                bool const in_texted = cur.inTexted();
                cur.reset();
-               updateMetrics();
-               buffer_.changed();
+               buffer_.changed(true);
                d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
                        true, cmd.action == LFUN_SCREEN_UP); 
                //FIXME: what to do with cur.x_target()?
@@ -1718,18 +1685,6 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
-       // This could be rewriten using some command like forall <insetname> <command>
-       // once the insets refactoring is done.
-       case LFUN_NOTES_MUTATE: {
-               if (cmd.argument().empty())
-                       break;
-
-               if (mutateNotes(cur, cmd.getArg(0), cmd.getArg(1))) {
-                       processUpdateFlags(Update::Force);
-               }
-               break;
-       }
-
 
        // This would be in Buffer class if only Cursor did not
        // require a bufferview
@@ -1739,9 +1694,10 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                FuncRequest const fr = lyxaction.lookupFunc(commandstr);
 
                // an arbitrary number to limit number of iterations
-               const int max_iter = 1000;
+               const int max_iter = 10000;
                int iterations = 0;
                Cursor & cur = d->cursor_;
+               Cursor const savecur = cur;
                cur.reset();
                if (!cur.nextInset())
                        cur.forwardInset();
@@ -1766,11 +1722,12 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        cur.forwardInset();
                }
                cur.endUndoGroup();
-               cur.reset();
+               cur = savecur;
+               cur.fixIfBroken();
                processUpdateFlags(Update::Force);
 
                if (iterations >= max_iter)
-                       cur.errorMessage(bformat(_("inset-forall interrupted because number of actions is larger than %1$s"), max_iter));
+                       cur.errorMessage(bformat(_("`inset-forall' interrupted because number of actions is larger than %1$d"), max_iter));
                else
                        cur.message(bformat(_("Applied \"%1$s\" to %2$d insets"), from_utf8(commandstr), iterations));
                break;
@@ -1932,7 +1889,7 @@ void BufferView::clearSelection()
        d->xsel_cache_.set = false;
        // The buffer did not really change, but this causes the
        // redraw we need because we cleared the selection above.
-       buffer_.changed();
+       buffer_.changed(false);
 }
 
 
@@ -2027,7 +1984,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
                // This event (moving without mouse click) is not passed further.
                // This should be changed if it is further utilized.
-               buffer_.changed();
+               buffer_.changed(false);
                return;
        }
 
@@ -2088,8 +2045,7 @@ void BufferView::lfunScroll(FuncRequest const & cmd)
                if (scroll_value)
                        scroll(scroll_step * scroll_value);
        }
-       updateMetrics();
-       buffer_.changed();
+       buffer_.changed(true);
 }
 
 
@@ -2275,9 +2231,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
        d->cursor_ = cur;
 
        buffer_.updateLabels();
-
-       updateMetrics();
-       buffer_.changed();
+       buffer_.changed(true);
        return true;
 }
 
@@ -2511,8 +2465,7 @@ void BufferView::insertLyXFile(FileName const & fname)
                res = _("Could not insert document %1$s");
        }
 
-       updateMetrics();
-       buffer_.changed();
+       buffer_.changed(true);
        // emit message signal.
        message(bformat(res, disp_fn));
        buffer_.errors("Parse");
@@ -2819,8 +2772,7 @@ void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph)
        else
                cur.innerText()->insertStringAsLines(cur, tmpstr, cur.current_font);
 
-       updateMetrics();
-       buffer_.changed();
+       buffer_.changed(true);
 }