X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=1b76da27117c593e4fdad9bc029f5465883005d4;hb=33f9cfb7961501b38c573eede468b011687f46de;hp=520ecdb0d571b76b328a7e2c43996fd9125d79f4;hpb=2ed3b22a0674ced6a16a9d2d6be9655b988b95a0;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 520ecdb0d5..1b76da2711 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -26,6 +26,7 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+namespace frontend { struct CaretGeometry; }
 namespace frontend { class Painter; }
 namespace frontend { class GuiBufferViewDelegate; }
 
@@ -34,19 +35,18 @@ class Change;
 class CoordCache;
 class Cursor;
 class CursorSlice;
+class Dimension;
 class DispatchResult;
 class DocIterator;
-class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
 class Length;
-class ParIterator;
+class MathData;
+class MathRow;
 class ParagraphMetrics;
 class Point;
-class Row;
-class TexRow;
 class Text;
 class TextMetrics;
 
@@ -102,9 +102,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
 	/*
@@ -216,7 +219,7 @@ public:
 	/// return the inline completion postfix.
 	docstring const & inlineCompletion() const;
 	/// return the number of unique characters in the inline completion.
-	size_t const & inlineCompletionUniqueChars() const;
+	size_t inlineCompletionUniqueChars() const;
 	/// return the position in the buffer of the inline completion postfix.
 	DocIterator const & inlineCompletionPos() const;
 	/// make sure inline completion position is OK
@@ -236,7 +239,7 @@ public:
 
 	/// request an X11 selection.
 	/// \return the selected string.
-	docstring const requestSelection();
+	docstring requestSelection();
 	/// clear the X11 selection.
 	void clearSelection();
 
@@ -296,16 +299,23 @@ 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;
-	/// set the ascent and descent of the caret
-	void setCaretAscentDescent(int asc, int des);
+	/// 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 caretPosAndDim(Point & p, Dimension & dim) const;
+	/// compute the shape of the caret
+	void buildCaretGeometry(bool complet);
+	/// the shape of the caret
+	frontend::CaretGeometry const & caretGeometry() const;
 
 	///
 	void draw(frontend::Painter & pain, bool paint_caret);
@@ -327,7 +337,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);