X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=77ab989d193962f602d96435b8c0fbc1f41e0128;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=663618af36f185d7d08439c72294763bf0b3abf8;hpb=26eb5092fb69464d181caaf212d6a4d9c9cff2f0;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 663618af36..77ab989d19 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -46,6 +46,7 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
+#include "RowPainter.h"
 #include "Session.h"
 #include "Text.h"
 #include "TextClass.h"
@@ -350,11 +351,12 @@ BufferView::~BufferView()
 
 int BufferView::rightMargin() const
 {
+	// 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 + 20)
-			return 10;
+	if (!full_screen_ || !lyxrc.full_screen_limit
+	    || width_ < lyxrc.full_screen_width + 2 * default_margin)
+		return default_margin;
 
 	return (width_ - lyxrc.full_screen_width) / 2;
 }
@@ -366,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;
 }
 
 
@@ -432,7 +441,7 @@ bool BufferView::needsFitCursor() const
 void BufferView::processUpdateFlags(Update::flags flags)
 {
 	// This is close to a hot-path.
-	LYXERR(Debug::DEBUG, "BufferView::processUpdateFlags()"
+	LYXERR(Debug::PAINTING, "BufferView::processUpdateFlags()"
 		<< "[fitcursor = " << (flags & Update::FitCursor)
 		<< ", forceupdate = " << (flags & Update::Force)
 		<< ", singlepar = " << (flags & Update::SinglePar)
@@ -557,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;
 }
 
 
@@ -598,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;
@@ -705,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());
 }
 
@@ -807,6 +821,8 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
 		setCursor(dit);
 		// set the current font.
 		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!
@@ -870,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.
@@ -1019,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;
 	}
@@ -1123,38 +1142,14 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		    || getInsetByCode<InsetRef>(cur, REF_CODE));
 		break;
 
-	case LFUN_CHANGES_TRACK:
-		flag.setEnabled(true);
-		flag.setOnOff(buffer_.params().track_changes);
-		break;
-
-	case LFUN_CHANGES_OUTPUT:
-		flag.setEnabled(true);
-		flag.setOnOff(buffer_.params().output_changes);
-		break;
-
 	case LFUN_CHANGES_MERGE:
 	case LFUN_CHANGE_NEXT:
 	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_BUFFER_TOGGLE_COMPRESSION: {
-		flag.setOnOff(buffer_.params().compressed);
-		break;
-	}
-
-	case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC: {
-		flag.setOnOff(buffer_.params().output_sync);
-		break;
-	}
-
 	case LFUN_SCREEN_UP:
 	case LFUN_SCREEN_DOWN:
 	case LFUN_SCROLL:
@@ -1370,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:
@@ -1380,6 +1385,9 @@ 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:
@@ -1413,7 +1421,11 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
 	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)) {
@@ -1430,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<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(
@@ -1457,33 +1479,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		break;
 	}
 
-	case LFUN_CHANGES_TRACK:
-		buffer_.params().track_changes = !buffer_.params().track_changes;
-		break;
-
-	case LFUN_CHANGES_OUTPUT:
-		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");
-
-			if (!dvipost && !xcolorulem) {
-				Alert::warning(_("Changes not shown in LaTeX output"),
-					       _("Changes will not be highlighted in LaTeX output, "
-						 "because neither dvipost nor xcolor/ulem are installed.\n"
-						 "Please install these packages or redefine "
-						 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-			} else if (!xcolorulem) {
-				Alert::warning(_("Changes not shown in LaTeX output"),
-					       _("Changes will not be highlighted in LaTeX output "
-						 "when using pdflatex, because xcolor and ulem are not installed.\n"
-						 "Please install both packages or redefine "
-						 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-			}
-		}
-		break;
-
 	case LFUN_CHANGE_NEXT:
 		findNextChange(this);
 		// FIXME: Move this LFUN to Buffer so that we don't have to do this:
@@ -1552,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;
 	}
 
@@ -1571,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;
 	}
@@ -1600,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;
 	}
@@ -1636,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")));
@@ -1723,15 +1702,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 	}
 		break;
 
-	case LFUN_BUFFER_TOGGLE_COMPRESSION:
-		// turn compression on/off
-		buffer_.params().compressed = !buffer_.params().compressed;
-		break;
-
-	case LFUN_BUFFER_TOGGLE_OUTPUT_SYNC:
-		buffer_.params().output_sync = !buffer_.params().output_sync;
-		break;
-
 	case LFUN_SCREEN_UP:
 	case LFUN_SCREEN_DOWN: {
 		Point p = getPos(cur);
@@ -1829,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 {
@@ -1856,12 +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
@@ -1901,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();
 
@@ -2175,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...
@@ -2231,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.
@@ -2254,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.backwardPos();
+			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.
@@ -2276,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();
@@ -2286,6 +2273,8 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 			cursor().fixIfBroken();
 	}
 
+	cur.endUndoGroup();
+
 	// Do we have a selection?
 	theSelection().haveSelection(cursor().selection());
 
@@ -2364,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;
 }
 
 
@@ -2448,8 +2414,8 @@ void BufferView::gotoLabel(docstring const & label)
 
 		// 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());
@@ -2499,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
@@ -2509,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.
@@ -2536,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);
 
@@ -2554,27 +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 (!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)
@@ -2628,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;
@@ -2840,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;
@@ -2927,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();
@@ -2953,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();
 }
 
 
@@ -2986,7 +2959,7 @@ void BufferView::setCurrentRowSlice(CursorSlice const & rowSlice)
 }
 
 
-void BufferView::checkCursorScrollOffset()
+void BufferView::checkCursorScrollOffset(PainterInfo & pi)
 {
 	CursorSlice rowSlice = d->cursor_.bottom();
 	TextMetrics const & tm = textMetrics(rowSlice.text());
@@ -3003,23 +2976,61 @@ void BufferView::checkCursorScrollOffset()
 	// 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(), row, -d->horiz_scroll_offset_, 0);
+		rp.paintText();
+		pi.pain.setDrawingEnabled(drawing);
+	}
+
 	// Current x position of the cursor in pixels
-	int const cur_x = getPos(d->cursor_).x_;
+	int cur_x = getPos(d->cursor_).x_;
 
 	// Horizontal scroll offset of the cursor row in pixels
 	int offset = d->horiz_scroll_offset_;
-	int const MARGIN = 2 * theFontMetrics(d->cursor_.real_current_font).em();
-	//lyxerr << "cur_x=" << cur_x << ", offset=" << offset << ", margin=" << MARGIN << endl;
-	if (cur_x < offset + MARGIN) {
-		// scroll right
-		offset = cur_x - MARGIN;
-	} else if (cur_x > offset + workWidth() - MARGIN) {
-		// scroll left
-		offset = cur_x - workWidth() + MARGIN;
+	int const MARGIN = 2 * theFontMetrics(d->cursor_.real_current_font).em()
+	                   + row.right_margin;
+	if (row.right_x() <= workWidth() - row.right_margin) {
+		// Row is narrower than the work area, no offset needed.
+		offset = 0;
+	} else {
+		if (cur_x - offset < MARGIN) {
+			// cursor would be too far right
+			offset = cur_x - MARGIN;
+		} else if (cur_x - offset > workWidth() - MARGIN) {
+			// cursor would be too far left
+			offset = cur_x - workWidth() + MARGIN;
+		}
+		// Correct the offset to make sure that we do not scroll too much
+		if (offset < 0)
+			offset = 0;
+		if (row.right_x() - offset < workWidth() - row.right_margin)
+			offset = row.right_x() - workWidth() + row.right_margin;
 	}
 
-	if (offset < row.left_margin || row.width() <= workWidth())
-		offset = 0;
+	//lyxerr << "cur_x=" << cur_x << ", offset=" << offset << ", row.wid=" << row.width() << ", margin=" << MARGIN << endl;
 
 	if (offset != d->horiz_scroll_offset_)
 		LYXERR(Debug::PAINTING, "Horiz. scroll offset changed from "
@@ -3050,7 +3061,7 @@ void BufferView::draw(frontend::Painter & pain)
 
 	// Check whether the row where the cursor lives needs to be scrolled.
 	// Update the drawing strategy if needed.
-	checkCursorScrollOffset();
+	checkCursorScrollOffset(pi);
 
 	switch (d->update_strategy_) {