X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=a79c7bbb62e6b9da5c663fcb7bdfbdc8995362ab;hb=b2475f6625efbaacbd574d5b9a2402b4d20c4047;hp=9dfe5568cfbb08cf2862f8bb49720b477d746295;hpb=e660f440013fbba3437880324eaf794c41419018;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 9dfe5568cf..a79c7bbb62 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,
@@ -52,19 +52,16 @@ enum CursorStatus {
 /// Scrollbar Parameters.
 struct ScrollbarParameters
 {
-	void reset(int h = 0, int p = 0, int l = 0)
-	{
-		height = h;
-		position = p;
-		lineScrollHeight = l;
-	}
-
-	/// Total document height in pixels.
-	int height;
+	/// Minimum scrollbar position in pixels.
+	int min;
+	/// Maximum scrollbar position in pixels.
+	int max;
 	/// Current position in the document in pixels.
 	int position;
 	/// Line-scroll amount in pixels.
-	int lineScrollHeight;
+	int single_step;
+	/// Page-scroll amount in pixels.
+	int page_step;
 };
 
 /// Screen view of a Buffer.
@@ -82,7 +79,7 @@ struct ScrollbarParameters
 class BufferView {
 public:
 	///
-	BufferView(Buffer & buffer);
+	explicit BufferView(Buffer & buffer);
 	///
 	~BufferView();
 
@@ -90,6 +87,15 @@ public:
 	Buffer & buffer();
 	Buffer const & buffer() const;
 
+	///
+	void setFullScreen(bool full_screen) { full_screen_ = full_screen; }
+
+	/// right margin
+	int rightMargin() const;
+
+	/// left margin
+	int leftMargin() const;
+
 	/// perform pending metrics updates.
 	/** \c Update::FitCursor means first to do a FitCursor, and to
 	 * force an update if screen position changes.
@@ -105,6 +111,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 +136,16 @@ 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 that the BufferView cursor is visible.
+	/// This method will automatically scroll and update the BufferView
+	/// if needed.
+	void showCursor();
+	/// Ensure the passed cursor \p dit is visible.
+	/// This method will automatically scroll and update the BufferView
+	/// if needed.
+	void showCursor(DocIterator const & dit);
+	/// 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 +162,25 @@ public:
 	/// return the pixel height of the document view.
 	int workHeight() const;
 
+	/// return the inline completion postfix.
+	docstring const & inlineCompletion() const;
+	/// return the number of unique characters in the inline completion.
+	size_t const & inlineCompletionUniqueChars() const;
+	/// return the position in the buffer of the inline completion postfix.
+	DocIterator const & inlineCompletionPos() const;
+	/// set the inline completion postfix and its position in the buffer.
+	/// Updates the updateFlags in \c cur.
+	void setInlineCompletion(Cursor & cur, DocIterator const & pos,
+		docstring const & completion, size_t uniqueChars = 0);
+
 	/// 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 +224,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 +261,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 +271,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
@@ -271,19 +294,16 @@ 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_;
 	///
 	int height_;
 	///
-	Buffer & buffer_;
-
+	bool full_screen_;
 	///
-	void menuInsertLyXFile(std::string const & filen);
-
-	void updateOffsetRef();
+	Buffer & buffer_;
 
 	struct Private;
 	Private * const d;
@@ -295,9 +315,6 @@ inline int nestMargin() { return 15; }
 /// margin for changebar
 inline int changebarMargin() { return 12; }
 
-/// right margin
-inline int rightMargin() { return 10; }
-
 } // namespace lyx
 
 #endif // BUFFERVIEW_H