X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=5b277c4edc8e7dab79584040e114f90cfb3ecdc7;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=b3916108268e099a461c7d1fe3133c38676ef7b4;hpb=2a1b0968cbf2cb34878729c529a4e32fa31ec8ca;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index b391610826..5b277c4edc 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -5,9 +5,9 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alfredo Braustein
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -32,6 +32,7 @@ class Change;
 class CoordCache;
 class Cursor;
 class DocIterator;
+class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class Intl;
@@ -144,22 +145,33 @@ public:
 	/// set the cursor based on the given TeX source row.
 	void setCursorFromRow(int row);
 
+	/// set cursor to the given inset. Return true if found.
+	bool setCursorFromInset(Inset const *);
+	/// Recenters the BufferView such that the passed cursor
+	/// is in the center.
+	void recenter();
 	/// Ensure that the BufferView cursor is visible.
 	/// This method will automatically scroll and update the BufferView
 	/// if needed.
-	void showCursor();
+	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);
+	/// \param recenter Whether the cursor should be centered on screen
+	void showCursor(DocIterator const & dit, bool recenter = false);
+	/// 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.
-	void scrollDown(int pixels);
+	int scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
-	void scrollUp(int pixels);
+	int scrollUp(int pixels);
 	/// scroll document by the given number of pixels.
-	void scroll(int pixels);
+	int scroll(int pixels);
 	/// Scroll the view by a number of pixels.
 	void scrollDocView(int pixels);
 	/// Set the cursor position based on the scrollbar one.
@@ -184,8 +196,8 @@ 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);
@@ -248,6 +260,12 @@ public:
 
 	///
 	Point getPos(DocIterator const & dit, bool boundary) 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;
 
 
 	///
@@ -284,6 +302,12 @@ public:
 	void insertPlaintextFile(support::FileName const & f, bool asParagraph);
 	///
 	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);
 
 private:
 	/// noncopyable
@@ -296,6 +320,10 @@ private:
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
 
+	/// The minimal size of the document that is visible. Used
+	/// when it is allowed to scroll below the document.
+	int minVisiblePart();
+
 	/// Search recursively for the the innermost inset that covers (x, y) position.
 	/// \retval 0 if no inset is found.
 	Inset const * getCoveringInset(
@@ -304,6 +332,8 @@ private:
 		int y  //< y-coordinate on screen
 		) const;
 
+	///
+	void updateLayout(DocumentClass const * const oldlayout);
 	///
 	int width_;
 	///