X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=765267b421b0aaa68a9ea3b33ad8f8a926d85a15;hb=1b56057e1f739551f2c410a4b0b3941246123531;hp=b553f26f8365be7141154726ca5aa67b1f8857c7;hpb=f84080f01c46ece104796746e9e914d205c286cd;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index b553f26f83..765267b421 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -36,12 +36,12 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class Menu;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
 class Text;
 class TextMetrics;
-class ViewMetricsInfo;
 
 enum CursorStatus {
 	CUR_INSIDE,
@@ -105,6 +105,10 @@ public:
 	void updateScrollbar();
 	/// return the Scrollbar Parameters.
 	ScrollbarParameters const & scrollbarParameters() const;
+	/// \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;
 
 	/// Save the current position as bookmark.
 	/// if idx == 0, save to temp_bookmark
@@ -126,8 +130,12 @@ public:
 	/// set the cursor based on the given TeX source row.
 	void setCursorFromRow(int row);
 
-	/// center the document view around the cursor.
-	void center();
+	/// Ensure the cursor is visible.
+	/// This method will automatically scroll and update the BufferView and updated 
+	/// if needed.
+	void showCursor();
+	/// LFUN_SCROLL Helper.
+	void lfunScroll(FuncRequest const & cmd);
 	/// scroll down document by the given number of pixels.
 	void scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
@@ -144,14 +152,15 @@ public:
 	/// return the pixel height of the document view.
 	int workHeight() const;
 
+
 	/// 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);
 	/// execute the given function.
-	/// \return the Update::flags for further metrics update.
-	Update::flags dispatch(FuncRequest const & argument);
+	/// \return true if the function has been processed.
+	bool dispatch(FuncRequest const & argument);
 
 	/// request an X11 selection.
 	/// \return the selected string.
@@ -195,11 +204,6 @@ public:
 	void putSelectionAt(DocIterator const & cur,
 		int length, bool backwards);
 
-	/// return the internal \c ViewMetricsInfo.
-	/// This is used specifically by the \c Workrea.
-	/// \sa WorkArea
-	/// \sa ViewMetricsInfo
-	ViewMetricsInfo const & viewMetricsInfo();
 	/// update the internal \c ViewMetricsInfo.
 	void updateMetrics();
 
@@ -237,11 +241,8 @@ public:
 
 	/// This signal is emitted when some dialog needs to be shown with
 	/// some data.
-	void showDialogWithData(std::string const & name, std::string const & data);
-
-	/// This signal is emitted when some inset dialogs needs to be shown.
-	void showInsetDialog(std::string const & name, std::string const & data,
-		Inset * inset);
+	void showDialog(std::string const & name, std::string const & data,
+		Inset * inset = 0);
 
 	/// This signal is emitted when some dialogs needs to be updated.
 	void updateDialog(std::string const & name, std::string const & data);
@@ -250,9 +251,11 @@ public:
 	void setGuiDelegate(frontend::GuiBufferViewDelegate *);
 
 	///
-	docstring contentsOfPlaintextFile(std::string const & f, bool asParagraph);
+	docstring contentsOfPlaintextFile(support::FileName const & f);
 	// Insert plain text file (if filename is empty, prompt for one)
-	void insertPlaintextFile(std::string const & fileName, bool asParagraph);
+	void insertPlaintextFile(support::FileName const & f, bool asParagraph);
+	///
+	void insertLyXFile(support::FileName const & f);
 
 private:
 	/// noncopyable
@@ -264,8 +267,6 @@ private:
 	/// Update current paragraph metrics.
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
-	///
-	bool multiParSel();
 
 	/// Search recursively for the the innermost inset that covers (x, y) position.
 	/// \retval 0 if no inset is found.
@@ -273,7 +274,7 @@ private:
 		Text const & text, //< The Text where we start searching.
 		int x, //< x-coordinate on screen
 		int y  //< y-coordinate on screen
-		);
+		) const;
 
 	///
 	int width_;
@@ -282,11 +283,6 @@ private:
 	///
 	Buffer & buffer_;
 
-	///
-	void menuInsertLyXFile(std::string const & filen);
-
-	void updateOffsetRef();
-
 	struct Private;
 	Private * const d;
 };