X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=ab5ba600289d11e65433fdaa4dc1bf83e8822321;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=4a020eb3b21a2c3aa9be3240ba073e791fbdc526;hpb=2a594d3e90a673c56df9766658a79cf0bcaeb9a8;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 4a020eb3b2..ab5ba60028 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,6 +15,7 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "CoordCache.h"
 #include "DocumentClassPtr.h"
 #include "TexRow.h"
 #include "update_flags.h"
@@ -26,12 +27,12 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+namespace frontend { struct CaretGeometry; }
 namespace frontend { class Painter; }
 namespace frontend { class GuiBufferViewDelegate; }
 
 class Buffer;
 class Change;
-class CoordCache;
 class Cursor;
 class CursorSlice;
 class Dimension;
@@ -41,12 +42,12 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class InsetMathNest;
 class Length;
 class MathData;
 class MathRow;
 class ParagraphMetrics;
 class Point;
-class TexRow;
 class Text;
 class TextMetrics;
 
@@ -109,6 +110,9 @@ public:
 	/// bottom margin
 	int bottomMargin() const;
 
+	docstring const & searchRequestCache() const;
+	void setSearchRequestCache(docstring const & text);
+
 	/// return the on-screen size of this length
 	/*
 	 *  This is a wrapper around Length::inPixels that uses the
@@ -157,6 +161,9 @@ public:
 	docstring toolTip(int x, int y) const;
 	/// \return the context menu for the given position.
 	std::string contextMenu(int x, int y) const;
+	/// \return the math inset with a context menu for the given position
+	Inset const * mathContextMenu(InsetMathNest const * inset,
+		CoordCache::Insets const & inset_cache, int x, int y) const;
 
 	/// Save the current position as bookmark.
 	/// if idx == 0, save to temp_bookmark
@@ -219,7 +226,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
@@ -312,6 +319,10 @@ public:
 	bool caretInView() const;
 	/// get the position and height of the caret
 	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);