X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=81ebe79977370d21bf2e54341cd2ab5d400dc955;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=b07eb2b37f71ed2ed695fedc1b914beeaf82a13f;hpb=8a047a411235fcf5ba48f075e0a23a7cf1e3e8bb;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index b07eb2b37f..81ebe79977 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 2.5mm at 100dpi
+	int const default_margin = Length(2.5, Length::MM).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;
 }
@@ -432,7 +434,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)
@@ -807,6 +809,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!
@@ -1123,16 +1127,6 @@ 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:
@@ -1145,16 +1139,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		flag.setEnabled(true);
 		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:
@@ -1457,33 +1441,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:
@@ -1723,15 +1680,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);
@@ -1860,6 +1808,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			cur.pit() = cur.lastpit();
 			cur.pos() = cur.lastpos();
 		}
+		cur.setCurrentFont();
 		dr.screenUpdate(Update::Force);
 		break;
 
@@ -2249,6 +2198,15 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
 	// Build temporary cursor.
 	Inset * inset = d->text_metrics_[&buffer_.text()].editXY(cur, cmd.x(), cmd.y());
+	if (inset) {
+		// If inset is not editable, cur.pos() might point behind the
+		// 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() &&
+		    cur.nextInset() != inset && cur.prevInset() == inset)
+			cur.posBackward();
+	}
 
 	// Put anchor at the same position.
 	cur.resetAnchor();
@@ -2356,13 +2314,19 @@ int BufferView::scrollUp(int offset)
 
 
 void BufferView::setCursorFromRow(int row)
+{
+	setCursorFromRow(row, buffer_.texrow());
+}
+
+
+void BufferView::setCursorFromRow(int row, TexRow const & texrow)
 {
 	int tmpid;
 	int tmppos;
 	pit_type newpit = 0;
 	pos_type newpos = 0;
 
-	buffer_.texrow().getIdFromRow(row, tmpid, tmppos);
+	texrow.getIdFromRow(row, tmpid, tmppos);
 
 	bool posvalid = (tmpid != -1);
 	if (posvalid) {
@@ -2548,8 +2512,12 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 	// 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())
+	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();
@@ -2832,8 +2800,7 @@ Point BufferView::coordOffset(DocIterator const & dit) const
 			// 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 = parMetrics(dit[i - 1].text(),
-				dit[i - 1].pit()).insetDimension(&sl.inset());
+			Dimension const & dim = coordCache().getInsets().dim(&sl.inset());
 			lastw = dim.wid;
 		} else {
 			Dimension const dim = sl.inset().dimension(*this);
@@ -2972,7 +2939,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());
@@ -2989,23 +2956,62 @@ 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(), 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 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 "
@@ -3036,7 +3042,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_) {