X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=d2215627cfbdb2ef7be4b54793ce4dc5ed78dd99;hb=e781628575276d48d71df6ebb44aad56f12d21f4;hp=6de832dae58715af6b55b0286c882e39595b596d;hpb=55b3374f3e3047a0aa7584e0737d1fcd40fe6809;p=lyx.git diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 6de832dae5..d2215627cf 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -216,7 +216,7 @@ enum ScreenUpdateStrategy { DecorationUpdate }; -} // anon namespace +} // namespace ///////////////////////////////////////////////////////////////////// @@ -351,8 +351,8 @@ BufferView::~BufferView() int BufferView::rightMargin() const { - // The value used to be hardcoded to 10, which is 2.5mm at 100dpi - int const default_margin = Length(2.5, Length::MM).inPixels(0); + // The value used to be hardcoded to 10, which is 0.1in at 100dpi + int const default_margin = Length(0.1, Length::IN).inPixels(0); // The additional test for the case the outliner is opened. if (!full_screen_ || !lyxrc.full_screen_limit || width_ < lyxrc.full_screen_width + 2 * default_margin) @@ -368,15 +368,22 @@ int BufferView::leftMargin() const } +int BufferView::inPixels(Length const & len) const +{ + Font const font = buffer().params().getFont(); + return len.inPixels(workWidth(), theFontMetrics(font).em()); +} + + bool BufferView::isTopScreen() const { - return d->scrollbarParameters_.position == d->scrollbarParameters_.min; + return 0 == d->scrollbarParameters_.min; } bool BufferView::isBottomScreen() const { - return d->scrollbarParameters_.position == d->scrollbarParameters_.max; + return 0 == d->scrollbarParameters_.max; } @@ -559,12 +566,17 @@ void BufferView::updateScrollbar() for (size_t i = last.first + 1; i != parsize; ++i) d->scrollbarParameters_.max += d->par_height_[i]; - d->scrollbarParameters_.position = 0; // The reference is the top position so we remove one page. if (lyxrc.scroll_below_document) d->scrollbarParameters_.max -= minVisiblePart(); else d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step; + + // 0 must be inside the range as it denotes the current position + if (d->scrollbarParameters_.max < 0) + d->scrollbarParameters_.max = 0; + if (d->scrollbarParameters_.min > 0) + d->scrollbarParameters_.min = 0; } @@ -600,17 +612,19 @@ string BufferView::contextMenu(int x, int y) const } -void BufferView::scrollDocView(int value, bool update) + +void BufferView::scrollDocView(int const value, bool update) { - int const offset = value - d->scrollbarParameters_.position; + // The scrollbar values are relative to the top of the screen, therefore the + // offset is equal to the target value. // No scrolling at all? No need to redraw anything - if (offset == 0) + if (value == 0) return; // If the offset is less than 2 screen height, prefer to scroll instead. - if (abs(offset) <= 2 * height_) { - d->anchor_ypos_ -= offset; + if (abs(value) <= 2 * height_) { + d->anchor_ypos_ -= value; buffer_.changed(true); updateHoveredInset(); return; @@ -707,9 +721,7 @@ Change const BufferView::getCurrentChange() const DocIterator dit = d->cursor_.selectionBegin(); // The selected content might have been changed (see #7685) - while (dit.inMathed()) - // Find enclosing text cursor - dit.pop_back(); + dit = dit.getInnerText(); return dit.paragraph().lookupChange(dit.pos()); } @@ -874,7 +886,7 @@ void BufferView::scrollToCursor() } -bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter) +bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter) { // We are not properly started yet, delay until resizing is // done. @@ -1023,7 +1035,10 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) if (buffer_.isReadonly() && !lyxaction.funcHasFlag(act, LyXAction::ReadOnly) && !lyxaction.funcHasFlag(act, LyXAction::NoBuffer)) { - flag.message(from_utf8(N_("Document is read-only"))); + if (buffer_.hasReadonlyFlag()) + flag.message(from_utf8(N_("Document is read-only"))); + else + flag.message(from_utf8(N_("Document has been modified externally"))); flag.setEnabled(false); return true; } @@ -1132,11 +1147,7 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_CHANGE_PREVIOUS: case LFUN_ALL_CHANGES_ACCEPT: case LFUN_ALL_CHANGES_REJECT: - // TODO: context-sensitive enabling of LFUNs - // 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.setEnabled(true); + flag.setEnabled(buffer_.areChangesPresent()); break; case LFUN_SCREEN_UP: @@ -1354,6 +1365,16 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) else dr.screenUpdate(Update::Force | Update::FitCursor); dr.forceBufferUpdate(); + // we only need to do this if we have deleted or restored a + // BiBTeX inset. but there is no other place to do it. one + // obvious idea is to try to do it in a copy constructor for + // InsetBibTeX, but when that is invoked, the buffer_ member + // is not yet set. another idea is to look at the InsetLists + // of the various paragraphs. but we'd have to recurse through + // the contained insets to make that work. it doesn't seem to + // be worth it, as this will not happen that often. + buffer().invalidateBibfileCache(); + buffer().removeBiblioTempFiles(); break; case LFUN_REDO: @@ -1364,10 +1385,13 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) else dr.screenUpdate(Update::Force | Update::FitCursor); dr.forceBufferUpdate(); + // see above + buffer().invalidateBibfileCache(); + buffer().removeBiblioTempFiles(); break; case LFUN_FONT_STATE: - dr.setMessage(cur.currentState()); + dr.setMessage(cur.currentState(false)); break; case LFUN_BOOKMARK_SAVE: @@ -1397,7 +1421,11 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_PARAGRAPH_GOTO: { int const id = convert(cmd.getArg(0)); - int const pos = convert(cmd.getArg(1)); + pos_type const pos = convert(cmd.getArg(1)); + if (id < 0) + break; + string const str_id_end = cmd.getArg(2); + string const str_pos_end = cmd.getArg(3); int i = 0; for (Buffer * b = &buffer_; i == 0 || b != &buffer_; b = theBufferList().next(b)) { @@ -1414,10 +1442,20 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) << b->absFileName() << "'."); if (b == &buffer_) { - // Set the cursor - cur.pos() = pos; - mouseSetCursor(cur); - dr.screenUpdate(Update::Force | Update::FitCursor); + bool success; + if (str_id_end.empty() || str_pos_end.empty()) { + // Set the cursor + cur.pos() = pos; + mouseSetCursor(cur); + success = true; + } else { + int const id_end = convert(str_id_end); + pos_type const pos_end = convert(str_pos_end); + success = setCursorFromEntries({id, pos}, + {id_end, pos_end}); + } + if (success) + dr.screenUpdate(Update::Force | Update::FitCursor); } else { // Switch to other buffer view and resend cmd lyx::dispatch(FuncRequest( @@ -1509,14 +1547,8 @@ 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; } @@ -1528,14 +1560,9 @@ 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); - cur.dispatched(); - dispatched = true; - } else { - cur.undispatched(); - dispatched = false; - } + d->search_request_cache_ = req; break; } @@ -1557,11 +1584,6 @@ 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; } @@ -1593,7 +1615,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; case LFUN_MARK_TOGGLE: - cur.setSelection(false); + cur.selection(false); if (cur.mark()) { cur.setMark(false); dr.setMessage(from_utf8(N_("Mark removed"))); @@ -1777,26 +1799,30 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } - case LFUN_INSET_SELECT_ALL: - if (cur.depth() > 1 + case LFUN_INSET_SELECT_ALL: { + // true if all cells are selected + bool const all_selected = cur.depth() > 1 && cur.selBegin().at_begin() - && cur.selEnd().at_end()) { - // All the contents of the inset if selected. + && cur.selEnd().at_end(); + // true if some cells are selected + bool const cells_selected = cur.depth() > 1 + && cur.selBegin().at_cell_begin() + && cur.selEnd().at_cell_end(); + if (all_selected || (cells_selected && !cur.inset().isTable())) { + // All the contents of the inset if selected, or only at + // least one cell but inset is not a table. // Select the inset from outside. cur.pop(); cur.resetAnchor(); - cur.setSelection(true); + cur.selection(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. + } else if (cells_selected) { + // At least one complete cell is selected and inset is a table. // Select all cells cur.idx() = 0; cur.pos() = 0; cur.resetAnchor(); - cur.setSelection(true); + cur.selection(true); cur.idx() = cur.lastidx(); cur.pos() = cur.lastpos(); } else { @@ -1804,13 +1830,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) cur.pit() = 0; cur.pos() = 0; cur.resetAnchor(); - cur.setSelection(true); + cur.selection(true); cur.pit() = cur.lastpit(); cur.pos() = cur.lastpos(); } cur.setCurrentFont(); dr.screenUpdate(Update::Force); break; + } // This would be in Buffer class if only Cursor did not @@ -1850,9 +1877,17 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) if (!cur.nextInset() || cur.nextInset() == ins) cur.forwardInset(); } - cur.endUndoGroup(); cur = savecur; cur.fixIfBroken(); + /** This is a dummy undo record only to remember the cursor + * that has just been set; this will be used on a redo action + * (see ticket #10097) + + * FIXME: a better fix would be to have a way to set the + * cursor value directly, but I am not sure it is worth it. + */ + cur.recordUndo(); + cur.endUndoGroup(); dr.screenUpdate(Update::Force); dr.forceBufferUpdate(); @@ -2124,7 +2159,7 @@ void BufferView::updateHoveredInset() const int const y = d->mouse_position_cache_.y_; Inset const * covering_inset = getCoveringInset(buffer_.text(), x, y); - d->clickable_inset_ = covering_inset && covering_inset->clickable(x, y); + d->clickable_inset_ = covering_inset && covering_inset->clickable(*this, x, y); if (covering_inset == d->last_inset_) // Same inset, no need to do anything... @@ -2180,7 +2215,7 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) Cursor old = cursor(); Cursor cur(*this); cur.push(buffer_.inset()); - cur.setSelection(d->cursor_.selection()); + cur.selection(d->cursor_.selection()); // Either the inset under the cursor or the // surrounding Text will handle this event. @@ -2203,9 +2238,14 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) // inset (depending on cmd.x(), cmd.y()). This is needed for // editing to fix bug 9628, but e.g. the context menu needs a // cursor in front of the inset. - if (inset->hasSettings() && + if ((inset->hasSettings() || !inset->contextMenuName().empty() + || inset->lyxCode() == SEPARATOR_CODE) && cur.nextInset() != inset && cur.prevInset() == inset) cur.posBackward(); + } else if (cur.inTexted() && cur.pos() + && cur.paragraph().isEnvSeparator(cur.pos() - 1)) { + // Always place cursor in front of a separator inset. + cur.posBackward(); } // Put anchor at the same position. @@ -2225,8 +2265,6 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) if (!inset || !cur.result().dispatched()) cur.dispatch(cmd); - cur.endUndoGroup(); - // Notify left insets if (cur != old) { bool badcursor = old.fixIfBroken() | cur.fixIfBroken(); @@ -2235,6 +2273,8 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0) cursor().fixIfBroken(); } + cur.endUndoGroup(); + // Do we have a selection? theSelection().haveSelection(cursor().selection()); @@ -2313,58 +2353,35 @@ int BufferView::scrollUp(int offset) } -void BufferView::setCursorFromRow(int row) +bool BufferView::setCursorFromRow(int row) { - setCursorFromRow(row, buffer_.texrow()); + TexRow::TextEntry start, end; + tie(start,end) = buffer_.texrow().getEntriesFromRow(row); + LYXERR(Debug::LATEX, + "setCursorFromRow: for row " << row << ", TexRow has found " + "start (id=" << start.id << ",pos=" << start.pos << "), " + "end (id=" << end.id << ",pos=" << end.pos << ")"); + return setCursorFromEntries(start, end); } -void BufferView::setCursorFromRow(int row, TexRow const & texrow) +bool BufferView::setCursorFromEntries(TexRow::TextEntry start, + TexRow::TextEntry end) { - int tmpid; - int tmppos; - pit_type newpit = 0; - pos_type newpos = 0; - - texrow.getIdFromRow(row, tmpid, tmppos); - - bool posvalid = (tmpid != -1); - if (posvalid) { - // 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 dit = buffer_.getParFromID(tmpid); - if (dit == doc_iterator_end(&buffer_)) - posvalid = false; - 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; - Paragraph const & par = buffer_.text().getPar(newpit); - if (newpos > par.size()) { - LYXERR0("Requested position no longer valid."); - newpos = par.size() - 1; - } - } - } - if (!posvalid) { - frontend::Alert::error(_("Inverse Search Failed"), - _("Invalid position requested by inverse search.\n" - "You need to update the viewed document.")); - return; + DocIterator dit_start, dit_end; + tie(dit_start,dit_end) = + TexRow::getDocIteratorsFromEntries(start, end, buffer_); + if (!dit_start) + return false; + // Setting selection start + d->cursor_.clearSelection(); + setCursor(dit_start); + // Setting selection end + if (dit_end) { + d->cursor_.resetAnchor(); + setCursorSelectionTo(dit_end); } - d->cursor_.reset(); - buffer_.text().setCursor(d->cursor_, newpit, newpos); - d->cursor_.setSelection(false); - d->cursor_.resetAnchor(); - recenter(); + return true; } @@ -2397,8 +2414,8 @@ void BufferView::gotoLabel(docstring const & label) // find label shared_ptr toc = buf->tocBackend().toc("label"); - TocIterator toc_it = toc->begin(); - TocIterator end = toc->end(); + Toc::const_iterator toc_it = toc->begin(); + Toc::const_iterator end = toc->end(); for (; toc_it != end; ++toc_it) { if (label == toc_it->str()) { lyx::dispatch(toc_it->action()); @@ -2448,7 +2465,7 @@ void BufferView::setCursor(DocIterator const & dit) dit[i].inset().edit(d->cursor_, true); d->cursor_.setCursor(dit); - d->cursor_.setSelection(false); + d->cursor_.selection(false); d->cursor_.setCurrentFont(); // FIXME // It seems on general grounds as if this is probably needed, but @@ -2458,6 +2475,18 @@ void BufferView::setCursor(DocIterator const & dit) } +void BufferView::setCursorSelectionTo(DocIterator const & dit) +{ + size_t const n = dit.depth(); + for (size_t i = 0; i < n; ++i) + dit[i].inset().edit(d->cursor_, true); + + d->cursor_.selection(true); + d->cursor_.setCursorSelectionTo(dit); + d->cursor_.setCurrentFont(); +} + + bool BufferView::checkDepm(Cursor & cur, Cursor & old) { // Would be wrong to delete anything if we have a selection. @@ -2485,7 +2514,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old) } -bool BufferView::mouseSetCursor(Cursor & cur, bool select) +bool BufferView::mouseSetCursor(Cursor & cur, bool const select) { LASSERT(&cur.bv() == this, return false); @@ -2503,30 +2532,23 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select) if (leftinset) d->cursor_.fixIfBroken(); - // FIXME: shift-mouse selection doesn't work well across insets. - bool const do_selection = - select && &d->cursor_.normalAnchor().inset() == &cur.inset(); - // do the dEPM magic if needed // FIXME: (1) move this to InsetText::notifyCursorLeaves? // FIXME: (2) if we had a working InsetText::notifyCursorLeaves, // the leftinset bool would not be necessary (badcursor instead). bool update = leftinset; - if (!do_selection && d->cursor_.inTexted()) { - update |= checkDepm(cur, d->cursor_); - if (cur.pos() && cur.paragraph().isEnvSeparator(cur.pos() - 1)) - cur.posBackward(); - } - if (!do_selection) - d->cursor_.resetAnchor(); - d->cursor_.setCursor(cur); - d->cursor_.boundary(cur.boundary()); - if (do_selection) + if (select) { d->cursor_.setSelection(); - else + d->cursor_.setCursorSelectionTo(cur); + } else { + if (d->cursor_.inTexted()) + update |= checkDepm(cur, d->cursor_); + d->cursor_.resetAnchor(); + d->cursor_.setCursor(cur); d->cursor_.clearSelection(); - + } + d->cursor_.boundary(cur.boundary()); d->cursor_.finishUndo(); d->cursor_.setCurrentFont(); if (update) @@ -2580,7 +2602,7 @@ bool BufferView::selectIfEmpty(DocIterator & cur) d->cursor_.setCursor(cur); d->cursor_.pit() = beg_pit; d->cursor_.pos() = 0; - d->cursor_.setSelection(false); + d->cursor_.selection(false); d->cursor_.resetAnchor(); d->cursor_.pit() = end_pit; d->cursor_.pos() = end_pos; @@ -2792,19 +2814,7 @@ Point BufferView::coordOffset(DocIterator const & dit) const } // remember width for the case that sl.inset() is positioned in an RTL inset - if (i && dit[i - 1].text()) { - // If this Inset is inside a Text Inset, retrieve the Dimension - // from the containing text instead of using Inset::dimension() which - // might not be implemented. - // FIXME (Abdel 23/09/2007): this is a bit messy because of the - // elimination of Inset::dim_ cache. This coordOffset() method needs - // to be rewritten in light of the new design. - Dimension const & dim = coordCache().getInsets().dim(&sl.inset()); - lastw = dim.wid; - } else { - Dimension const dim = sl.inset().dimension(*this); - lastw = dim.wid; - } + lastw = sl.inset().dimension(*this).wid; //lyxerr << "Cursor::getPos, i: " // << i << " x: " << xx << " y: " << y << endl; @@ -2879,7 +2889,7 @@ bool BufferView::paragraphVisible(DocIterator const & dit) const void BufferView::cursorPosAndHeight(Point & p, int & h) const { Cursor const & cur = cursor(); - Font const font = cur.getFont(); + Font const font = cur.real_current_font; frontend::FontMetrics const & fm = theFontMetrics(font); int const asc = fm.maxAscent(); int const des = fm.maxDescent(); @@ -2905,15 +2915,26 @@ int BufferView::horizScrollOffset() const } -CursorSlice const & BufferView::currentRowSlice() const +int BufferView::horizScrollOffset(Text const * text, + pit_type pit, pos_type pos) const { - return d->current_row_slice_; + // Is this a row that is currently scrolled? + if (!d->current_row_slice_.empty() + && &text->inset() == d->current_row_slice_.inset().asInsetText() + && pit == d->current_row_slice_.pit() + && pos == d->current_row_slice_.pos()) + return d->horiz_scroll_offset_; + return 0; } -CursorSlice const & BufferView::lastRowSlice() const +bool BufferView::hadHorizScrollOffset(Text const * text, + pit_type pit, pos_type pos) const { - return d->last_row_slice_; + return !d->last_row_slice_.empty() + && &text->inset() == d->last_row_slice_.inset().asInsetText() + && pit == d->last_row_slice_.pit() + && pos == d->last_row_slice_.pos(); } @@ -2979,8 +3000,7 @@ void BufferView::checkCursorScrollOffset(PainterInfo & pi) bool const drawing = pi.pain.isDrawingEnabled(); pi.pain.setDrawingEnabled(false); // No need to care about vertical position. - RowPainter rp(pi, buffer().text(), d->cursor_.bottom().pit(), row, - -d->horiz_scroll_offset_, 0); + RowPainter rp(pi, buffer().text(), row, -d->horiz_scroll_offset_, 0); rp.paintText(); pi.pain.setDrawingEnabled(drawing); }