X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=5bad57ca0ece1d8d88c4017fe9ffd516cb99dc07;hb=cd4ae51f7787046e8852abc4b339b5191c6adc16;hp=016423f87bfcf53faca39ee1c10925aa0f1a6a95;hpb=2e45bade7abea57625319068f559a6b57150ffb5;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 016423f87b..5bad57ca0e 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -16,6 +16,7 @@
 #define BUFFER_VIEW_H
 
 #include "DocumentClassPtr.h"
+#include "TexRow.h"
 #include "update_flags.h"
 
 #include "support/strfwd.h"
@@ -40,13 +41,13 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
-class PainterInfo;
+class Length;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
+class Row;
 class TexRow;
 class Text;
-struct TextEntry;
 class TextMetrics;
 
 enum CursorStatus {
@@ -105,17 +106,31 @@ public:
 	/// left margin
 	int leftMargin() const;
 
+	/// return the on-screen size of this length
+	/*
+	 *  This is a wrapper around Length::inPixels that uses the
+	 *  bufferview width as width and the EM value of the default
+	 *  document font.
+	 */
+	int inPixels(Length const & len) const;
+
+	/** Return the number of pixels equivalent to \c pix pixels at
+	 * 100dpi and 100% zoom.
+	 */
+	int zoomedPixels(int pix) const;
+
 	/// \return true if the BufferView is at the top of the document.
 	bool isTopScreen() const;
 
 	/// \return true if the BufferView is at the bottom of the document.
 	bool isBottomScreen() const;
 
-	/// perform pending metrics updates.
-	/** \c Update::FitCursor means first to do a FitCursor, and to
+	/// Add \p flags to current update flags and trigger an update.
+	/* If this method is invoked several times before the update
+	 * actually takes place, the effect is cumulative.
+	 * \c Update::FitCursor means first to do a FitCursor, and to
 	 * force an update if screen position changes.
 	 * \c Update::Force means to force an update in any case.
-	 * \retval true if a screen redraw is needed
 	 */
 	void processUpdateFlags(Update::flags flags);
 
@@ -131,11 +146,6 @@ public:
 	int horizScrollOffset(Text const * text,
 	                      pit_type pit, pos_type pos) const;
 
-	// Returns true if the row of text starting at (pit, pos) was scrolled
-	// at the last draw event.
-	bool hadHorizScrollOffset(Text const * text,
-                              pit_type pit, pos_type pos) const;
-
 	/// reset the scrollbar to reflect current view position.
 	void updateScrollbar();
 	/// return the Scrollbar Parameters.
@@ -165,7 +175,7 @@ public:
 	/// set the cursor based on the given TeX source row.
 	bool setCursorFromRow(int row);
 	/// set the cursor based on the given start and end TextEntries.
-	bool setCursorFromEntries(TextEntry start, TextEntry end);
+	bool setCursorFromEntries(TexRow::TextEntry start, TexRow::TextEntry end);
 
 	/// set cursor to the given inset. Return true if found.
 	bool setCursorFromInset(Inset const *);
@@ -238,9 +248,6 @@ public:
 	/// \sa WorkArea
 	void mouseEventDispatch(FuncRequest const & ev);
 
-	/// access to anchor.
-	pit_type anchor_ref() const;
-
 	///
 	CursorStatus cursorStatus(DocIterator const & dit) const;
 	/// access to full cursor.
@@ -248,7 +255,7 @@ public:
 	/// access to full cursor.
 	Cursor const & cursor() const;
 	/// sets cursor.
-	/// This will also open all relevant collapsable insets.
+	/// This will also open all relevant collapsible insets.
 	void setCursor(DocIterator const &);
 	/// set the selection up to dit.
 	void setCursorSelectionTo(DocIterator const & dit);
@@ -274,6 +281,10 @@ public:
 	/// update the internal \c ViewMetricsInfo.
 	void updateMetrics();
 
+	// this is the "nodraw" drawing stage: only set the positions of the
+	// insets in metrics cache.
+	void updatePosCache();
+
 	///
 	TextMetrics const & textMetrics(Text const * t) const;
 	TextMetrics & textMetrics(Text const * t);
@@ -291,12 +302,13 @@ public:
 	bool paragraphVisible(DocIterator const & dit) const;
 	/// is the cursor currently visible in the view
 	bool cursorInView(Point const & p, int h) const;
-	/// get the position and height of the cursor
-	void cursorPosAndHeight(Point & p, int & h) const;
-
+	/// set the ascent and descent of the caret
+	void setCaretAscentDescent(int asc, int des);
+	/// get the position and height of the caret
+	void caretPosAndHeight(Point & p, int & h) const;
 
 	///
-	void draw(frontend::Painter & pain);
+	void draw(frontend::Painter & pain, bool paint_caret);
 
 	/// get this view's keyboard map handler.
 	Intl & getIntl();
@@ -352,13 +364,15 @@ private:
 	/// Update current paragraph metrics.
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
+	/// do the work for the public updateMetrics()
+	void updateMetrics(Update::flags & update_flags);
 
 	// Set the row on which the cursor lives.
 	void setCurrentRowSlice(CursorSlice const & rowSlice);
 
 	// Check whether the row where the cursor lives needs to be scrolled.
 	// Update the drawing strategy if needed.
-	void checkCursorScrollOffset(PainterInfo & pi);
+	void checkCursorScrollOffset();
 
 	/// The minimal size of the document that is visible. Used
 	/// when it is allowed to scroll below the document.