X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=6089756f9bbae041d28cc8322a1b4ff34712a579;hb=d1e3d75da226311cb290fc4be3686d6deef7b967;hp=054fadbbabab473aa0f3fbe0db7aca753e1b8f13;hpb=7b1bf2333704ebdc3ac51fbee49017aff1accc01;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 054fadbbab..6089756f9b 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -4,10 +4,10 @@ * Licence details can be found in the file COPYING. * * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author John Levon - * \author André Pönitz - * \author Jürgen Vigna + * \author André Pönitz + * \author Jürgen Vigna * * Full author contact details are available in file CREDITS. */ @@ -150,11 +150,13 @@ bool findInset(DocIterator & dit, vector const & codes, if (!findNextInset(tmpdit, codes, contents)) { if (dit.depth() != 1 || dit.pit() != 0 || dit.pos() != 0) { - tmpdit = doc_iterator_begin(tmpdit.bottom().inset()); + Inset * inset = &tmpdit.bottom().inset(); + tmpdit = doc_iterator_begin(&inset->buffer(), inset); if (!findNextInset(tmpdit, codes, contents)) return false; - } else + } else { return false; + } } dit = tmpdit; @@ -216,7 +218,7 @@ struct BufferView::Private Private(BufferView & bv): wh_(0), cursor_(bv), anchor_pit_(0), anchor_ypos_(0), inlineCompletionUniqueChars_(0), - last_inset_(0), gui_(0) + last_inset_(0), bookmark_edit_position_(0), gui_(0) {} /// @@ -259,6 +261,9 @@ struct BufferView::Private */ Inset * last_inset_; + // cache for id of the paragraph which was edited the last time + int bookmark_edit_position_; + mutable TextMetricsCache text_metrics_; /// Whom to notify. @@ -272,11 +277,13 @@ struct BufferView::Private BufferView::BufferView(Buffer & buf) - : width_(0), height_(0), full_screen_(false), buffer_(buf), d(new Private(*this)) + : width_(0), height_(0), full_screen_(false), buffer_(buf), + d(new Private(*this)) { d->xsel_cache_.set = false; d->intl_.initKeyMapper(lyxrc.use_kbmap); + d->cursor_.setBuffer(&buf); d->cursor_.push(buffer_.inset()); d->cursor_.resetAnchor(); d->cursor_.setCurrentFont(); @@ -510,7 +517,10 @@ void BufferView::updateScrollbar() d->scrollbarParameters_.position = 0; // The reference is the top position so we remove one page. - d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step; + if (lyxrc.scroll_below_document) + d->scrollbarParameters_.max -= minVisiblePart(); + else + d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step; } @@ -549,9 +559,14 @@ docstring BufferView::contextMenu(int x, int y) const void BufferView::scrollDocView(int value) { int const offset = value - d->scrollbarParameters_.position; + + // No scrolling at all? No need to redraw anything + if (offset == 0) + return; + // If the offset is less than 2 screen height, prefer to scroll instead. if (abs(offset) <= 2 * height_) { - scroll(offset); + d->anchor_ypos_ -= offset; updateMetrics(); buffer_.changed(); return; @@ -559,7 +574,7 @@ void BufferView::scrollDocView(int value) // cut off at the top if (value <= d->scrollbarParameters_.min) { - DocIterator dit = doc_iterator_begin(buffer_.inset()); + DocIterator dit = doc_iterator_begin(&buffer_); showCursor(dit); LYXERR(Debug::SCROLLING, "scroll to top"); return; @@ -567,7 +582,7 @@ void BufferView::scrollDocView(int value) // cut off at the bottom if (value >= d->scrollbarParameters_.max) { - DocIterator dit = doc_iterator_end(buffer_.inset()); + DocIterator dit = doc_iterator_end(&buffer_); dit.backwardPos(); showCursor(dit); LYXERR(Debug::SCROLLING, "scroll to bottom"); @@ -591,7 +606,7 @@ void BufferView::scrollDocView(int value) return; } - DocIterator dit = doc_iterator_begin(buffer_.inset()); + DocIterator dit = doc_iterator_begin(&buffer_); dit.pit() = i; LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i); showCursor(dit); @@ -627,7 +642,14 @@ void BufferView::setCursorFromScrollbar() Cursor cur(*this); cur.reset(buffer_.inset()); tm.setCursorFromCoordinates(cur, 0, newy); + + // update the bufferview cursor and notify insets + // FIXME: Care about the d->cursor_ flags to redraw if needed + Cursor old = d->cursor_; mouseSetCursor(cur); + bool badcursor = notifyCursorLeavesOrEnters(old, d->cursor_); + if (badcursor) + d->cursor_.fixIfBroken(); } @@ -654,9 +676,19 @@ CursorStatus BufferView::cursorStatus(DocIterator const & dit) const } +void BufferView::bookmarkEditPosition() +{ + // Don't eat cpu time for each keystroke + if (d->cursor_.paragraph().id() == d->bookmark_edit_position_) + return; + saveBookmark(0); + d->bookmark_edit_position_ = d->cursor_.paragraph().id(); +} + + void BufferView::saveBookmark(unsigned int idx) { - // tenatively save bookmark, id and pos will be used to + // tentatively save bookmark, id and pos will be used to // acturately locate a bookmark in a 'live' lyx session. // pit and pos will be updated with bottom level pit/pos // when lyx exits. @@ -697,7 +729,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // insets. size_t const n = dit.depth(); for (size_t i = 0; i < n; ++i) - if (dit[i].inset().editable() != Inset::HIGHLY_EDITABLE) { + if (!dit[i].inset().editable()) { dit.resize(i); break; } @@ -712,7 +744,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // it will be restored to the left of the outmost inset that contains // the bookmark. if (bottom_pit < int(buffer_.paragraphs().size())) { - dit = doc_iterator_begin(buffer_.inset()); + dit = doc_iterator_begin(&buffer_); dit.pit() = bottom_pit; dit.pos() = min(bottom_pos, dit.paragraph().size()); @@ -758,18 +790,37 @@ int BufferView::workWidth() const } +void BufferView::recenter() +{ + showCursor(d->cursor_, true); +} + + void BufferView::showCursor() { - showCursor(d->cursor_); + showCursor(d->cursor_, false); +} + + +void BufferView::showCursor(DocIterator const & dit, bool recenter) +{ + if (scrollToCursor(dit, recenter)) + buffer_.changed(); +} + + +void BufferView::scrollToCursor() +{ + scrollToCursor(d->cursor_, false); } -void BufferView::showCursor(DocIterator const & dit) +bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter) { // We are not properly started yet, delay until resizing is // done. if (height_ == 0) - return; + return false; LYXERR(Debug::SCROLLING, "recentering!"); @@ -800,16 +851,19 @@ void BufferView::showCursor(DocIterator const & dit) Dimension const & row_dim = pm.getRow(cs.pos(), dit.boundary()).dimension(); int scrolled = 0; - if (ypos - row_dim.ascent() < 0) + if (recenter) + scrolled = scroll(ypos - height_/2); + else if (ypos - row_dim.ascent() < 0) scrolled = scrollUp(- ypos + row_dim.ascent()); else if (ypos + row_dim.descent() > height_) - scrolled = scrollDown(ypos - height_ + row_dim.descent()); + scrolled = scrollDown(ypos - height_ + defaultRowHeight() ); + // else, nothing to do, the cursor is already visible so we just return. if (scrolled != 0) { updateMetrics(); - buffer_.changed(); + return true; } - return; + return false; } // fix inline completion position @@ -825,22 +879,24 @@ void BufferView::showCursor(DocIterator const & dit) Dimension const & row_dim = pm.getRow(cs.pos(), dit.boundary()).dimension(); - if (d->anchor_pit_ == 0) + if (recenter) + d->anchor_ypos_ = height_/2; + else if (d->anchor_pit_ == 0) d->anchor_ypos_ = offset + pm.ascent(); else if (d->anchor_pit_ == max_pit) d->anchor_ypos_ = height_ - offset - row_dim.descent(); + else if (offset > height_) + d->anchor_ypos_ = height_ - offset - defaultRowHeight(); else - d->anchor_ypos_ = defaultRowHeight() * 2 - offset - row_dim.descent(); + d->anchor_ypos_ = defaultRowHeight() * 2; updateMetrics(); - buffer_.changed(); + return true; } -FuncStatus BufferView::getStatus(FuncRequest const & cmd) +bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) { - FuncStatus flag; - Cursor & cur = d->cursor_; switch (cmd.action) { @@ -858,6 +914,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) // FIXME: Actually, these LFUNS should be moved to Text flag.setEnabled(cur.inTexted()); break; + case LFUN_FONT_STATE: case LFUN_LABEL_INSERT: case LFUN_INFO_INSERT: @@ -866,11 +923,13 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) case LFUN_NOTE_NEXT: case LFUN_REFERENCE_NEXT: case LFUN_WORD_FIND: + case LFUN_WORD_FINDADV: case LFUN_WORD_REPLACE: case LFUN_MARK_OFF: case LFUN_MARK_ON: case LFUN_MARK_TOGGLE: case LFUN_SCREEN_RECENTER: + case LFUN_SCREEN_SHOW_CURSOR: case LFUN_BIBTEX_DATABASE_ADD: case LFUN_BIBTEX_DATABASE_DEL: case LFUN_NOTES_MUTATE: @@ -879,12 +938,24 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) flag.setEnabled(true); break; - case LFUN_NEXT_INSET_TOGGLE: + // @todo Test if current WorkArea is the search WorkArea + case LFUN_REGEXP_MODE: + flag.setEnabled(! this->cursor().inRegexped()); + break; + + case LFUN_COPY_LABEL_AS_REF: { + // if there is an inset at cursor, see whether it + // handles the lfun + Inset * inset = cur.nextInset(); + if (!inset || !inset->getStatus(cur, cmd, flag)) + flag.setEnabled(false); + break; + } + case LFUN_NEXT_INSET_MODIFY: { // this is the real function we want to invoke FuncRequest tmpcmd = cmd; - tmpcmd.action = (cmd.action == LFUN_NEXT_INSET_TOGGLE) - ? LFUN_INSET_TOGGLE : LFUN_INSET_MODIFY; + 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(); @@ -911,6 +982,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) case LFUN_CHANGES_MERGE: case LFUN_CHANGE_NEXT: + case LFUN_CHANGE_PREVIOUS: case LFUN_ALL_CHANGES_ACCEPT: case LFUN_ALL_CHANGES_REJECT: // TODO: context-sensitive enabling of LFUNs @@ -945,60 +1017,19 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) flag.setEnabled(cur.inset().allowParagraphCustomization(cur.idx())); break; - case LFUN_INSET_SETTINGS: { - InsetCode code = cur.inset().lyxCode(); - if (cmd.getArg(0) == insetName(code)) { - flag.setEnabled(true); - break; - } - bool enable = false; - InsetCode next_code = cur.nextInset() - ? cur.nextInset()->lyxCode() : NO_CODE; - //FIXME: remove these special cases: - switch (next_code) { - case TABULAR_CODE: - case ERT_CODE: - case FLOAT_CODE: - case WRAP_CODE: - case NOTE_CODE: - case BRANCH_CODE: - case BOX_CODE: - case LISTINGS_CODE: - enable = (cmd.argument().empty() || - cmd.getArg(0) == insetName(next_code)); - break; - default: - break; - } - flag.setEnabled(enable); - break; - } - case LFUN_DIALOG_SHOW_NEW_INSET: + if (cur.inset().lyxCode() == CAPTION_CODE) + return cur.inset().getStatus(cur, cmd, flag); flag.setEnabled(cur.inset().lyxCode() != ERT_CODE && cur.inset().lyxCode() != LISTINGS_CODE); - if (cur.inset().lyxCode() == CAPTION_CODE) { - FuncStatus flag; - if (cur.inset().getStatus(cur, cmd, flag)) - return flag; - } break; - case LFUN_BRANCH_ACTIVATE: - case LFUN_BRANCH_DEACTIVATE: { - bool enable = false; - docstring const branchName = cmd.argument(); - if (!branchName.empty()) - enable = buffer_.params().branchlist().find(branchName); - flag.setEnabled(enable); - break; - } - default: flag.setEnabled(false); + return false; } - return flag; + return true; } @@ -1047,16 +1078,14 @@ bool BufferView::dispatch(FuncRequest const & cmd) docstring label = cmd.argument(); if (label.empty()) { InsetRef * inset = - getInsetByCode(d->cursor_, - REF_CODE); + getInsetByCode(cur, REF_CODE); if (inset) { label = inset->getParam("reference"); // persistent=false: use temp_bookmark saveBookmark(0); } } - - if (!label.empty()) + if (!label.empty()) gotoLabel(label); break; } @@ -1133,19 +1162,19 @@ bool BufferView::dispatch(FuncRequest const & cmd) buffer_.params().outputChanges = !buffer_.params().outputChanges; if (buffer_.params().outputChanges) { bool dvipost = LaTeXFeatures::isAvailable("dvipost"); - bool xcolorsoul = LaTeXFeatures::isAvailable("soul") && + bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); - if (!dvipost && !xcolorsoul) { + if (!dvipost && !xcolorulem) { Alert::warning(_("Changes not shown in LaTeX output"), _("Changes will not be highlighted in LaTeX output, " - "because neither dvipost nor xcolor/soul are installed.\n" + "because neither dvipost nor xcolor/ulem are installed.\n" "Please install these packages or redefine " "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); - } else if (!xcolorsoul) { + } else if (!xcolorulem) { Alert::warning(_("Changes not shown in LaTeX output"), _("Changes will not be highlighted in LaTeX output " - "when using pdflatex, because xcolor and soul are not installed.\n" + "when using pdflatex, because xcolor and ulem are not installed.\n" "Please install both packages or redefine " "\\lyxadded and \\lyxdeleted in the LaTeX preamble.")); } @@ -1154,32 +1183,42 @@ bool BufferView::dispatch(FuncRequest const & cmd) case LFUN_CHANGE_NEXT: findNextChange(this); + // FIXME: Move this LFUN to Buffer so that we don't have to do this: + processUpdateFlags(Update::Force | Update::FitCursor); + break; + + case LFUN_CHANGE_PREVIOUS: + findPreviousChange(this); + // FIXME: Move this LFUN to Buffer so that we don't have to do this: + processUpdateFlags(Update::Force | Update::FitCursor); break; case LFUN_CHANGES_MERGE: - if (findNextChange(this)) + if (findNextChange(this) || findPreviousChange(this)) { + processUpdateFlags(Update::Force | Update::FitCursor); showDialog("changes"); + } break; case LFUN_ALL_CHANGES_ACCEPT: // select complete document - d->cursor_.reset(buffer_.inset()); - d->cursor_.selHandle(true); - buffer_.text().cursorBottom(d->cursor_); + cur.reset(buffer_.inset()); + cur.selHandle(true); + buffer_.text().cursorBottom(cur); // accept everything in a single step to support atomic undo - buffer_.text().acceptOrRejectChanges(d->cursor_, Text::ACCEPT); + buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT); // FIXME: Move this LFUN to Buffer so that we don't have to do this: processUpdateFlags(Update::Force | Update::FitCursor); break; case LFUN_ALL_CHANGES_REJECT: // select complete document - d->cursor_.reset(buffer_.inset()); - d->cursor_.selHandle(true); - buffer_.text().cursorBottom(d->cursor_); + cur.reset(buffer_.inset()); + cur.selHandle(true); + buffer_.text().cursorBottom(cur); // reject everything in a single step to support atomic undo // Note: reject does not work recursively; the user may have to repeat the operation - buffer_.text().acceptOrRejectChanges(d->cursor_, Text::REJECT); + buffer_.text().acceptOrRejectChanges(cur, Text::REJECT); // FIXME: Move this LFUN to Buffer so that we don't have to do this: processUpdateFlags(Update::Force | Update::FitCursor); break; @@ -1188,6 +1227,10 @@ bool BufferView::dispatch(FuncRequest const & cmd) FuncRequest req = cmd; if (cmd.argument().empty() && !d->search_request_cache_.argument().empty()) req = d->search_request_cache_; + if (req.argument().empty()) { + theLyXFunc().dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace")); + break; + } if (find(this, req)) showCursor(); else @@ -1212,21 +1255,23 @@ bool BufferView::dispatch(FuncRequest const & cmd) break; } + case LFUN_WORD_FINDADV: + findAdv(this, cmd); + break; + case LFUN_MARK_OFF: cur.clearSelection(); - cur.resetAnchor(); cur.message(from_utf8(N_("Mark off"))); break; case LFUN_MARK_ON: cur.clearSelection(); cur.setMark(true); - cur.resetAnchor(); cur.message(from_utf8(N_("Mark on"))); break; case LFUN_MARK_TOGGLE: - cur.clearSelection(); + cur.setSelection(false); if (cur.mark()) { cur.setMark(false); cur.message(from_utf8(N_("Mark removed"))); @@ -1237,12 +1282,16 @@ bool BufferView::dispatch(FuncRequest const & cmd) cur.resetAnchor(); break; - case LFUN_SCREEN_RECENTER: + case LFUN_SCREEN_SHOW_CURSOR: showCursor(); break; + + case LFUN_SCREEN_RECENTER: + recenter(); + break; case LFUN_BIBTEX_DATABASE_ADD: { - Cursor tmpcur = d->cursor_; + Cursor tmpcur = cur; findInset(tmpcur, BIBTEX_CODE, false); InsetBibtex * inset = getInsetByCode(tmpcur, BIBTEX_CODE); @@ -1254,7 +1303,7 @@ bool BufferView::dispatch(FuncRequest const & cmd) } case LFUN_BIBTEX_DATABASE_DEL: { - Cursor tmpcur = d->cursor_; + Cursor tmpcur = cur; findInset(tmpcur, BIBTEX_CODE, false); InsetBibtex * inset = getInsetByCode(tmpcur, BIBTEX_CODE); @@ -1271,8 +1320,8 @@ bool BufferView::dispatch(FuncRequest const & cmd) from = cur.selectionBegin(); to = cur.selectionEnd(); } else { - from = doc_iterator_begin(buffer_.inset()); - to = doc_iterator_end(buffer_.inset()); + from = doc_iterator_begin(&buffer_); + to = doc_iterator_end(&buffer_); } int const words = countWords(from, to); int const chars = countChars(from, to, false); @@ -1308,28 +1357,13 @@ bool BufferView::dispatch(FuncRequest const & cmd) // turn compression on/off buffer_.params().compressed = !buffer_.params().compressed; break; - - case LFUN_NEXT_INSET_TOGGLE: { - // create the the real function we want to invoke - FuncRequest tmpcmd = cmd; - tmpcmd.action = LFUN_INSET_TOGGLE; - // if there is an inset at cursor, see whether it - // wants to toggle. + case LFUN_COPY_LABEL_AS_REF: { + // if there is an inset at cursor, try to copy it Inset * inset = cur.nextInset(); if (inset) { - if (inset->isActive()) { - Cursor tmpcur = cur; - tmpcur.pushBackward(*inset); - inset->dispatch(tmpcur, tmpcmd); - if (tmpcur.result().dispatched()) - cur.dispatched(); - } else - inset->dispatch(cur, tmpcmd); + FuncRequest tmpcmd = cmd; + inset->dispatch(cur, tmpcmd); } - // if it did not work, try the underlying inset. - if (!inset || !cur.result().dispatched()) - cur.dispatch(tmpcmd); - if (!cur.result().dispatched()) // It did not work too; no action needed. break; @@ -1337,7 +1371,6 @@ bool BufferView::dispatch(FuncRequest const & cmd) processUpdateFlags(Update::SinglePar | Update::FitCursor); break; } - case LFUN_NEXT_INSET_MODIFY: { // create the the real function we want to invoke FuncRequest tmpcmd = cmd; @@ -1345,11 +1378,15 @@ bool BufferView::dispatch(FuncRequest const & cmd) // if there is an inset at cursor, see whether it // can be modified. Inset * inset = cur.nextInset(); - if (inset) + if (inset) { + cur.recordUndo(); inset->dispatch(cur, tmpcmd); + } // if it did not work, try the underlying inset. - if (!inset || !cur.result().dispatched()) + if (!inset || !cur.result().dispatched()) { + cur.recordUndo(); cur.dispatch(tmpcmd); + } if (!cur.result().dispatched()) // It did not work too; no action needed. @@ -1373,12 +1410,17 @@ bool BufferView::dispatch(FuncRequest const & cmd) p = Point(0, 0); if (cmd.action == LFUN_SCREEN_DOWN && scrolled < height_) p = Point(width_, height_); + Cursor old = cur; + bool const in_texted = cur.inTexted(); cur.reset(buffer_.inset()); updateMetrics(); buffer_.changed(); d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_); //FIXME: what to do with cur.x_target()? + bool update = in_texted && cur.bv().checkDepm(cur, old); cur.finishUndo(); + if (update) + processUpdateFlags(Update::Force | Update::FitCursor); break; } @@ -1420,12 +1462,6 @@ bool BufferView::dispatch(FuncRequest const & cmd) break; } - case LFUN_BRANCH_ACTIVATE: - case LFUN_BRANCH_DEACTIVATE: - buffer_.dispatch(cmd); - processUpdateFlags(Update::Force); - break; - // This could be rewriten using some command like forall // once the insets refactoring is done. case LFUN_NOTES_MUTATE: { @@ -1445,7 +1481,7 @@ bool BufferView::dispatch(FuncRequest const & cmd) FuncRequest fr(LFUN_INSET_TOGGLE, action); - Inset & inset = cur.buffer().inset(); + Inset & inset = cur.buffer()->inset(); InsetIterator it = inset_iterator_begin(inset); InsetIterator const end = inset_iterator_end(inset); for (; it != end; ++it) { @@ -1627,7 +1663,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) // Notify left insets if (cur != old) { old.fixIfBroken(); - bool badcursor = notifyCursorLeaves(old, cur); + bool badcursor = notifyCursorLeavesOrEnters(old, cur); if (badcursor) cursor().fixIfBroken(); } @@ -1664,6 +1700,12 @@ void BufferView::lfunScroll(FuncRequest const & cmd) } +int BufferView::minVisiblePart() +{ + return 2 * defaultRowHeight(); +} + + int BufferView::scroll(int y) { if (y > 0) @@ -1678,10 +1720,12 @@ int BufferView::scrollDown(int offset) { Text * text = &buffer_.text(); TextMetrics & tm = d->text_metrics_[text]; - int ymax = height_ + offset; + int const ymax = height_ + offset; while (true) { pair last = tm.last(); int bottom_pos = last.second->position() + last.second->descent(); + if (lyxrc.scroll_below_document) + bottom_pos += height_ - minVisiblePart(); if (last.first + 1 == int(text->paragraphs().size())) { if (bottom_pos <= height_) return 0; @@ -1744,9 +1788,8 @@ bool BufferView::setCursorFromInset(Inset const * inset) // Inset is not at cursor position. Find it in the document. Cursor cur(*this); cur.reset(buffer().inset()); - do + while (cur && cur.nextInset() != inset) cur.forwardInset(); - while (cur && cur.nextInset() != inset); if (cur) { setCursor(cur); @@ -1758,15 +1801,22 @@ bool BufferView::setCursorFromInset(Inset const * inset) void BufferView::gotoLabel(docstring const & label) { - Toc & toc = buffer().tocBackend().toc("label"); - TocIterator toc_it = toc.begin(); - TocIterator end = toc.end(); - for (; toc_it != end; ++toc_it) { - if (label == toc_it->str()) - dispatch(toc_it->action()); + std::vector bufs = buffer().allRelatives(); + std::vector::iterator it = bufs.begin(); + for (; it != bufs.end(); ++it) { + Buffer const * buf = *it; + + // find label + Toc & toc = buf->tocBackend().toc("label"); + TocIterator toc_it = toc.begin(); + TocIterator end = toc.end(); + for (; toc_it != end; ++toc_it) { + if (label == toc_it->str()) { + dispatch(toc_it->action()); + return; + } + } } - //FIXME: We could do a bit more searching thanks to this: - //InsetLabel const * inset = buffer_.insetLabel(label); } @@ -1829,7 +1879,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old) d->cursor_ = cur; - updateLabels(buffer_); + buffer_.updateLabels(); updateMetrics(); buffer_.changed(); @@ -1847,14 +1897,9 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) cap::saveSelection(cursor()); // Has the cursor just left the inset? - bool badcursor = false; bool leftinset = (&d->cursor_.inset() != &cur.inset()); - if (leftinset) { + if (leftinset) d->cursor_.fixIfBroken(); - badcursor = notifyCursorLeaves(d->cursor_, cur); - if (badcursor) - cur.fixIfBroken(); - } // FIXME: shift-mouse selection doesn't work well across insets. bool do_selection = select && &d->cursor_.anchor().inset() == &cur.inset(); @@ -1864,7 +1909,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) // FIXME: (2) if we had a working InsetText::notifyCursorLeaves, // the leftinset bool would not be necessary (badcursor instead). bool update = leftinset; - if (!do_selection && !badcursor && d->cursor_.inTexted()) + if (!do_selection && d->cursor_.inTexted()) update |= checkDepm(cur, d->cursor_); d->cursor_.setCursor(cur); @@ -2167,10 +2212,11 @@ Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const Point BufferView::getPos(DocIterator const & dit, bool boundary) const { + if (!paragraphVisible(dit)) + return Point(-1, -1); + CursorSlice const & bot = dit.bottom(); TextMetrics const & tm = textMetrics(bot.text()); - if (!tm.contains(bot.pit())) - return Point(-1, -1); Point p = coordOffset(dit, boundary); // offset from outer paragraph p.y_ += tm.parMetrics(bot.pit()).position(); @@ -2178,11 +2224,44 @@ Point BufferView::getPos(DocIterator const & dit, bool boundary) const } +bool BufferView::paragraphVisible(DocIterator const & dit) const +{ + CursorSlice const & bot = dit.bottom(); + TextMetrics const & tm = textMetrics(bot.text()); + + return tm.contains(bot.pit()); +} + + +void BufferView::cursorPosAndHeight(Point & p, int & h) const +{ + Cursor const & cur = cursor(); + Font const font = cur.getFont(); + frontend::FontMetrics const & fm = theFontMetrics(font); + int const asc = fm.maxAscent(); + int const des = fm.maxDescent(); + h = asc + des; + p = getPos(cur, cur.boundary()); + p.y_ -= asc; +} + + +bool BufferView::cursorInView(Point const & p, int h) const +{ + Cursor const & cur = cursor(); + // does the cursor touch the screen ? + if (p.y_ + h < 0 || p.y_ >= workHeight() || !paragraphVisible(cur)) + return false; + return true; +} + + void BufferView::draw(frontend::Painter & pain) { if (height_ == 0 || width_ == 0) return; LYXERR(Debug::PAINTING, "\t\t*** START DRAWING ***"); + Text & text = buffer_.text(); TextMetrics const & tm = d->text_metrics_[&text]; int const y = tm.first().second->position(); @@ -2217,7 +2296,7 @@ void BufferView::draw(frontend::Painter & pain) // Clear background. pain.fillRectangle(0, 0, width_, height_, - buffer_.inset().backgroundColor()); + pi.backgroundColor(&buffer_.inset())); // Draw everything. tm.draw(pi, 0, y); @@ -2366,6 +2445,8 @@ bool samePar(DocIterator const & a, DocIterator const & b) return true; if (a.empty() || b.empty()) return false; + if (a.depth() != b.depth()) + return false; return &a.innerParagraph() == &b.innerParagraph(); }