X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=588e9d0665133e4d0ccd1143915686e6099b1963;hb=2b927cbc2ee79f1d1f8a125f4d1a88162a1e5dfa;hp=31b6e94fc484d70f451592857780e07cabc7c6b9;hpb=1db691c2f501c07c38ffaa69cd1af18e1f77f4dc;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 31b6e94fc4..588e9d0665 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,6 +41,7 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class Length;
 class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
@@ -57,15 +59,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.
@@ -104,6 +106,14 @@ 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 true if the BufferView is at the top of the document.
 	bool isTopScreen() const;
 
@@ -125,12 +135,15 @@ public:
 	// 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;
 
-	// Points to the top-level row where the cursor lies (during draw).
-	CursorSlice const & currentRowSlice() const;
-
-	// Points to the top-level row where the cursor lied at last draw event.
-	CursorSlice const & lastRowSlice() 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();
@@ -159,9 +172,9 @@ public:
 	void gotoLabel(docstring const & label);
 
 	/// set the cursor based on the given TeX source row.
-	void setCursorFromRow(int row);
-	///
-	void setCursorFromRow(int row, TexRow const & texrow);
+	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 *);
@@ -244,8 +257,10 @@ 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);
 	/// Check deleteEmptyParagraphMechanism and update metrics if needed.
 	/// \retval true if an update was needed.
 	bool checkDepm(Cursor & cur, Cursor & old);