X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=d5ee51739c26aa8ffddf2034d4a96cdb706857d8;hb=cf15bd840b71a01ccbb2fbbbabc7066237b4bfd2;hp=2a543ff5a7e2cf29b573c7e890aa0a51f6a0f68f;hpb=f0f485e40d9bc8aa130f6783afecc64fd61111f7;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 2a543ff5a7..d5ee51739c 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -69,7 +69,6 @@ #include "support/convert.h" #include "support/debug.h" #include "support/ExceptionMessage.h" -#include "support/FileFilterList.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -114,7 +113,7 @@ bool findNextInset(DocIterator & dit, vector const & codes, while (tmpdit) { Inset const * inset = tmpdit.nextInset(); if (inset - && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() + && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() && (contents.empty() || static_cast(inset)->getFirstNonOptParam() == contents)) { dit = tmpdit; @@ -140,7 +139,7 @@ bool findInset(DocIterator & dit, vector const & codes, if (same_content) { Inset const * inset = tmpdit.nextInset(); if (inset - && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) { + && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) { contents = static_cast(inset)->getFirstNonOptParam(); } } @@ -239,6 +238,13 @@ struct BufferView::Private /// vector par_height_; + /// + DocIterator inlineCompletionPos; + /// + docstring inlineCompletion; + /// + size_t inlineCompletionUniqueChars; + /// keyboard mapping object. Intl intl_; @@ -258,7 +264,7 @@ struct BufferView::Private BufferView::BufferView(Buffer & buf) - : width_(0), height_(0), 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); @@ -288,6 +294,24 @@ BufferView::~BufferView() } +int BufferView::rightMargin() const +{ + // The additional test for the case the outliner is opened. + if (!full_screen_ || + !lyxrc.full_screen_limit || + width_ < lyxrc.full_screen_width + 20) + return 10; + + return (width_ - lyxrc.full_screen_width) / 2; +} + + +int BufferView::leftMargin() const +{ + return rightMargin(); +} + + Intl & BufferView::getIntl() { return d->intl_; @@ -430,7 +454,7 @@ void BufferView::updateScrollbar() << " curr par: " << d->cursor_.bottom().pit() << " default height " << defaultRowHeight()); - int const parsize = int(t.paragraphs().size()); + size_t const parsize = t.paragraphs().size(); if (d->par_height_.size() != parsize) { d->par_height_.clear(); // FIXME: We assume a default paragraph height of 2 rows. This @@ -450,7 +474,7 @@ void BufferView::updateScrollbar() int top_pos = first.second->position() - first.second->ascent(); int bottom_pos = last.second->position() + last.second->descent(); bool first_visible = first.first == 0 && top_pos >= 0; - bool last_visible = last.first == parsize - 1 && bottom_pos <= height_; + bool last_visible = last.first + 1 == int(parsize) && bottom_pos <= height_; if (first_visible && last_visible) { d->scrollbarParameters_.min = 0; d->scrollbarParameters_.max = 0; @@ -458,7 +482,7 @@ void BufferView::updateScrollbar() } d->scrollbarParameters_.min = top_pos; - for (size_t i = 0; i != first.first; ++i) + for (size_t i = 0; i != size_t(first.first); ++i) d->scrollbarParameters_.min -= d->par_height_[i]; d->scrollbarParameters_.max = bottom_pos; for (size_t i = last.first + 1; i != parsize; ++i) @@ -508,22 +532,44 @@ void BufferView::scrollDocView(int value) return; } - int par_pos = 0; - for (size_t i = 0; i != d->par_height_.size(); ++i) { + // cut off at the top + if (value <= d->scrollbarParameters_.min) { + DocIterator dit = doc_iterator_begin(buffer_.inset()); + showCursor(dit); + LYXERR(Debug::SCROLLING, "scroll to top"); + return; + } + + // cut off at the bottom + if (value >= d->scrollbarParameters_.max) { + DocIterator dit = doc_iterator_end(buffer_.inset()); + dit.backwardPos(); + showCursor(dit); + LYXERR(Debug::SCROLLING, "scroll to bottom"); + return; + } + + // find paragraph at target position + int par_pos = d->scrollbarParameters_.min; + pit_type i = 0; + for (; i != int(d->par_height_.size()); ++i) { par_pos += d->par_height_[i]; - if (par_pos >= value) { - d->anchor_pit_ = pit_type(i); + if (par_pos >= value) break; - } } - LYXERR(Debug::SCROLLING, "value = " << value - << "\tanchor_ref_ = " << d->anchor_pit_ - << "\tpar_pos = " << par_pos); + if (par_pos < value) { + // It seems we didn't find the correct pit so stay on the safe side and + // scroll to bottom. + LYXERR0("scrolling position not found!"); + scrollDocView(d->scrollbarParameters_.max); + return; + } - d->anchor_ypos_ = par_pos - value; - updateMetrics(); - buffer_.changed(); + DocIterator dit = doc_iterator_begin(buffer_.inset()); + dit.pit() = i; + LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i); + showCursor(dit); } @@ -610,7 +656,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, int top_id, pos_type top_pos) { bool success = false; - DocIterator doc_it; + DocIterator dit; d->cursor_.clearSelection(); @@ -618,19 +664,19 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // This is the case for a 'live' bookmark when unique paragraph ID // is used to track bookmarks. if (top_id > 0) { - ParIterator par = buffer_.getParFromID(top_id); - if (par != buffer_.par_iterator_end()) { - doc_it = makeDocIterator(par, min(par->size(), top_pos)); + dit = buffer_.getParFromID(top_id); + if (!dit.atEnd()) { + dit.pos() = min(dit.paragraph().size(), top_pos); // Some slices of the iterator may not be // reachable (e.g. closed collapsable inset) // so the dociterator may need to be // shortened. Otherwise, setCursor may crash // lyx when the cursor can not be set to these // insets. - size_t const n = doc_it.depth(); + size_t const n = dit.depth(); for (size_t i = 0; i < n; ++i) - if (doc_it[i].inset().editable() != Inset::HIGHLY_EDITABLE) { - doc_it.resize(i); + if (dit[i].inset().editable() != Inset::HIGHLY_EDITABLE) { + dit.resize(i); break; } success = true; @@ -643,16 +689,17 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // restoration is inaccurate. If a bookmark was within an inset, // it will be restored to the left of the outmost inset that contains // the bookmark. - if (static_cast(bottom_pit) < buffer_.paragraphs().size()) { - doc_it = doc_iterator_begin(buffer_.inset()); - doc_it.pit() = bottom_pit; - doc_it.pos() = min(bottom_pos, doc_it.paragraph().size()); + if (bottom_pit < int(buffer_.paragraphs().size())) { + dit = doc_iterator_begin(buffer_.inset()); + + dit.pit() = bottom_pit; + dit.pos() = min(bottom_pos, dit.paragraph().size()); success = true; } if (success) { // Note: only bottom (document) level pit is set. - setCursor(doc_it); + setCursor(dit); // set the current font. d->cursor_.setCurrentFont(); // To center the screen on this new position we need the @@ -690,6 +737,12 @@ int BufferView::workWidth() const void BufferView::showCursor() +{ + showCursor(d->cursor_); +} + + +void BufferView::showCursor(DocIterator const & dit) { // We are not properly started yet, delay until resizing is // done. @@ -698,11 +751,11 @@ void BufferView::showCursor() LYXERR(Debug::SCROLLING, "recentering!"); - CursorSlice & bot = d->cursor_.bottom(); + CursorSlice const & bot = dit.bottom(); TextMetrics & tm = d->text_metrics_[bot.text()]; pos_type const max_pit = pos_type(bot.text()->paragraphs().size() - 1); - int bot_pit = d->cursor_.bottom().pit(); + int bot_pit = bot.pit(); if (bot_pit > max_pit) { // FIXME: Why does this happen? LYXERR0("bottom pit is greater that max pit: " @@ -715,11 +768,15 @@ void BufferView::showCursor() else if (bot_pit == tm.last().first + 1) tm.newParMetricsDown(); - if (tm.has(bot_pit)) { + if (tm.contains(bot_pit)) { ParagraphMetrics const & pm = tm.parMetrics(bot_pit); - int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_; + BOOST_ASSERT(!pm.rows().empty()); + // FIXME: smooth scrolling doesn't work in mathed. + CursorSlice const & cs = dit.innerTextSlice(); + int offset = coordOffset(dit, dit.boundary()).y_; int ypos = pm.position() + offset; - Dimension const & row_dim = d->cursor_.textRow().dimension(); + Dimension const & row_dim = + pm.getRow(cs.pos(), dit.boundary()).dimension(); if (ypos - row_dim.ascent() < 0) scrollUp(- ypos + row_dim.ascent()); else if (ypos + row_dim.descent() > height_) @@ -728,12 +785,18 @@ void BufferView::showCursor() return; } + // fix inline completion position + if (d->inlineCompletionPos.fixIfBroken()) + d->inlineCompletionPos = DocIterator(); + tm.redoParagraph(bot_pit); ParagraphMetrics const & pm = tm.parMetrics(bot_pit); - int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_; + int offset = coordOffset(dit, dit.boundary()).y_; d->anchor_pit_ = bot_pit; - Dimension const & row_dim = d->cursor_.textRow().dimension(); + CursorSlice const & cs = dit.innerTextSlice(); + Dimension const & row_dim = + pm.getRow(cs.pos(), dit.boundary()).dimension(); if (d->anchor_pit_ == 0) d->anchor_ypos_ = offset + pm.ascent(); @@ -843,7 +906,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) case LFUN_LAYOUT: case LFUN_LAYOUT_PARAGRAPH: - flag.enabled(cur.inset().forceDefaultParagraphs(cur.idx())); + flag.enabled(cur.inset().allowParagraphCustomization(cur.idx())); break; case LFUN_INSET_SETTINGS: { @@ -964,27 +1027,27 @@ bool BufferView::dispatch(FuncRequest const & cmd) for (Buffer * b = &buffer_; i == 0 || b != &buffer_; b = theBufferList().next(b)) { - ParIterator par = b->getParFromID(id); - if (par == b->par_iterator_end()) { + DocIterator dit = b->getParFromID(id); + if (dit.atEnd()) { LYXERR(Debug::INFO, "No matching paragraph found! [" << id << "]."); + ++i; + continue; + } + LYXERR(Debug::INFO, "Paragraph " << dit.paragraph().id() + << " found in buffer `" + << b->absFileName() << "'."); + + if (b == &buffer_) { + // Set the cursor + setCursor(dit); + processUpdateFlags(Update::Force | Update::FitCursor); } else { - LYXERR(Debug::INFO, "Paragraph " << par->id() - << " found in buffer `" - << b->absFileName() << "'."); - - if (b == &buffer_) { - // Set the cursor - setCursor(makeDocIterator(par, 0)); - showCursor(); - } else { - // Switch to other buffer view and resend cmd - theLyXFunc().dispatch(FuncRequest( - LFUN_BUFFER_SWITCH, b->absFileName())); - theLyXFunc().dispatch(cmd); - } - break; + // Switch to other buffer view and resend cmd + theLyXFunc().dispatch(FuncRequest( + LFUN_BUFFER_SWITCH, b->absFileName())); + theLyXFunc().dispatch(cmd); } - ++i; + break; } break; } @@ -1057,7 +1120,10 @@ bool BufferView::dispatch(FuncRequest const & cmd) break; case LFUN_WORD_FIND: - find(this, cmd); + if (find(this, cmd)) + showCursor(); + else + message(_("String not found!")); break; case LFUN_WORD_REPLACE: { @@ -1308,7 +1374,7 @@ void BufferView::resize(int width, int height) // Clear the paragraph height cache. d->par_height_.clear(); - + // Redo the metrics. updateMetrics(); } @@ -1351,6 +1417,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) // LFUN_FILE_OPEN generated by drag-and-drop. FuncRequest cmd = cmd0; + Cursor old = cursor(); Cursor cur(*this); cur.push(buffer_.inset()); cur.selection() = d->cursor_.selection(); @@ -1412,13 +1479,19 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) if (!cur.result().dispatched()) cur.dispatch(cmd); - //Do we have a selection? + // Notify left insets + if (cur != old) { + old.fixIfBroken(); + bool badcursor = notifyCursorLeaves(old, cur); + if (badcursor) + cursor().fixIfBroken(); + } + + // Do we have a selection? theSelection().haveSelection(cursor().selection()); // If the command has been dispatched, - if (cur.result().dispatched() - // an update is asked, - && cur.result().update()) + if (cur.result().dispatched() || cur.result().update()) processUpdateFlags(cur.result().update()); } @@ -1520,8 +1593,8 @@ void BufferView::gotoLabel(docstring const & label) { for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) { vector labels; - it->getLabelList(buffer_, labels); - if (find(labels.begin(), labels.end(), label) != labels.end()) { + it->getLabelList(labels); + if (std::find(labels.begin(), labels.end(), label) != labels.end()) { setCursor(it); showCursor(); return; @@ -1609,8 +1682,12 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) // 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(); @@ -1623,24 +1700,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) if (!do_selection && !badcursor && d->cursor_.inTexted()) update |= checkDepm(cur, d->cursor_); - // if the cursor was in an empty script inset and the new - // position is in the nucleus of the inset, notifyCursorLeaves - // will kill the script inset itself. So we check all the - // elements of the cursor to make sure that they are correct. - // For an example, see bug 2933: - // http://bugzilla.lyx.org/show_bug.cgi?id=2933 - // The code below could maybe be moved to a DocIterator method. - //lyxerr << "cur before " << cur <cursor_.setCursor(dit); + d->cursor_.setCursor(cur); d->cursor_.boundary(cur.boundary()); if (do_selection) d->cursor_.setSelection(); @@ -1667,6 +1727,9 @@ void BufferView::putSelectionAt(DocIterator const & cur, } else d->cursor_.setSelection(d->cursor_, length); } + // Ensure a redraw happens in any case because the new selection could + // possibly be on the same screen as the previous selection. + processUpdateFlags(Update::Force | Update::FitCursor); } @@ -1695,6 +1758,10 @@ bool BufferView::singleParUpdate() TextMetrics & tm = textMetrics(&buftext); int old_height = tm.parMetrics(bottom_pit).height(); + // make sure inline completion pointer is ok + if (d->inlineCompletionPos.fixIfBroken()) + d->inlineCompletionPos = DocIterator(); + // In Single Paragraph mode, rebreak only // the (main text, not inset!) paragraph containing the cursor. // (if this paragraph contains insets etc., rebreaking will @@ -1731,9 +1798,30 @@ void BufferView::updateMetrics() TextMetrics & tm = textMetrics(&buftext); + // make sure inline completion pointer is ok + if (d->inlineCompletionPos.fixIfBroken()) + d->inlineCompletionPos = DocIterator(); + + if (d->anchor_pit_ >= npit) + // The anchor pit must have been deleted... + d->anchor_pit_ = npit - 1; + // Rebreak anchor paragraph. tm.redoParagraph(d->anchor_pit_); ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_]; + + // position anchor + if (d->anchor_pit_ == 0) { + int scrollRange = d->scrollbarParameters_.max - d->scrollbarParameters_.min; + + // Complete buffer visible? Then it's easy. + if (scrollRange == 0) + d->anchor_ypos_ = anchor_pm.ascent(); + + // FIXME: Some clever handling needed to show + // the _first_ paragraph up to the top if the cursor is + // in the first line. + } anchor_pm.setPosition(d->anchor_ypos_); LYXERR(Debug::PAINTING, "metrics: " @@ -1803,7 +1891,7 @@ void BufferView::insertLyXFile(FileName const & fname) el = buf.errorList("Parse"); buffer_.undo().recordUndo(d->cursor_); cap::pasteParagraphList(d->cursor_, buf.paragraphs(), - buf.params().getTextClassPtr(), el); + buf.params().documentClassPtr(), el); res = _("Document %1$s inserted."); } else { res = _("Could not insert document %1$s"); @@ -1911,7 +1999,7 @@ Point BufferView::getPos(DocIterator const & dit, bool boundary) const { CursorSlice const & bot = dit.bottom(); TextMetrics const & tm = textMetrics(bot.text()); - if (!tm.has(bot.pit())) + if (!tm.contains(bot.pit())) return Point(-1, -1); Point p = coordOffset(dit, boundary); // offset from outer paragraph @@ -2081,4 +2169,67 @@ void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph) buffer_.changed(); } + +docstring const & BufferView::inlineCompletion() const +{ + return d->inlineCompletion; +} + + +size_t const & BufferView::inlineCompletionUniqueChars() const +{ + return d->inlineCompletionUniqueChars; +} + + +DocIterator const & BufferView::inlineCompletionPos() const +{ + return d->inlineCompletionPos; +} + + +bool samePar(DocIterator const & a, DocIterator const & b) +{ + if (a.empty() && b.empty()) + return true; + if (a.empty() || b.empty()) + return false; + return &a.innerParagraph() == &b.innerParagraph(); +} + + +void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos, + docstring const & completion, size_t uniqueChars) +{ + uniqueChars = min(completion.size(), uniqueChars); + bool changed = d->inlineCompletion != completion + || d->inlineCompletionUniqueChars != uniqueChars; + bool singlePar = true; + d->inlineCompletion = completion; + d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars); + + //lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl; + + // at new position? + DocIterator const & old = d->inlineCompletionPos; + if (old != pos) { + //lyxerr << "inlineCompletionPos changed" << std::endl; + // old or pos are in another paragraph? + if ((!samePar(cur, pos) && !pos.empty()) + || (!samePar(cur, old) && !old.empty())) { + singlePar = false; + //lyxerr << "different paragraph" << std::endl; + } + d->inlineCompletionPos = pos; + } + + // set update flags + if (changed) { + if (singlePar && !(cur.disp_.update() & Update::Force)) + cur.updateFlags(cur.disp_.update() | Update::SinglePar); + else + cur.updateFlags(cur.disp_.update() | Update::Force); + } +} + } // namespace lyx