X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=e9824097d429d6b6c746b5df24fb3cfdd659c56f;hb=f3370c3e6a0686b03769e48bcd3fb673925533a9;hp=daa05a60d939b033bea992e36c88eabd920a3eb7;hpb=21c5bbec71b7a8a191e10be68396ccef49909c7b;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index daa05a60d9..e9824097d4 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -62,6 +62,8 @@ #include "insets/InsetRef.h" #include "insets/InsetText.h" +#include "mathed/MathData.h" + #include "frontends/alert.h" #include "frontends/Application.h" #include "frontends/Delegates.h" @@ -116,12 +118,12 @@ bool findNextInset(DocIterator & dit, vector const & codes, while (tmpdit) { Inset const * inset = tmpdit.nextInset(); if (inset) { - bool const valid_code = std::find(codes.begin(), codes.end(), + bool const valid_code = std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end(); InsetCommand const * ic = inset->asInsetCommand(); bool const same_or_no_contents = contents.empty() || (ic && (ic->getFirstNonOptParam() == contents)); - + if (valid_code && same_or_no_contents) { dit = tmpdit; return true; @@ -226,7 +228,7 @@ struct BufferView::Private Private(BufferView & bv): wh_(0), cursor_(bv), anchor_pit_(0), anchor_ypos_(0), inlineCompletionUniqueChars_(0), - last_inset_(0), clickable_inset_(false), + last_inset_(0), clickable_inset_(false), mouse_position_cache_(), bookmark_edit_position_(-1), gui_(0) {} @@ -323,9 +325,9 @@ BufferView::~BufferView() fp.pit = d->cursor_.bottom().pit(); fp.pos = d->cursor_.bottom().pos(); theSession().lastFilePos().save(buffer_.fileName(), fp); - + if (d->last_inset_) - d->last_inset_->setMouseHover(this, false); + d->last_inset_->setMouseHover(this, false); delete d; } @@ -496,7 +498,7 @@ void BufferView::updateScrollbar() d->scrollbarParameters_.page_step = height_; Text & t = buffer_.text(); - TextMetrics & tm = d->text_metrics_[&t]; + TextMetrics & tm = d->text_metrics_[&t]; LYXERR(Debug::GUI, " Updating scrollbar: height: " << t.paragraphs().size() @@ -656,7 +658,7 @@ void BufferView::setCursorFromScrollbar() case CUR_INSIDE: int const y = getPos(oldcur).y_; newy = min(last, max(y, first)); - if (y == newy) + if (y == newy) return; } // We reset the cursor because cursorStatus() does not @@ -684,6 +686,10 @@ Change const BufferView::getCurrentChange() const return Change(Change::UNCHANGED); DocIterator dit = d->cursor_.selectionBegin(); + // The selected content might have been changed (see #7685) + while (dit.inMathed()) + // Find enclosing text cursor + dit.pop_back(); return dit.paragraph().lookupChange(dit.pos()); } @@ -772,7 +778,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, // the bookmark. if (bottom_pit < int(buffer_.paragraphs().size())) { dit = doc_iterator_begin(&buffer_); - + dit.pit() = bottom_pit; dit.pos() = min(bottom_pos, dit.paragraph().size()); success = true; @@ -797,14 +803,12 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos, void BufferView::translateAndInsert(char_type c, Text * t, Cursor & cur) { - if (lyxrc.rtl_support) { - if (d->cursor_.real_current_font.isRightToLeft()) { - if (d->intl_.keymap == Intl::PRIMARY) - d->intl_.keyMapSec(); - } else { - if (d->intl_.keymap == Intl::SECONDARY) - d->intl_.keyMapPrim(); - } + if (d->cursor_.real_current_font.isRightToLeft()) { + if (d->intl_.keymap == Intl::PRIMARY) + d->intl_.keyMapSec(); + } else { + if (d->intl_.keymap == Intl::SECONDARY) + d->intl_.keyMapPrim(); } d->intl_.getTransManager().translateAndInsert(c, t, cur); @@ -954,7 +958,7 @@ void BufferView::makeDocumentClass() void BufferView::updateDocumentClass(DocumentClassConstPtr olddc) { message(_("Converting document to new document class...")); - + StableDocIterator backcur(d->cursor_); ErrorList & el = buffer_.errorList("Class Switch"); cap::switchBetweenClasses( @@ -1079,11 +1083,11 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_BIBTEX_DATABASE_ADD: case LFUN_BIBTEX_DATABASE_DEL: case LFUN_STATISTICS: - case LFUN_BRANCH_ADD_INSERT: case LFUN_KEYMAP_OFF: case LFUN_KEYMAP_PRIMARY: case LFUN_KEYMAP_SECONDARY: case LFUN_KEYMAP_TOGGLE: + case LFUN_INSET_SELECT_ALL: flag.setEnabled(true); break; @@ -1103,12 +1107,12 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_CHANGES_TRACK: flag.setEnabled(true); - flag.setOnOff(buffer_.params().trackChanges); + flag.setOnOff(buffer_.params().track_changes); break; case LFUN_CHANGES_OUTPUT: flag.setEnabled(true); - flag.setOnOff(buffer_.params().outputChanges); + flag.setOnOff(buffer_.params().output_changes); break; case LFUN_CHANGES_MERGE: @@ -1154,6 +1158,10 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) flag.setEnabled(cur.inset().allowParagraphCustomization(cur.idx())); break; + case LFUN_BRANCH_ADD_INSERT: + flag.setEnabled(!(cur.inTexted() && cur.paragraph().isPassThru())); + break; + case LFUN_DIALOG_SHOW_NEW_INSET: // FIXME: this is wrong, but I do not understand the // intent (JMarc) @@ -1215,7 +1223,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) Cursor & cur = d->cursor_; // Don't dispatch function that does not apply to internal buffers. - if (buffer_.isInternal() + if (buffer_.isInternal() && lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal)) return; @@ -1239,7 +1247,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) << (unknown_tokens == 1 ? "" : "s")); } updateDocumentClass(olddc); - + // We are most certainly here because of a change in the document // It is then better to make sure that all dialogs are in sync with // current document settings. @@ -1247,7 +1255,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) dr.forceBufferUpdate(); break; } - + case LFUN_LAYOUT_MODULES_CLEAR: { cur.recordUndoFullDocument(); buffer_.params().clearLayoutModules(); @@ -1260,7 +1268,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_LAYOUT_MODULE_ADD: { BufferParams const & params = buffer_.params(); if (!params.layoutModuleCanBeAdded(argument)) { - LYXERR0("Module `" << argument << + LYXERR0("Module `" << argument << "' cannot be added due to failed requirements or " "conflicts with installed modules."); break; @@ -1274,9 +1282,9 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } case LFUN_TEXTCLASS_APPLY: { - // since this shortcircuits, the second call is made only if + // since this shortcircuits, the second call is made only if // the first fails - bool const success = + bool const success = LayoutFileList::get().load(argument, buffer_.temppath()) || LayoutFileList::get().load(argument, buffer_.filePath()); if (!success) { @@ -1303,12 +1311,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } case LFUN_TEXTCLASS_LOAD: { - // since this shortcircuits, the second call is made only if + // since this shortcircuits, the second call is made only if // the first fails - bool const success = + bool const success = LayoutFileList::get().load(argument, buffer_.temppath()) || LayoutFileList::get().load(argument, buffer_.filePath()); - if (!success) { + if (!success) { docstring s = bformat(_("The document class `%1$s' " "could not be loaded."), from_utf8(argument)); frontend::Alert::error(_("Could not load class"), s); @@ -1374,7 +1382,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } break; } - + case LFUN_PARAGRAPH_GOTO: { int const id = convert(cmd.getArg(0)); int const pos = convert(cmd.getArg(1)); @@ -1421,12 +1429,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } case LFUN_CHANGES_TRACK: - buffer_.params().trackChanges = !buffer_.params().trackChanges; + buffer_.params().track_changes = !buffer_.params().track_changes; break; case LFUN_CHANGES_OUTPUT: - buffer_.params().outputChanges = !buffer_.params().outputChanges; - if (buffer_.params().outputChanges) { + buffer_.params().output_changes = !buffer_.params().output_changes; + if (buffer_.params().output_changes) { bool dvipost = LaTeXFeatures::isAvailable("dvipost"); bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); @@ -1452,7 +1460,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) // FIXME: Move this LFUN to Buffer so that we don't have to do this: dr.screenUpdate(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: @@ -1496,6 +1504,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_WORD_FIND_FORWARD: case LFUN_WORD_FIND_BACKWARD: { + // FIXME THREAD + // Would it maybe be better if this variable were view specific anyway? static docstring last_search; docstring searched_string; @@ -1513,8 +1523,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) docstring const data = find2string(searched_string, true, false, fw); bool found = lyxfind(this, FuncRequest(LFUN_WORD_FIND, data)); - if (found) + if (found) { dr.screenUpdate(Update::Force | Update::FitCursor); + cur.dispatched(); + dispatched = true; + } else { + cur.undispatched(); + dispatched = false; + } break; } @@ -1526,10 +1542,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace")); break; } - if (lyxfind(this, req)) + if (lyxfind(this, req)) { dr.screenUpdate(Update::Force | Update::FitCursor); - else - message(_("String not found.")); + cur.dispatched(); + dispatched = true; + } else { + cur.undispatched(); + dispatched = false; + } d->search_request_cache_ = req; break; } @@ -1551,6 +1571,11 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) if (lyxreplace(this, cmd, has_deleted)) { dr.forceBufferUpdate(); dr.screenUpdate(Update::Force | Update::FitCursor); + cur.dispatched(); + dispatched = true; + } else { + cur.undispatched(); + dispatched = false; } break; } @@ -1596,7 +1621,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_SCREEN_SHOW_CURSOR: showCursor(); break; - + case LFUN_SCREEN_RECENTER: recenter(); break; @@ -1624,7 +1649,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) if (inset->delDatabase(cmd.argument())) { buffer_.invalidateBibfileCache(); dr.forceBufferUpdate(); - } + } } break; } @@ -1702,13 +1727,13 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) updateHoveredInset(); d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_, - true, act == LFUN_SCREEN_UP); + true, act == LFUN_SCREEN_UP); //FIXME: what to do with cur.x_target()? bool update = in_texted && cur.bv().checkDepm(cur, old); cur.finishUndo(); if (update || cur.mark()) - dr.screenUpdate(Update::Force | Update::FitCursor); + dr.screenUpdate(Update::Force | Update::FitCursor); if (update) dr.forceBufferUpdate(); break; @@ -1776,6 +1801,41 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } + case LFUN_INSET_SELECT_ALL: + if (cur.depth() > 1 + && cur.selBegin().at_begin() + && cur.selEnd().at_end()) { + // All the contents of the inset if selected. + // Select the inset from outside. + cur.pop(); + cur.resetAnchor(); + cur.setSelection(true); + cur.posForward(); + } else if (cur.selBegin().idx() != cur.selEnd().idx() + || (cur.depth() > 1 + && cur.selBegin().at_cell_begin() + && cur.selEnd().at_cell_end())) { + // At least one complete cell is selected. + // Select all cells + cur.idx() = 0; + cur.pos() = 0; + cur.resetAnchor(); + cur.setSelection(true); + cur.idx() = cur.lastidx(); + cur.pos() = cur.lastpos(); + } else { + // select current cell + cur.pit() = 0; + cur.pos() = 0; + cur.resetAnchor(); + cur.setSelection(true); + cur.pit() = cur.lastpit(); + cur.pos() = cur.lastpos(); + } + dr.screenUpdate(Update::Force); + break; + + // This would be in Buffer class if only Cursor did not // require a bufferview case LFUN_INSET_FORALL: { @@ -1874,7 +1934,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) if (decodeInsetParam(name, data, buffer_)) lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, name + " " + data)); else - lyxerr << "Inset type '" << name << + lyxerr << "Inset type '" << name << "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << endl; break; } @@ -2084,10 +2144,10 @@ void BufferView::updateHoveredInset() const need_redraw |= d->last_inset_->setMouseHover(this, false); d->last_inset_ = 0; } - + if (covering_inset && covering_inset->setMouseHover(this, true)) { need_redraw = true; - // Only the insets that accept the hover state, do + // Only the insets that accept the hover state, do // clear the last_inset_, so only set the last_inset_ // member if the hovered setting is accepted. d->last_inset_ = covering_inset; @@ -2095,9 +2155,9 @@ void BufferView::updateHoveredInset() const if (need_redraw) { LYXERR(Debug::PAINTING, "Mouse hover detected at: (" - << d->mouse_position_cache_.x_ << ", " + << d->mouse_position_cache_.x_ << ", " << d->mouse_position_cache_.y_ << ")"); - + d->update_strategy_ = DecorationUpdate; // This event (moving without mouse click) is not passed further. @@ -2173,7 +2233,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) if (badcursor) cursor().fixIfBroken(); } - + // Do we have a selection? theSelection().haveSelection(cursor().selection()); @@ -2266,10 +2326,17 @@ void BufferView::setCursorFromRow(int row) // we need to make sure that the row and position // we got back are valid, because the buffer may well // have changed since we last generated the LaTeX. - DocIterator const dit = buffer_.getParFromID(tmpid); + DocIterator dit = buffer_.getParFromID(tmpid); if (dit == doc_iterator_end(&buffer_)) posvalid = false; - else { + else if (dit.depth() > 1) { + // We are in an inset. + pos_type lastpos = dit.lastpos(); + dit.pos() = tmppos > lastpos ? lastpos : tmppos; + setCursor(dit); + recenter(); + return; + } else { newpit = dit.pit(); // now have to check pos. newpos = tmppos; @@ -2401,8 +2468,11 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old) d->cursor_ = cur; - cur.forceBufferUpdate(); - cur.screenUpdateFlags(Update::Force); + // we would rather not do this here, but it needs to be done before + // the changed() signal is sent. + buffer_.updateBuffer(); + + buffer_.changed(true); return true; } @@ -2426,7 +2496,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) d->cursor_.fixIfBroken(); // FIXME: shift-mouse selection doesn't work well across insets. - bool const do_selection = + bool const do_selection = select && &d->cursor_.normalAnchor().inset() == &cur.inset(); // do the dEPM magic if needed @@ -2473,7 +2543,8 @@ void BufferView::putSelectionAt(DocIterator const & cur, bool BufferView::selectIfEmpty(DocIterator & cur) { - if (!cur.paragraph().empty()) + if ((cur.inTexted() && !cur.paragraph().empty()) + || (cur.inMathed() && !cur.cell().empty())) return false; pit_type const beg_pit = cur.pit(); @@ -2541,7 +2612,7 @@ bool BufferView::singleParUpdate() // (if this paragraph contains insets etc., rebreaking will // recursively descend) tm.redoParagraph(bottom_pit); - ParagraphMetrics const & pm = tm.parMetrics(bottom_pit); + ParagraphMetrics const & pm = tm.parMetrics(bottom_pit); if (pm.height() != old_height) // Paragraph height has changed so we cannot proceed to // the singlePar optimisation. @@ -2578,7 +2649,7 @@ void BufferView::updateMetrics() // 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; @@ -2586,19 +2657,19 @@ void BufferView::updateMetrics() // 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: " @@ -2692,14 +2763,14 @@ Point BufferView::coordOffset(DocIterator const & dit) const CursorSlice const & sl = dit[i]; int xx = 0; int yy = 0; - + // get relative position inside sl.inset() sl.inset().cursorPos(*this, sl, dit.boundary() && (i + 1 == dit.depth()), xx, yy); - + // Make relative position inside of the edited inset relative to sl.inset() x += xx; y += yy; - + // In case of an RTL inset, the edited inset will be positioned to the left // of xx:yy if (sl.text()) { @@ -2724,7 +2795,7 @@ Point BufferView::coordOffset(DocIterator const & dit) const Dimension const dim = sl.inset().dimension(*this); lastw = dim.wid; } - + //lyxerr << "Cursor::getPos, i: " // << i << " x: " << xx << " y: " << y << endl; } @@ -2753,20 +2824,20 @@ Point BufferView::coordOffset(DocIterator const & dit) const for (size_t rit = 0; rit != rend; ++rit) y += pm.rows()[rit].height(); y += pm.rows()[rend].ascent(); - + TextMetrics const & bottom_tm = textMetrics(dit.bottom().text()); - + // Make relative position from the nested inset now bufferview absolute. int xx = bottom_tm.cursorX(dit.bottom(), dit.boundary() && dit.depth() == 1); x += xx; - - // In the RTL case place the nested inset at the left of the cursor in + + // In the RTL case place the nested inset at the left of the cursor in // the outer paragraph bool boundary_1 = dit.boundary() && 1 == dit.depth(); bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1); if (rtl) x -= lastw; - + return Point(x, y); } @@ -2780,7 +2851,7 @@ Point BufferView::getPos(DocIterator const & dit) const TextMetrics const & tm = textMetrics(bot.text()); // offset from outer paragraph - Point p = coordOffset(dit); + Point p = coordOffset(dit); p.y_ += tm.parMetrics(bot.pit()).position(); return p; } @@ -2866,9 +2937,9 @@ void BufferView::draw(frontend::Painter & pain) // and possibly grey out below pair lastpm = tm.last(); int const y2 = lastpm.second->position() + lastpm.second->descent(); - + if (y2 < height_) { - Color color = buffer().isInternal() + Color color = buffer().isInternal() ? Color_background : Color_bottomarea; pain.fillRectangle(0, y2, width_, height_ - y2, color); } @@ -3022,7 +3093,7 @@ bool samePar(DocIterator const & a, DocIterator const & b) } -void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos, +void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos, docstring const & completion, size_t uniqueChars) { uniqueChars = min(completion.size(), uniqueChars); @@ -3031,9 +3102,9 @@ void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos 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) { @@ -3046,7 +3117,7 @@ void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos } d->inlineCompletionPos_ = pos; } - + // set update flags if (changed) { if (singlePar && !(cur.result().screenUpdate() & Update::Force)) @@ -3058,8 +3129,8 @@ void BufferView::setInlineCompletion(Cursor const & cur, DocIterator const & pos bool BufferView::clickableInset() const -{ - return d->clickable_inset_; +{ + return d->clickable_inset_; } } // namespace lyx