X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=fbbd1e7f2645440eac78fe2158ea3c74ae9b762c;hb=294e4884ee29585d311177406cd31499e6d81877;hp=c0f0b9006388b511e883d4196d17052598a807bc;hpb=e7fdce0b5a8dd2bd1b7dea548248cb8cc815c338;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index c0f0b90063..fbbd1e7f26 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -42,7 +42,8 @@ class FuncStatus;
 class Intl;
 class Inset;
 class Length;
-class PainterInfo;
+class MathData;
+class MathRow;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
@@ -103,9 +104,12 @@ public:
 
 	/// right margin
 	int rightMargin() const;
-
 	/// left margin
 	int leftMargin() const;
+	/// top margin
+	int topMargin() const;
+	/// bottom margin
+	int bottomMargin() const;
 
 	/// return the on-screen size of this length
 	/*
@@ -115,17 +119,23 @@ public:
 	 */
 	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);
 
@@ -133,9 +143,6 @@ public:
 	/// Only to be called with good y coordinates (after a bv::metrics)
 	bool needsFitCursor() const;
 
-	/// returns true if this row needs to be repainted (to erase caret)
-	bool needRepaint(Text const * text, Row const & row) const;
-
 	// Returns the amount of horizontal scrolling applied to the
 	// top-level row where the cursor lies
 	int horizScrollOffset() const;
@@ -144,11 +151,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.
@@ -239,7 +241,7 @@ public:
 
 	/// request an X11 selection.
 	/// \return the selected string.
-	docstring const requestSelection();
+	docstring requestSelection();
 	/// clear the X11 selection.
 	void clearSelection();
 
@@ -251,9 +253,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.
@@ -261,7 +260,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);
@@ -302,14 +301,19 @@ public:
 	///
 	CoordCache const & coordCache() const;
 
+	///
+	MathRow const & mathRow(MathData const * cell) const;
+	///
+	void setMathRow(MathData const * cell, MathRow const & mrow);
+
 	///
 	Point getPos(DocIterator const & dit) const;
 	/// is the paragraph of the cursor visible ?
 	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;
+	/// is the caret currently visible in the view
+	bool caretInView() const;
+	/// get the position and height of the caret
+	void caretPosAndHeight(Point & p, int & h) const;
 
 	///
 	void draw(frontend::Painter & pain, bool paint_caret);
@@ -331,7 +335,7 @@ public:
 	/// This signal is emitted when some dialog needs to be shown with
 	/// some data.
 	void showDialog(std::string const & name, std::string const & data,
-		Inset * inset = 0);
+		Inset * inset = nullptr);
 
 	/// This signal is emitted when some dialogs needs to be updated.
 	void updateDialog(std::string const & name, std::string const & data);
@@ -344,7 +348,7 @@ public:
 	// Insert plain text file (if filename is empty, prompt for one)
 	void insertPlaintextFile(support::FileName const & f, bool asParagraph);
 	///
-	void insertLyXFile(support::FileName const & f);
+	void insertLyXFile(support::FileName const & f, bool const ignorelang = false);
 	/// save temporary bookmark for jump back navigation
 	void bookmarkEditPosition();
 	/// Find and return the inset associated with given dialog name.
@@ -368,13 +372,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.