X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=31b6e94fc484d70f451592857780e07cabc7c6b9;hb=12faf2b161e9d8ee0c62bfa421e1988ee80c44c0;hp=f424d433db4d0823601bf48088e991d18e3bcb26;hpb=e52af5f89722d69fc63b829d9d9623ab56e6c5e1;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index f424d433db..31b6e94fc4 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,6 +15,7 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "DocumentClassPtr.h"
 #include "update_flags.h"
 
 #include "support/strfwd.h"
@@ -31,6 +32,7 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class CursorSlice;
 class DispatchResult;
 class DocIterator;
 class DocumentClass;
@@ -38,9 +40,11 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
+class TexRow;
 class Text;
 class TextMetrics;
 
@@ -114,9 +118,20 @@ 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;
+
+	// 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;
+
 	/// reset the scrollbar to reflect current view position.
 	void updateScrollbar();
 	/// return the Scrollbar Parameters.
@@ -124,7 +139,7 @@ public:
 	/// \return Tool tip for the given position.
 	docstring toolTip(int x, int y) const;
 	/// \return the context menu for the given position.
-	docstring contextMenu(int x, int y) const;
+	std::string contextMenu(int x, int y) const;
 
 	/// Save the current position as bookmark.
 	/// if idx == 0, save to temp_bookmark
@@ -145,6 +160,8 @@ public:
 
 	/// set the cursor based on the given TeX source row.
 	void setCursorFromRow(int row);
+	///
+	void setCursorFromRow(int row, TexRow const & texrow);
 
 	/// set cursor to the given inset. Return true if found.
 	bool setCursorFromInset(Inset const *);
@@ -153,11 +170,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 +183,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.
@@ -194,7 +209,7 @@ public:
 	void resetInlineCompletionPos();
 	/// set the inline completion postfix and its position in the buffer.
 	/// Updates the updateFlags in \c cur.
-	void setInlineCompletion(Cursor & cur, DocIterator const & pos,
+	void setInlineCompletion(Cursor const & cur, DocIterator const & pos,
 		docstring const & completion, size_t uniqueChars = 0);
 
 	/// translate and insert a character, using the correct keymap.
@@ -247,6 +262,9 @@ public:
 	void putSelectionAt(DocIterator const & cur,
 		int length, bool backwards);
 
+	/// selects the item at cursor if its paragraph is empty.
+	bool selectIfEmpty(DocIterator & cur);
+
 	/// update the internal \c ViewMetricsInfo.
 	void updateMetrics();
 
@@ -315,6 +333,8 @@ public:
 	void clearLastInset(Inset * inset) const;
 	/// Is the mouse hovering a clickable inset or element?
 	bool clickableInset() const;
+	///
+	void makeDocumentClass();
 
 private:
 	/// noncopyable
@@ -327,11 +347,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.
@@ -344,7 +371,7 @@ private:
 	void updateHoveredInset() const;
 
 	///
-	void updateDocumentClass(DocumentClass const * const olddc);
+	void updateDocumentClass(DocumentClassConstPtr olddc);
 	///
 	int width_;
 	///