X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=b46be350b850010964b3c6322381b7dd86cda0ba;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=73de5426381d5d24374b8f9ca94f9de250413f24;hpb=5da55588f2bd9f568cb5fa8554f09d52cb2329c0;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 73de542638..b46be350b8 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -16,6 +16,7 @@ #include "BufferView.h" +#include "BranchList.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferList.h" @@ -24,7 +25,6 @@ #include "Cursor.h" #include "CutAndPaste.h" #include "DispatchResult.h" -#include "EmbeddedFiles.h" #include "ErrorList.h" #include "factory.h" #include "FloatList.h" @@ -55,8 +55,11 @@ #include "insets/InsetBibtex.h" #include "insets/InsetCommand.h" // ChangeRefs +#include "insets/InsetExternal.h" +#include "insets/InsetGraphics.h" #include "insets/InsetRef.h" #include "insets/InsetText.h" +#include "insets/InsetNote.h" #include "frontends/alert.h" #include "frontends/Application.h" @@ -212,6 +215,7 @@ struct BufferView::Private { Private(BufferView & bv): wh_(0), cursor_(bv), anchor_pit_(0), anchor_ypos_(0), + inlineCompletionUniqueChars_(0), last_inset_(0), gui_(0) {} @@ -240,11 +244,11 @@ struct BufferView::Private vector par_height_; /// - DocIterator inlineCompletionPos; + DocIterator inlineCompletionPos_; /// - docstring inlineCompletion; + docstring inlineCompletion_; /// - size_t inlineCompletionUniqueChars; + size_t inlineCompletionUniqueChars_; /// keyboard mapping object. Intl intl_; @@ -261,6 +265,9 @@ struct BufferView::Private /** Not owned, so don't delete. */ frontend::GuiBufferViewDelegate * gui_; + + /// Cache for Find Next + FuncRequest search_request_cache_; }; @@ -275,7 +282,7 @@ BufferView::BufferView(Buffer & buf) d->cursor_.setCurrentFont(); if (graphics::Previews::status() != LyXRC::PREVIEW_OFF) - graphics::Previews::get().generateBufferPreviews(buffer_); + thePreviews().generateBufferPreviews(buffer_); } @@ -289,7 +296,7 @@ BufferView::~BufferView() LastFilePosSection::FilePos fp; fp.pit = d->cursor_.bottom().pit(); fp.pos = d->cursor_.bottom().pos(); - LyX::ref().session().lastFilePos().save(buffer_.fileName(), fp); + theSession().lastFilePos().save(buffer_.fileName(), fp); delete d; } @@ -451,7 +458,7 @@ void BufferView::processUpdateFlags(Update::flags flags) void BufferView::updateScrollbar() { - if (height_ == 0) + if (height_ == 0 && width_ == 0) return; // We prefer fixed size line scrolling. @@ -531,8 +538,7 @@ docstring BufferView::contextMenu(int x, int y) const if (covering_inset) return covering_inset->contextMenu(*this, x, y); - // FIXME: Do something more elaborate here. - return from_ascii("edit"); + return buffer_.inset().contextMenu(*this, x, y); } @@ -542,6 +548,8 @@ void BufferView::scrollDocView(int value) // If the offset is less than 2 screen height, prefer to scroll instead. if (abs(offset) <= 2 * height_) { scroll(offset); + updateMetrics(); + buffer_.changed(); return; } @@ -651,7 +659,7 @@ void BufferView::saveBookmark(unsigned int idx) // acturately locate a bookmark in a 'live' lyx session. // pit and pos will be updated with bottom level pit/pos // when lyx exits. - LyX::ref().session().bookmarks().save( + theSession().bookmarks().save( buffer_.fileName(), d->cursor_.bottom().pit(), d->cursor_.bottom().pos(), @@ -783,24 +791,29 @@ void BufferView::showCursor(DocIterator const & dit) if (tm.contains(bot_pit)) { ParagraphMetrics const & pm = tm.parMetrics(bot_pit); - BOOST_ASSERT(!pm.rows().empty()); + LASSERT(!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 = pm.getRow(cs.pos(), dit.boundary()).dimension(); + int scrolled = 0; if (ypos - row_dim.ascent() < 0) - scrollUp(- ypos + row_dim.ascent()); + scrolled = scrollUp(- ypos + row_dim.ascent()); else if (ypos + row_dim.descent() > height_) - scrollDown(ypos - height_ + row_dim.descent()); + scrolled = scrollDown(ypos - height_ + row_dim.descent()); // else, nothing to do, the cursor is already visible so we just return. + if (scrolled != 0) { + updateMetrics(); + buffer_.changed(); + } return; } // fix inline completion position - if (d->inlineCompletionPos.fixIfBroken()) - d->inlineCompletionPos = DocIterator(); + if (d->inlineCompletionPos_.fixIfBroken()) + d->inlineCompletionPos_ = DocIterator(); tm.redoParagraph(bot_pit); ParagraphMetrics const & pm = tm.parMetrics(bot_pit); @@ -832,21 +845,22 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) switch (cmd.action) { case LFUN_UNDO: - flag.enabled(buffer_.undo().hasUndoStack()); + flag.setEnabled(buffer_.undo().hasUndoStack()); break; case LFUN_REDO: - flag.enabled(buffer_.undo().hasRedoStack()); + flag.setEnabled(buffer_.undo().hasRedoStack()); break; case LFUN_FILE_INSERT: case LFUN_FILE_INSERT_PLAINTEXT_PARA: case LFUN_FILE_INSERT_PLAINTEXT: case LFUN_BOOKMARK_SAVE: // FIXME: Actually, these LFUNS should be moved to Text - flag.enabled(cur.inTexted()); + flag.setEnabled(cur.inTexted()); break; case LFUN_FONT_STATE: case LFUN_LABEL_INSERT: case LFUN_INFO_INSERT: + case LFUN_INSET_EDIT: case LFUN_PARAGRAPH_GOTO: case LFUN_NOTE_NEXT: case LFUN_REFERENCE_NEXT: @@ -858,24 +872,40 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) case LFUN_SCREEN_RECENTER: case LFUN_BIBTEX_DATABASE_ADD: case LFUN_BIBTEX_DATABASE_DEL: + case LFUN_GRAPHICS_GROUPS_UNIFY: + case LFUN_NOTES_MUTATE: + case LFUN_ALL_INSETS_TOGGLE: case LFUN_STATISTICS: - case LFUN_NEXT_INSET_TOGGLE: - flag.enabled(true); + flag.setEnabled(true); break; + case LFUN_NEXT_INSET_TOGGLE: + 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; + // 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.enabled(!cmd.argument().empty() + flag.setEnabled(!cmd.argument().empty() || getInsetByCode(cur, REF_CODE)); break; } case LFUN_CHANGES_TRACK: - flag.enabled(true); + flag.setEnabled(true); flag.setOnOff(buffer_.params().trackChanges); break; case LFUN_CHANGES_OUTPUT: - flag.enabled(true); + flag.setEnabled(true); flag.setOnOff(buffer_.params().outputChanges); break; @@ -887,7 +917,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) // In principle, these command should only be enabled if there // is a change in the document. However, without proper // optimizations, this will inevitably result in poor performance. - flag.enabled(true); + flag.setEnabled(true); break; case LFUN_BUFFER_TOGGLE_COMPRESSION: { @@ -895,65 +925,57 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) break; } - case LFUN_BUFFER_TOGGLE_EMBEDDING: { - flag.setOnOff(buffer_.params().embedded); - break; - } - case LFUN_SCREEN_UP: case LFUN_SCREEN_DOWN: case LFUN_SCROLL: case LFUN_SCREEN_UP_SELECT: case LFUN_SCREEN_DOWN_SELECT: - flag.enabled(true); + flag.setEnabled(true); break; case LFUN_LAYOUT_TABULAR: - flag.enabled(cur.innerInsetOfType(TABULAR_CODE)); + flag.setEnabled(cur.innerInsetOfType(TABULAR_CODE)); break; case LFUN_LAYOUT: + flag.setEnabled(!cur.inset().forcePlainLayout(cur.idx())); + break; + case LFUN_LAYOUT_PARAGRAPH: - flag.enabled(cur.inset().allowParagraphCustomization(cur.idx())); + 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; - switch (code) { + InsetCode next_code = cur.nextInset() + ? cur.nextInset()->lyxCode() : NO_CODE; + //FIXME: remove these special cases: + switch (next_code) { case TABULAR_CODE: - enable = cmd.argument() == "tabular"; - break; case ERT_CODE: - enable = cmd.argument() == "ert"; - break; case FLOAT_CODE: - enable = cmd.argument() == "float"; - break; case WRAP_CODE: - enable = cmd.argument() == "wrap"; - break; case NOTE_CODE: - enable = cmd.argument() == "note"; - break; case BRANCH_CODE: - enable = cmd.argument() == "branch"; - break; case BOX_CODE: - enable = cmd.argument() == "box"; - break; case LISTINGS_CODE: - enable = cmd.argument() == "listings"; + enable = (cmd.argument().empty() || + cmd.getArg(0) == insetName(next_code)); break; default: break; } - flag.enabled(enable); + flag.setEnabled(enable); break; } case LFUN_DIALOG_SHOW_NEW_INSET: - flag.enabled(cur.inset().lyxCode() != ERT_CODE && + flag.setEnabled(cur.inset().lyxCode() != ERT_CODE && cur.inset().lyxCode() != LISTINGS_CODE); if (cur.inset().lyxCode() == CAPTION_CODE) { FuncStatus flag; @@ -962,8 +984,18 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd) } 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.enabled(false); + flag.setEnabled(false); } return flag; @@ -1028,9 +1060,29 @@ bool BufferView::dispatch(FuncRequest const & cmd) gotoLabel(label); break; } + + case LFUN_INSET_EDIT: { + FuncRequest fr(cmd); + // if there is an inset at cursor, see whether it + // can be modified. + Inset * inset = cur.nextInset(); + if (inset) + inset->dispatch(cur, fr); + // if it did not work, try the underlying inset. + if (!inset || !cur.result().dispatched()) + cur.dispatch(cmd); + + // FIXME I'm adding the last break to solve a crash, + // but that is obviously not right. + if (!cur.result().dispatched()) + // It did not work too; no action needed. + break; + break; + } case LFUN_PARAGRAPH_GOTO: { - int const id = convert(to_utf8(cmd.argument())); + int const id = convert(cmd.getArg(0)); + int const pos = convert(cmd.getArg(1)); int i = 0; for (Buffer * b = &buffer_; i == 0 || b != &buffer_; b = theBufferList().next(b)) { @@ -1047,6 +1099,7 @@ bool BufferView::dispatch(FuncRequest const & cmd) if (b == &buffer_) { // Set the cursor + dit.pos() = pos; setCursor(dit); processUpdateFlags(Update::Force | Update::FitCursor); } else { @@ -1115,6 +1168,8 @@ bool BufferView::dispatch(FuncRequest const & cmd) buffer_.text().cursorBottom(d->cursor_); // accept everything in a single step to support atomic undo buffer_.text().acceptOrRejectChanges(d->cursor_, 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: @@ -1125,14 +1180,21 @@ bool BufferView::dispatch(FuncRequest const & cmd) // 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); + // FIXME: Move this LFUN to Buffer so that we don't have to do this: + processUpdateFlags(Update::Force | Update::FitCursor); break; - case LFUN_WORD_FIND: - if (find(this, cmd)) + case LFUN_WORD_FIND: { + FuncRequest req = cmd; + if (cmd.argument().empty() && !d->search_request_cache_.argument().empty()) + req = d->search_request_cache_; + if (find(this, req)) showCursor(); else message(_("String not found!")); + d->search_request_cache_ = req; break; + } case LFUN_WORD_REPLACE: { bool has_deleted = false; @@ -1185,7 +1247,7 @@ bool BufferView::dispatch(FuncRequest const & cmd) InsetBibtex * inset = getInsetByCode(tmpcur, BIBTEX_CODE); if (inset) { - if (inset->addDatabase(to_utf8(cmd.argument()))) + if (inset->addDatabase(cmd.argument())) buffer_.updateBibfilesCache(); } break; @@ -1197,7 +1259,7 @@ bool BufferView::dispatch(FuncRequest const & cmd) InsetBibtex * inset = getInsetByCode(tmpcur, BIBTEX_CODE); if (inset) { - if (inset->delDatabase(to_utf8(cmd.argument()))) + if (inset->delDatabase(cmd.argument())) buffer_.updateBibfilesCache(); } break; @@ -1247,19 +1309,10 @@ bool BufferView::dispatch(FuncRequest const & cmd) buffer_.params().compressed = !buffer_.params().compressed; break; - case LFUN_BUFFER_TOGGLE_EMBEDDING: { - // turn embedding on/off - try { - buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_); - } catch (ExceptionMessage const & message) { - Alert::error(message.title_, message.details_); - } - break; - } - case LFUN_NEXT_INSET_TOGGLE: { - // this is the real function we want to invoke - FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.origin); + // 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. Inset * inset = cur.nextInset(); @@ -1268,15 +1321,13 @@ bool BufferView::dispatch(FuncRequest const & cmd) Cursor tmpcur = cur; tmpcur.pushBackward(*inset); inset->dispatch(tmpcur, tmpcmd); - if (tmpcur.result().dispatched()) { + if (tmpcur.result().dispatched()) cur.dispatched(); - } - } else if (inset->editable() == Inset::IS_EDITABLE) { - inset->edit(cur, true); - } + } else + inset->dispatch(cur, tmpcmd); } // if it did not work, try the underlying inset. - if (!cur.result().dispatched()) + if (!inset || !cur.result().dispatched()) cur.dispatch(tmpcmd); if (!cur.result().dispatched()) @@ -1287,6 +1338,27 @@ 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) + 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; + cur.clearSelection(); + processUpdateFlags(Update::Force | Update::FitCursor); + break; + } + case LFUN_SCREEN_UP: case LFUN_SCREEN_DOWN: { Point p = getPos(cur, cur.boundary()); @@ -1295,8 +1367,15 @@ bool BufferView::dispatch(FuncRequest const & cmd) showCursor(); p = getPos(cur, cur.boundary()); } - scroll(cmd.action == LFUN_SCREEN_UP? - height_ : height_); + int const scrolled = scroll(cmd.action == LFUN_SCREEN_UP + ? - height_ : height_); + if (cmd.action == LFUN_SCREEN_UP && scrolled > - height_) + p = Point(0, 0); + if (cmd.action == LFUN_SCREEN_DOWN && scrolled < height_) + p = Point(width_, height_); 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()? cur.finishUndo(); @@ -1341,6 +1420,57 @@ bool BufferView::dispatch(FuncRequest const & cmd) break; } + case LFUN_BRANCH_ACTIVATE: + case LFUN_BRANCH_DEACTIVATE: + buffer_.dispatch(cmd); + processUpdateFlags(Update::Force); + break; + + // These two could be rewriten using some command like forall + // once the insets refactoring is done. + case LFUN_GRAPHICS_GROUPS_UNIFY: { + if (cmd.argument().empty()) + break; + //view()->cursor().recordUndoFullDocument(); let inset-apply do that job + graphics::unifyGraphicsGroups(cur.buffer(), to_utf8(cmd.argument())); + processUpdateFlags(Update::Force | Update::FitCursor); + break; + } + + case LFUN_NOTES_MUTATE: { + if (cmd.argument().empty()) + break; + cur.recordUndoFullDocument(); + + if (mutateNotes(cur, cmd.getArg(0), cmd.getArg(1))) { + processUpdateFlags(Update::Force); + } + break; + } + + case LFUN_ALL_INSETS_TOGGLE: { + string action; + string const name = split(to_utf8(cmd.argument()), action, ' '); + InsetCode const inset_code = insetCode(name); + + FuncRequest fr(LFUN_INSET_TOGGLE, action); + + Inset & inset = cur.buffer().inset(); + InsetIterator it = inset_iterator_begin(inset); + InsetIterator const end = inset_iterator_end(inset); + for (; it != end; ++it) { + if (it->asInsetCollapsable() + && (inset_code == NO_CODE + || inset_code == it->lyxCode())) { + Cursor tmpcur = cur; + tmpcur.pushBackward(*it); + it->dispatch(tmpcur, fr); + } + } + processUpdateFlags(Update::Force | Update::FitCursor); + break; + } + default: return false; } @@ -1353,11 +1483,13 @@ docstring const BufferView::requestSelection() { Cursor & cur = d->cursor_; + LYXERR(Debug::SELECTION, "requestSelection: cur.selection: " << cur.selection()); if (!cur.selection()) { d->xsel_cache_.set = false; return docstring(); } + LYXERR(Debug::SELECTION, "requestSelection: xsel_cache.set: " << d->xsel_cache_.set); if (!d->xsel_cache_.set || cur.top() != d->xsel_cache_.cursor || cur.anchor_.top() != d->xsel_cache_.anchor) @@ -1495,7 +1627,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) // Now dispatch to the temporary cursor. If the real cursor should // be modified, the inset's dispatch has to do so explicitly. - if (!cur.result().dispatched()) + if (!inset || !cur.result().dispatched()) cur.dispatch(cmd); // Notify left insets @@ -1519,8 +1651,8 @@ void BufferView::lfunScroll(FuncRequest const & cmd) { string const scroll_type = cmd.getArg(0); int const scroll_step = - (scroll_type == "line")? d->scrollbarParameters_.single_step - : (scroll_type == "page")? d->scrollbarParameters_.page_step : 0; + (scroll_type == "line") ? d->scrollbarParameters_.single_step + : (scroll_type == "page") ? d->scrollbarParameters_.page_step : 0; if (scroll_step == 0) return; string const scroll_quantity = cmd.getArg(1); @@ -1533,19 +1665,22 @@ void BufferView::lfunScroll(FuncRequest const & cmd) if (scroll_value) scroll(scroll_step * scroll_value); } + updateMetrics(); + buffer_.changed(); } -void BufferView::scroll(int y) +int BufferView::scroll(int y) { if (y > 0) - scrollDown(y); - else if (y < 0) - scrollUp(-y); + return scrollDown(y); + if (y < 0) + return scrollUp(-y); + return 0; } -void BufferView::scrollDown(int offset) +int BufferView::scrollDown(int offset) { Text * text = &buffer_.text(); TextMetrics & tm = d->text_metrics_[text]; @@ -1555,7 +1690,7 @@ void BufferView::scrollDown(int offset) int bottom_pos = last.second->position() + last.second->descent(); if (last.first + 1 == int(text->paragraphs().size())) { if (bottom_pos <= height_) - return; + return 0; offset = min(offset, bottom_pos - height_); break; } @@ -1564,12 +1699,11 @@ void BufferView::scrollDown(int offset) tm.newParMetricsDown(); } d->anchor_ypos_ -= offset; - updateMetrics(); - buffer_.changed(); + return -offset; } -void BufferView::scrollUp(int offset) +int BufferView::scrollUp(int offset) { Text * text = &buffer_.text(); TextMetrics & tm = d->text_metrics_[text]; @@ -1579,7 +1713,7 @@ void BufferView::scrollUp(int offset) int top_pos = first.second->position() - first.second->ascent(); if (first.first == 0) { if (top_pos >= 0) - return; + return 0; offset = min(offset, - top_pos); break; } @@ -1588,8 +1722,7 @@ void BufferView::scrollUp(int offset) tm.newParMetricsUp(); } d->anchor_ypos_ += offset; - updateMetrics(); - buffer_.changed(); + return offset; } @@ -1691,7 +1824,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old) bool BufferView::mouseSetCursor(Cursor & cur, bool select) { - BOOST_ASSERT(&cur.bv() == this); + LASSERT(&cur.bv() == this, /**/); if (!select) // this event will clear selection so we save selection for @@ -1778,8 +1911,8 @@ bool BufferView::singleParUpdate() int old_height = tm.parMetrics(bottom_pit).height(); // make sure inline completion pointer is ok - if (d->inlineCompletionPos.fixIfBroken()) - d->inlineCompletionPos = DocIterator(); + if (d->inlineCompletionPos_.fixIfBroken()) + d->inlineCompletionPos_ = DocIterator(); // In Single Paragraph mode, rebreak only // the (main text, not inset!) paragraph containing the cursor. @@ -1804,6 +1937,9 @@ bool BufferView::singleParUpdate() void BufferView::updateMetrics() { + if (height_ == 0 || width_ == 0) + return; + Text & buftext = buffer_.text(); pit_type const npit = int(buftext.paragraphs().size()); @@ -1818,8 +1954,8 @@ void BufferView::updateMetrics() TextMetrics & tm = textMetrics(&buftext); // make sure inline completion pointer is ok - if (d->inlineCompletionPos.fixIfBroken()) - d->inlineCompletionPos = DocIterator(); + if (d->inlineCompletionPos_.fixIfBroken()) + d->inlineCompletionPos_ = DocIterator(); if (d->anchor_pit_ >= npit) // The anchor pit must have been deleted... @@ -1892,7 +2028,7 @@ void BufferView::updateMetrics() void BufferView::insertLyXFile(FileName const & fname) { - BOOST_ASSERT(d->cursor_.inTexted()); + LASSERT(d->cursor_.inTexted(), /**/); // Get absolute path of file and add ".lyx" // to the filename if necessary @@ -1977,7 +2113,7 @@ Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const CursorSlice const & sl = dit[0]; TextMetrics const & tm = textMetrics(sl.text()); ParagraphMetrics const & pm = tm.parMetrics(sl.pit()); - BOOST_ASSERT(!pm.rows().empty()); + LASSERT(!pm.rows().empty(), /**/); y -= pm.rows()[0].ascent(); #if 1 // FIXME: document this mess @@ -2029,6 +2165,8 @@ Point BufferView::getPos(DocIterator const & dit, bool boundary) const 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]; @@ -2191,19 +2329,19 @@ void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph) docstring const & BufferView::inlineCompletion() const { - return d->inlineCompletion; + return d->inlineCompletion_; } size_t const & BufferView::inlineCompletionUniqueChars() const { - return d->inlineCompletionUniqueChars; + return d->inlineCompletionUniqueChars_; } DocIterator const & BufferView::inlineCompletionPos() const { - return d->inlineCompletionPos; + return d->inlineCompletionPos_; } @@ -2221,16 +2359,16 @@ 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 changed = d->inlineCompletion_ != completion + || d->inlineCompletionUniqueChars_ != uniqueChars; bool singlePar = true; - d->inlineCompletion = completion; - d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars); + 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; + DocIterator const & old = d->inlineCompletionPos_; if (old != pos) { //lyxerr << "inlineCompletionPos changed" << std::endl; // old or pos are in another paragraph? @@ -2239,7 +2377,7 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos, singlePar = false; //lyxerr << "different paragraph" << std::endl; } - d->inlineCompletionPos = pos; + d->inlineCompletionPos_ = pos; } // set update flags