#include "insets/InsetText.h"
#include "mathed/MathData.h"
+#include "mathed/InsetMathNest.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
#include "frontends/Delegates.h"
#include "frontends/FontMetrics.h"
+#include "frontends/NullPainter.h"
#include "frontends/Painter.h"
#include "frontends/Selection.h"
DecorationUpdate
};
-} // anon namespace
+} // namespace
/////////////////////////////////////////////////////////////////////
struct BufferView::Private
{
- Private(BufferView & bv) : update_strategy_(NoScreenUpdate),
+ Private(BufferView & bv) :
+ update_strategy_(FullScreenUpdate),
+ update_flags_(Update::Force),
wh_(0), cursor_(bv),
anchor_pit_(0), anchor_ypos_(0),
inlineCompletionUniqueChars_(0),
last_inset_(0), clickable_inset_(false),
mouse_position_cache_(),
bookmark_edit_position_(-1), gui_(0),
- horiz_scroll_offset_(0)
+ horiz_scroll_offset_(0),
+ caret_ascent_(0), caret_descent_(0)
{
xsel_cache_.set = false;
}
///
ScreenUpdateStrategy update_strategy_;
///
+ Update::flags update_flags_;
+ ///
CoordCache coord_cache_;
/// Estimated average par height for scrollbar.
/// a slice pointing to the start of the row where cursor was
/// at previous draw event
CursorSlice last_row_slice_;
+
+ // The vertical size of the blinking caret. Only used for math
+ // Using it for text could be bad when undo restores the cursor
+ // current font, since the caret size could become wrong.
+ int caret_ascent_;
+ int caret_descent_;
};
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)
}
+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;
}
}
-void BufferView::processUpdateFlags(Update::flags flags)
+namespace {
+
+// this is for debugging only.
+string flagsAsString(Update::flags flags)
{
- // This is close to a hot-path.
- LYXERR(Debug::PAINTING, "BufferView::processUpdateFlags()"
- << "[fitcursor = " << (flags & Update::FitCursor)
- << ", forceupdate = " << (flags & Update::Force)
- << ", singlepar = " << (flags & Update::SinglePar)
- << "] buffer: " << &buffer_);
+ if (flags == Update::None)
+ return "None ";
+ return string((flags & Update::FitCursor) ? "FitCursor " : "")
+ + ((flags & Update::Force) ? "Force " : "")
+ + ((flags & Update::ForceDraw) ? "ForceDraw " : "")
+ + ((flags & Update::SinglePar) ? "SinglePar " : "")
+ + ((flags & Update::Decoration) ? "Decoration " : "");
+}
- // FIXME Does this really need doing here? It's done in updateBuffer, and
- // if the Buffer doesn't need updating, then do the macros?
- buffer_.updateMacros();
+}
- // Now do the first drawing step if needed. This consists on updating
- // the CoordCache in updateMetrics().
- // The second drawing step is done in WorkArea::redraw() if needed.
- // FIXME: is this still true now that Buffer::changed() is used all over?
+void BufferView::processUpdateFlags(Update::flags flags)
+{
+ LYXERR(Debug::PAINTING, "BufferView::processUpdateFlags( "
+ << flagsAsString(flags) << ") buffer: " << &buffer_);
// Case when no explicit update is requested.
- if (!flags) {
- // no need to redraw anything.
- d->update_strategy_ = NoScreenUpdate;
+ if (flags == Update::None)
return;
+
+ // SinglePar is ignored for now (this should probably change). We
+ // set it ourselves below, at the price of always rebreaking the
+ // paragraph at cursor. This can be expensive for large tables.
+ flags = flags & ~Update::SinglePar;
+
+ // First check whether the metrics and inset positions should be updated
+ if (flags & Update::Force) {
+ // This will update the CoordCache items and replace Force
+ // with ForceDraw in flags.
+ updateMetrics(flags);
}
- if (flags == Update::Decoration) {
- d->update_strategy_ = DecorationUpdate;
- buffer_.changed(false);
- return;
+ // Detect whether we can only repaint a single paragraph.
+ // We handle this before FitCursor because the later will require
+ // correct metrics at cursor position.
+ if (!(flags & Update::ForceDraw)) {
+ if (singleParUpdate())
+ flags = flags | Update::SinglePar;
+ else
+ updateMetrics(flags);
}
- if (flags == Update::FitCursor
- || flags == (Update::Decoration | Update::FitCursor)) {
- // tell the frontend to update the screen if needed.
+ // Then make sure that the screen contains the cursor if needed
+ if (flags & Update::FitCursor) {
if (needsFitCursor()) {
- showCursor();
- return;
- }
- if (flags & Update::Decoration) {
- d->update_strategy_ = DecorationUpdate;
- buffer_.changed(false);
- return;
+ scrollToCursor(d->cursor_, false);
+ // Metrics have to be recomputed (maybe again)
+ updateMetrics(flags);
}
- // no screen update is needed in principle, but this
- // could change if cursor row needs horizontal scrolling.
- d->update_strategy_ = NoScreenUpdate;
- buffer_.changed(false);
- return;
+ flags = flags & ~Update::FitCursor;
}
- bool const full_metrics = flags & Update::Force || !singleParUpdate();
-
- if (full_metrics)
- // We have to update the full screen metrics.
- updateMetrics();
-
- if (!(flags & Update::FitCursor)) {
- // Nothing to do anymore. Trigger a redraw and return
- buffer_.changed(false);
- return;
- }
+ // Add flags to the the update flags. These will be reset to None
+ // after the redraw is actually done
+ d->update_flags_ = d->update_flags_ | flags;
+ LYXERR(Debug::PAINTING, "Cumulative flags: " << flagsAsString(flags));
- // updateMetrics() does not update paragraph position
- // This is done at draw() time. So we need a redraw!
- buffer_.changed(false);
+ // Now compute the update strategy
+ // Possibly values in flag are None, Decoration, ForceDraw
+ LATTEST((d->update_flags_ & ~(Update::None | Update::SinglePar
+ | Update::Decoration | Update::ForceDraw)) == 0);
- if (needsFitCursor()) {
- // The cursor is off screen so ensure it is visible.
- // refresh it:
- showCursor();
+ if (d->update_flags_ & Update::ForceDraw)
+ d->update_strategy_ = FullScreenUpdate;
+ else if (d->update_flags_ & Update::Decoration)
+ d->update_strategy_ = DecorationUpdate;
+ else if (d->update_flags_ & Update::SinglePar)
+ d->update_strategy_ = SingleParUpdate;
+ else {
+ // no need to redraw anything.
+ d->update_strategy_ = NoScreenUpdate;
}
updateHoveredInset();
+
+ // Trigger a redraw.
+ buffer_.changed(false);
}
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;
}
}
-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;
- buffer_.changed(true);
- updateHoveredInset();
+ if (abs(value) <= 2 * height_) {
+ d->anchor_ypos_ -= value;
+ processUpdateFlags(Update::Force);
return;
}
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());
}
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)
+ // reachable (e.g. closed collapsible inset)
// so the dociterator may need to be
// shortened. Otherwise, setCursor may crash
// lyx when the cursor can not be set to these
d->cursor_.setCurrentFont();
// Do not forget to reset the anchor (see #9912)
d->cursor_.resetAnchor();
- // To center the screen on this new position we need the
- // paragraph position which is computed at draw() time.
- // So we need a redraw!
- buffer_.changed(false);
- if (needsFitCursor())
- showCursor();
+ processUpdateFlags(Update::FitCursor);
}
return success;
void BufferView::showCursor(DocIterator const & dit,
bool recenter, bool update)
{
- if (scrollToCursor(dit, recenter) && update) {
- buffer_.changed(true);
- updateHoveredInset();
- }
+ if (scrollToCursor(dit, recenter) && update)
+ processUpdateFlags(Update::Force);
}
void BufferView::scrollToCursor()
{
- if (scrollToCursor(d->cursor_, false)) {
- buffer_.changed(true);
- updateHoveredInset();
- }
+ if (scrollToCursor(d->cursor_, false))
+ processUpdateFlags(Update::Force);
}
-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.
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;
}
flag.setEnabled(true);
break;
+ case LFUN_GRAPHICS_UNIFY:
+ flag.setEnabled(cur.selection());
+ break;
+
case LFUN_WORD_FINDADV: {
FindAndReplaceOptions opt;
istringstream iss(to_utf8(cmd.argument()));
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:
break;
}
- case LFUN_UNDO:
+ case LFUN_UNDO: {
dr.setMessage(_("Undo"));
cur.clearSelection();
+ // We need to find out if the bibliography information
+ // has changed. See bug #11055.
+ // So these should not be references...
+ LayoutModuleList const engines = buffer().params().citeEngine();
+ CiteEngineType const enginetype = buffer().params().citeEngineType();
if (!cur.textUndo())
dr.setMessage(_("No further undo information"));
- else
+ else {
dr.screenUpdate(Update::Force | Update::FitCursor);
- dr.forceBufferUpdate();
+ dr.forceBufferUpdate();
+ if (buffer().params().citeEngine() != engines ||
+ buffer().params().citeEngineType() != enginetype)
+ buffer().invalidateCiteLabels();
+ }
break;
+ }
- case LFUN_REDO:
+ case LFUN_REDO: {
dr.setMessage(_("Redo"));
cur.clearSelection();
+ // We need to find out if the bibliography information
+ // has changed. See bug #11055.
+ // So these should not be references...
+ LayoutModuleList const engines = buffer().params().citeEngine();
+ CiteEngineType const enginetype = buffer().params().citeEngineType();
if (!cur.textRedo())
dr.setMessage(_("No further redo information"));
- else
+ else {
dr.screenUpdate(Update::Force | Update::FitCursor);
- dr.forceBufferUpdate();
+ dr.forceBufferUpdate();
+ if (buffer().params().citeEngine() != engines ||
+ buffer().params().citeEngineType() != enginetype)
+ buffer().invalidateCiteLabels();
+ }
break;
+ }
case LFUN_FONT_STATE:
- dr.setMessage(cur.currentState());
+ dr.setMessage(cur.currentState(false));
break;
case LFUN_BOOKMARK_SAVE:
case LFUN_PARAGRAPH_GOTO: {
int const id = convert<int>(cmd.getArg(0));
- int const pos = convert<int>(cmd.getArg(1));
+ pos_type const pos = convert<int>(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)) {
<< 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<int>(str_id_end);
+ pos_type const pos_end = convert<int>(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(
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;
}
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;
}
if (lyxreplace(this, cmd, has_deleted)) {
dr.forceBufferUpdate();
dr.screenUpdate(Update::Force | Update::FitCursor);
- cur.dispatched();
- dispatched = true;
- } else {
- cur.undispatched();
- dispatched = false;
}
break;
}
break;
case LFUN_MARK_TOGGLE:
- cur.setSelection(false);
+ cur.selection(false);
if (cur.mark()) {
cur.setMark(false);
dr.setMessage(from_utf8(N_("Mark removed")));
break;
}
+ case LFUN_GRAPHICS_UNIFY: {
+
+ cur.recordUndoFullBuffer();
+
+ DocIterator from, to;
+ from = cur.selectionBegin();
+ to = cur.selectionEnd();
+
+ string const newId = cmd.getArg(0);
+ bool fetchId = newId.empty(); //if we wait for groupId from first graphics inset
+
+ InsetGraphicsParams grp_par;
+ if (!fetchId)
+ InsetGraphics::string2params(graphics::getGroupParams(buffer_, newId), buffer_, grp_par);
+
+ if (!from.nextInset()) //move to closest inset
+ from.forwardInset();
+
+ while (!from.empty() && from < to) {
+ Inset * inset = from.nextInset();
+ if (!inset)
+ break;
+ if (inset->lyxCode() == GRAPHICS_CODE) {
+ InsetGraphics & ig = static_cast<InsetGraphics &>(*inset);
+ InsetGraphicsParams inspar = ig.getParams();
+ if (fetchId) {
+ grp_par = inspar;
+ fetchId = false;
+ } else {
+ grp_par.filename = inspar.filename;
+ ig.setParams(grp_par);
+ }
+ }
+ from.forwardInset();
+ }
+ dr.screenUpdate(Update::Force); //needed if triggered from context menu
+ break;
+ }
+
case LFUN_STATISTICS: {
DocIterator from, to;
if (cur.selection()) {
bool const in_texted = cur.inTexted();
cur.setCursor(doc_iterator_begin(cur.buffer()));
cur.selHandle(false);
- buffer_.changed(true);
- updateHoveredInset();
+ // Force an immediate computation of metrics because we need it below
+ processUpdateFlags(Update::Force);
d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
true, act == LFUN_SCREEN_UP);
if (scroll_value)
scroll(scroll_step * scroll_value);
}
- buffer_.changed(true);
- updateHoveredInset();
+ dr.screenUpdate(Update::ForceDraw);
dr.forceBufferUpdate();
break;
}
}
- 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 {
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;
+ }
+
+
+ case LFUN_UNICODE_INSERT: {
+ if (cmd.argument().empty())
+ break;
+
+ FuncCode code = cur.inset().currentMode() == Inset::MATH_MODE ?
+ LFUN_MATH_INSERT : LFUN_SELF_INSERT;
+ int i = 0;
+ while (true) {
+ docstring const arg = from_utf8(cmd.getArg(i));
+ if (arg.empty())
+ break;
+ if (!isHex(arg)) {
+ LYXERR0("Not a hexstring: " << arg);
+ ++i;
+ continue;
+ }
+ char_type c = hexToInt(arg);
+ if (c >= 32 && c < 0x10ffff) {
+ LYXERR(Debug::KEY, "Inserting c: " << c);
+ lyx::dispatch(FuncRequest(code, docstring(1, c)));
+ }
+ ++i;
+ }
+ break;
+ }
// This would be in Buffer class if only Cursor did not
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();
icp["key"] = from_utf8(arg);
if (!opt1.empty())
icp["before"] = from_utf8(opt1);
+ icp["literal"] =
+ from_ascii(InsetCitation::last_literal ? "true" : "false");
string icstr = InsetCommand::params2string(icp);
FuncRequest fr(LFUN_INSET_INSERT, icstr);
lyx::dispatch(fr);
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...
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.
// 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() || !inset->contextMenuName().empty()) &&
+ 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.
}
-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;
}
// find label
shared_ptr<Toc> 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());
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
}
+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.
}
-bool BufferView::mouseSetCursor(Cursor & cur, bool select)
+bool BufferView::mouseSetCursor(Cursor & cur, bool const select)
{
LASSERT(&cur.bv() == this, return false);
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.inTexted() && 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)
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;
// the singlePar optimisation.
return false;
- d->update_strategy_ = SingleParUpdate;
+ tm.updatePosCache(bottom_pit);
LYXERR(Debug::PAINTING, "\ny1: " << pm.position() - pm.ascent()
<< " y2: " << pm.position() + pm.descent()
void BufferView::updateMetrics()
+{
+ updateMetrics(d->update_flags_);
+ d->update_strategy_ = FullScreenUpdate;
+}
+
+
+void BufferView::updateMetrics(Update::flags & update_flags)
{
if (height_ == 0 || width_ == 0)
return;
// 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.
+ else {
+ // avoid empty space above the first row
+ d->anchor_ypos_ = min(d->anchor_ypos_, anchor_pm.ascent());
+ }
}
anchor_pm.setPosition(d->anchor_ypos_);
+ tm.updatePosCache(d->anchor_pit_);
LYXERR(Debug::PAINTING, "metrics: "
<< " anchor pit = " << d->anchor_pit_
y1 -= pm.descent();
// Save the paragraph position in the cache.
pm.setPosition(y1);
+ tm.updatePosCache(pit1);
y1 -= pm.ascent();
}
y2 += pm.ascent();
// Save the paragraph position in the cache.
pm.setPosition(y2);
+ tm.updatePosCache(pit2);
y2 += pm.descent();
}
<< " pit1 = " << pit1
<< " pit2 = " << pit2);
- d->update_strategy_ = FullScreenUpdate;
+ // metrics is done, full drawing is necessary now
+ update_flags = (update_flags & ~Update::Force) | Update::ForceDraw;
+
+ // Now update the positions of insets in the cache.
+ updatePosCache();
if (lyxerr.debugging(Debug::WORKAREA)) {
LYXERR(Debug::WORKAREA, "BufferView::updateMetrics");
}
+void BufferView::updatePosCache()
+{
+ // this is the "nodraw" drawing stage: only set the positions of the
+ // insets in metrics cache.
+ frontend::NullPainter np;
+ draw(np, false);
+}
+
+
void BufferView::insertLyXFile(FileName const & fname)
{
LASSERT(d->cursor_.inTexted(), return);
}
// 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;
}
-void BufferView::cursorPosAndHeight(Point & p, int & h) const
+void BufferView::setCaretAscentDescent(int asc, int des)
+{
+ d->caret_ascent_ = asc;
+ d->caret_descent_ = des;
+}
+
+
+void BufferView::caretPosAndHeight(Point & p, int & h) const
{
+ int asc, des;
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();
+ if (cur.inMathed()) {
+ asc = d->caret_ascent_;
+ des = d->caret_descent_;
+ } else {
+ Font const font = cur.real_current_font;
+ frontend::FontMetrics const & fm = theFontMetrics(font);
+ asc = fm.maxAscent();
+ des = fm.maxDescent();
+ }
h = asc + des;
p = getPos(cur);
p.y_ -= asc;
}
-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();
}
}
-void BufferView::checkCursorScrollOffset(PainterInfo & pi)
+void BufferView::checkCursorScrollOffset()
{
CursorSlice rowSlice = d->cursor_.bottom();
TextMetrics const & tm = textMetrics(rowSlice.text());
// Set the row on which the cursor lives.
setCurrentRowSlice(rowSlice);
- // If insets referred to by cursor are not all in the cache, the positions
- // need to be recomputed.
- if (!d->cursor_.inCoordCache()) {
- /** FIXME: the code below adds an extraneous computation of
- * inset positions, and can therefore be bad for performance
- * (think for example about a very large tabular inset.
- * Redawing the row where it is means redrawing the whole
- * screen).
- *
- * The bug that this fixes is the following: assume that there
- * is a very large math inset. Upon entering the inset, when
- * pressing `End', the row is not scrolled and the cursor is
- * not visible. The extra row computation makes sure that the
- * inset positions are correctly computed and set in the
- * cache. This would not happen if we did not have two-stage
- * drawing.
- *
- * A proper fix would be to always have proper inset positions
- * at this point.
- */
- // Force the recomputation of inset positions
- 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);
- rp.paintText();
- pi.pain.setDrawingEnabled(drawing);
- }
-
// Current x position of the cursor in pixels
int cur_x = getPos(d->cursor_).x_;
}
-void BufferView::draw(frontend::Painter & pain)
+void BufferView::draw(frontend::Painter & pain, bool paint_caret)
{
if (height_ == 0 || width_ == 0)
return;
- LYXERR(Debug::PAINTING, "\t\t*** START DRAWING ***");
-
+ LYXERR(Debug::PAINTING, (pain.isNull() ? "\t\t--- START NODRAW ---"
+ : "\t\t*** START DRAWING ***"));
Text & text = buffer_.text();
TextMetrics const & tm = d->text_metrics_[&text];
int const y = tm.first().second->position();
// Check whether the row where the cursor lives needs to be scrolled.
// Update the drawing strategy if needed.
- checkCursorScrollOffset(pi);
+ checkCursorScrollOffset();
switch (d->update_strategy_) {
case NoScreenUpdate:
- // If no screen painting is actually needed, only some the different
- // coordinates of insets and paragraphs needs to be updated.
+ // no screen painting is actually needed. In nodraw stage
+ // however, the different coordinates of insets and paragraphs
+ // needs to be updated.
LYXERR(Debug::PAINTING, "Strategy: NoScreenUpdate");
- pi.full_repaint = true;
- pi.pain.setDrawingEnabled(false);
- tm.draw(pi, 0, y);
+ pi.full_repaint = false;
+ if (pain.isNull()) {
+ pi.full_repaint = true;
+ tm.draw(pi, 0, y);
+ } else {
+ pi.full_repaint = false;
+ tm.draw(pi, 0, y);
+ }
break;
case SingleParUpdate:
}
break;
}
- LYXERR(Debug::PAINTING, "\n\t\t*** END DRAWING ***");
+ LYXERR(Debug::PAINTING, (pain.isNull() ? "\t\t --- END NODRAW ---"
+ : "\t\t *** END DRAWING ***"));
// The scrollbar needs an update.
updateScrollbar();
for (pit_type pit = firstpm.first; pit <= lastpm.first; ++pit) {
ParagraphMetrics const & pm = tm.parMetrics(pit);
if (pm.position() + pm.descent() > 0) {
+ if (d->anchor_pit_ != pit
+ || d->anchor_ypos_ != pm.position())
+ LYXERR(Debug::PAINTING, "Found new anchor pit = " << d->anchor_pit_
+ << " anchor ypos = " << d->anchor_ypos_);
d->anchor_pit_ = pit;
d->anchor_ypos_ = pm.position();
break;
}
}
- LYXERR(Debug::PAINTING, "Found new anchor pit = " << d->anchor_pit_
- << " anchor ypos = " << d->anchor_ypos_);
+ if (!pain.isNull()) {
+ // reset the update flags, everything has been done
+ d->update_flags_ = Update::None;
+ }
+
+ // If a caret has to be painted, mark its text row as dirty to
+ //make sure that it will be repainted on next redraw.
+ /* FIXME: investigate whether this can be avoided when the cursor did not
+ * move at all
+ */
+ if (paint_caret) {
+ Row const & caret_row = d->cursor_.textRow();
+ caret_row.changed(true);
+ }
}
projects / lyx.git / blobdiff