X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=c2ae8811d9d902a02ed6e6131b4c5b64c525809c;hb=a5b01f8f96efc95633a8da1cf4748aa473a89f1a;hp=0105275eae1713218550af1e1aace7e7c08ef470;hpb=7ad28349ab345b93330c800132891837498cc4b0;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 0105275eae..c2ae8811d9 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -31,7 +31,9 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class DispatchResult;
 class DocIterator;
+class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class Intl;
@@ -157,7 +159,8 @@ public:
 	/// This method will automatically scroll and update the BufferView
 	/// if needed.
 	/// \param recenter Whether the cursor should be centered on screen
-	void showCursor(DocIterator const & dit, bool recenter = false);
+	void showCursor(DocIterator const & dit, bool recenter,
+		bool update);
 	/// Scroll to the cursor.
 	void scrollToCursor();
 	/// Scroll to the cursor.
@@ -172,7 +175,7 @@ public:
 	/// scroll document by the given number of pixels.
 	int scroll(int pixels);
 	/// Scroll the view by a number of pixels.
-	void scrollDocView(int pixels);
+	void scrollDocView(int pixels, bool update);
 	/// Set the cursor position based on the scrollbar one.
 	void setCursorFromScrollbar();
 
@@ -187,6 +190,8 @@ public:
 	size_t const & inlineCompletionUniqueChars() const;
 	/// return the position in the buffer of the inline completion postfix.
 	DocIterator const & inlineCompletionPos() const;
+	/// make sure inline completion position is OK
+	bool fixInlineCompletionPos();
 	/// set the inline completion postfix and its position in the buffer.
 	/// Updates the updateFlags in \c cur.
 	void setInlineCompletion(Cursor & cur, DocIterator const & pos,
@@ -195,11 +200,10 @@ public:
 	/// translate and insert a character, using the correct keymap.
 	void translateAndInsert(char_type c, Text * t, Cursor & cur);
 
-	/// return true for events that will handle.
-	FuncStatus getStatus(FuncRequest const & cmd);
+	/// \return true if we've made a decision
+	bool getStatus(FuncRequest const & cmd, FuncStatus & flag);
 	/// execute the given function.
-	/// \return true if the function has been processed.
-	bool dispatch(FuncRequest const & argument);
+	void dispatch(FuncRequest const & cmd, DispatchResult & dr);
 
 	/// request an X11 selection.
 	/// \return the selected string.
@@ -258,9 +262,13 @@ public:
 	CoordCache const & coordCache() const;
 
 	///
-	Point getPos(DocIterator const & dit, bool boundary) const;
+	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;
+	/// get the position and height of the cursor
+	void cursorPosAndHeight(Point & p, int & h) const;
 
 
 	///
@@ -299,14 +307,22 @@ public:
 	void insertLyXFile(support::FileName const & f);
 	/// save temporary bookmark for jump back navigation
 	void bookmarkEditPosition();
+	/// Find and return the inset associated with given dialog name.
+	Inset * editedInset(std::string const & name) const;
+	/// Associate an inset associated with given dialog name.
+	void editInset(std::string const & name, Inset * inset);
+	///
+	void clearLastInset(Inset * inset) const;
+	/// Is the mouse hovering a clickable inset or element?
+	bool clickableInset() const;
 
 private:
 	/// noncopyable
 	BufferView(BufferView const &);
 	void operator=(BufferView const &);
 
-	// the position relative to (0, baseline) of outermost paragraph
-	Point coordOffset(DocIterator const & dit, bool boundary) const;
+	/// the position relative to (0, baseline) of outermost paragraph
+	Point coordOffset(DocIterator const & dit) const;
 	/// Update current paragraph metrics.
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
@@ -323,6 +339,12 @@ private:
 		int y  //< y-coordinate on screen
 		) const;
 
+	/// Update the hovering status of the insets. This is called when
+	/// either the screen is updated or when the buffer has scolled.
+	void updateHoveredInset() const;
+
+	///
+	void updateDocumentClass(DocumentClass const * const olddc);
 	///
 	int width_;
 	///