X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBufferView.h;h=a58d25172711e33e2101e6422eaf513222a70fdb;hb=1a48d5a96712c72879487542e3f1a7e61ce3f78c;hp=9cbb3cf60a4b84b90317c0417093bde01beb4409;hpb=16a82d6f971bd64395aaaca24004d82fe9b46c6f;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 9cbb3cf60a..a58d251727 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,8 +15,10 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "DocumentClassPtr.h"
 #include "update_flags.h"
 
+#include "support/shared_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -31,6 +33,7 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class DispatchResult;
 class DocIterator;
 class DocumentClass;
 class FuncRequest;
@@ -123,7 +126,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
@@ -158,14 +161,13 @@ 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.
 	/// \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.
@@ -173,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();
 
@@ -188,9 +190,11 @@ 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
+	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.
@@ -199,8 +203,7 @@ public:
 	/// \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.
@@ -244,6 +247,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();
 
@@ -259,7 +265,7 @@ 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
@@ -304,14 +310,24 @@ 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;
+	///
+	void makeDocumentClass();
 
 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();
@@ -328,8 +344,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 updateLayout(DocumentClass const * const oldlayout);
+	void updateDocumentClass(DocumentClassConstPtr olddc);
 	///
 	int width_;
 	///