X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=ee2de8276e3a597c258d14ea65d8de435068b6ea;hb=a53847964dc44d15f7c83cc65dbc16fef88d54c9;hp=f24af0d21ed5cdf0b465173377f572d5592822cc;hpb=8c69aca339dd3fde674ed6a91034d9115d9710ad;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index f24af0d21e..ee2de8276e 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,6 +15,8 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "DocumentClassPtr.h"
+#include "TexRow.h"
 #include "update_flags.h"
 
 #include "support/strfwd.h"
@@ -31,6 +33,7 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class CursorSlice;
 class DispatchResult;
 class DocIterator;
 class DocumentClass;
@@ -38,9 +41,11 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
+class TexRow;
 class Text;
 class TextMetrics;
 
@@ -53,15 +58,15 @@ enum CursorStatus {
 /// Scrollbar Parameters.
 struct ScrollbarParameters
 {
+	// These parameters are normalized against the screen geometry and pixel
+	// coordinates. Position 0 corresponds to the top the the screen.
 	ScrollbarParameters()
-		: min(0), max(0), position(0), single_step(1), page_step(1)
+		: min(0), max(0), single_step(1), page_step(1)
 	{}
 	/// Minimum scrollbar position in pixels.
 	int min;
 	/// Maximum scrollbar position in pixels.
 	int max;
-	/// Current position in the document in pixels.
-	int position;
 	/// Line-scroll amount in pixels.
 	int single_step;
 	/// Page-scroll amount in pixels.
@@ -114,9 +119,23 @@ public:
 	 */
 	void processUpdateFlags(Update::flags flags);
 
-	/// move the screen to fit the cursor.
+	/// return true if one shall move the screen to fit the cursor.
 	/// Only to be called with good y coordinates (after a bv::metrics)
-	bool fitCursor();
+	bool needsFitCursor() const;
+
+	// Returns the amount of horizontal scrolling applied to the
+	// top-level row where the cursor lies
+	int horizScrollOffset() const;
+	// Returns the amount of horizontal scrolling applied to the
+	// row of text starting at (pit, pos)
+	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.
@@ -144,7 +163,9 @@ public:
 	void gotoLabel(docstring const & label);
 
 	/// set the cursor based on the given TeX source row.
-	void setCursorFromRow(int row);
+	bool setCursorFromRow(int row);
+	/// set the cursor based on the given start and end TextEntries.
+	bool setCursorFromEntries(TexRow::TextEntry start, TexRow::TextEntry end);
 
 	/// set cursor to the given inset. Return true if found.
 	bool setCursorFromInset(Inset const *);
@@ -153,11 +174,11 @@ public:
 	void recenter();
 	/// Ensure that the BufferView cursor is visible.
 	/// This method will automatically scroll and update the BufferView
-	/// if needed.
-	void showCursor(); 
+	/// (metrics+drawing) if needed.
+	void showCursor();
 	/// Ensure the passed cursor \p dit is visible.
 	/// This method will automatically scroll and update the BufferView
-	/// if needed.
+	/// (metrics+drawing) if needed.
 	/// \param recenter Whether the cursor should be centered on screen
 	void showCursor(DocIterator const & dit, bool recenter,
 		bool update);
@@ -166,8 +187,6 @@ public:
 	/// Scroll to the cursor.
 	/// \param recenter Whether the cursor should be centered on screen
 	bool scrollToCursor(DocIterator const & dit, bool recenter);
-	/// LFUN_SCROLL Helper.
-	void lfunScroll(FuncRequest const & cmd);
 	/// scroll down document by the given number of pixels.
 	int scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
@@ -231,6 +250,8 @@ public:
 	/// sets cursor.
 	/// This will also open all relevant collapsable insets.
 	void setCursor(DocIterator const &);
+	/// set the selection up to dit.
+	void setCursorSelectionTo(DocIterator const & dit);
 	/// Check deleteEmptyParagraphMechanism and update metrics if needed.
 	/// \retval true if an update was needed.
 	bool checkDepm(Cursor & cur, Cursor & old);
@@ -318,6 +339,8 @@ public:
 	void clearLastInset(Inset * inset) const;
 	/// Is the mouse hovering a clickable inset or element?
 	bool clickableInset() const;
+	///
+	void makeDocumentClass();
 
 private:
 	/// noncopyable
@@ -330,11 +353,18 @@ private:
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
 
+	// 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);
+
 	/// The minimal size of the document that is visible. Used
 	/// when it is allowed to scroll below the document.
 	int minVisiblePart();
 
-	/// Search recursively for the the innermost inset that covers (x, y) position.
+	/// Search recursively for the innermost inset that covers (x, y) position.
 	/// \retval 0 if no inset is found.
 	Inset const * getCoveringInset(
 		Text const & text, //< The Text where we start searching.
@@ -347,7 +377,7 @@ private:
 	void updateHoveredInset() const;
 
 	///
-	void updateDocumentClass(DocumentClass const * const olddc);
+	void updateDocumentClass(DocumentClassConstPtr olddc);
 	///
 	int width_;
 	///