X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=f1234753cf994ca39185ffb3adf664ef7614f5e4;hb=31b56dac8042735f75229ad480b3e98531c181ff;hp=e0a33d4aa415f5c2acb2b324fd53f0894dd3803f;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index e0a33d4aa4..f1234753cf 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -3,10 +3,13 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
+#include <boost/smart_ptr.hpp>
+
 #include "BufferView.h"
 #include "UpdateInset.h"
-#include "BackStack.h"
-#include "Timeout.h"
+#include "commandtags.h"
+#include "frontends/Timeout.h"
+#include "WorkArea.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -16,12 +19,8 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Object;
-#endif
-
 ///
-struct BufferView::Pimpl : public Object {
+struct BufferView::Pimpl : public SigC::Object {
 	///
 	Pimpl(BufferView * i, LyXView * o,
 	      int xpos, int ypos, int width, int height);
@@ -36,7 +35,7 @@ struct BufferView::Pimpl : public Object {
 	///
 	void redraw();
 	/// Return true if the cursor was fitted.
-	bool fitCursor();
+	bool fitCursor(LyXText *);
 	///
 	void redoCurrentBuffer();
 	///
@@ -44,9 +43,7 @@ struct BufferView::Pimpl : public Object {
 	///
 	void update();
 	//
-	void update(BufferView::UpdateCodes);
-	///
-	void gotoError();
+	void update(LyXText *, BufferView::UpdateCodes);
   	/// Update pixmap of screen
 	void updateScreen();
 	///
@@ -81,19 +78,19 @@ struct BufferView::Pimpl : public Object {
 	///
 	void cursorToggle();
 	///
-	void cursorPrevious();
+	void cursorPrevious(LyXText *);
 	///
-	void cursorNext();
+	void cursorNext(LyXText *);
 	///
 	bool available() const;
 	///
-	void beforeChange();
+	void beforeChange(LyXText *);
 	///
-	void savePosition();
+	void savePosition(unsigned int i);
 	///
-	void restorePosition();
+	void restorePosition(unsigned int i);
 	///
-	bool NoSavedPositions();
+	bool isSavedPosition(unsigned int i);
 	///
 	void setState();
 	///
@@ -121,33 +118,82 @@ struct BufferView::Pimpl : public Object {
 	///
 	void center();
 	///
+	bool insertInset(Inset * inset, string const & lout = string());
+	///
+	void updateInset(Inset * inset, bool mark_dirty);
+	///
+	bool Dispatch(kb_action action, string const & argument);
+private:
+	///
+	friend class BufferView;
+	/// open and lock an updatable inset
+	bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
+	///
+	void protectedBlank(LyXText * lt);
+	///
+	void newline();
+	///
+	void hfill();
+	///
+	void menuSeparator();
+	///
+	void endOfSentenceDot();
+	///
+	void ldots();
+	///
+	void hyphenationPoint();
+	///
+	void insertNote();
+	///
+	void gotoInset(std::vector<Inset::Code> const & codes,
+		       bool same_content);
+	///
+	void gotoInset(Inset::Code codes, bool same_content);
+	///
 	BufferView * bv_;
 	///
 	LyXView * owner_;
 	///
 	Buffer * buffer_;
 	///
-	LyXScreen * screen_;
+	boost::scoped_ptr<LyXScreen> screen_;
 	///
 	long current_scrollbar_value;
 	///
-	FL_OBJECT * figinset_canvas;
-	///
 	Timeout cursor_timeout;
-        ///
-        BackStack backstack;
-	///
-	int last_click_x, last_click_y;
 	///
-	WorkArea * workarea_;
+	WorkArea workarea_;
 	///
 	UpdateInset updatelist;
 	///
 	void pasteClipboard(bool asPara);
 	///
 	void stuffClipboard(string const &) const;
-private:
 	///
 	bool using_xterm_cursor;
+	///
+	struct Position {
+		/// Filename
+                string filename;
+                /// Cursor paragraph Id
+                int par_id;
+                /// Cursor position
+                LyXParagraph::size_type par_pos;
+		///
+		Position() : par_id(0), par_pos(0) {}
+		///
+		Position(string const & f, int id, LyXParagraph::size_type pos)
+                        : filename(f), par_id(id), par_pos(pos) {}
+	};
+	///
+	std::vector<Position> saved_positions;
+	///
+	void moveCursorUpdate(bool selecting);
+        /// Get next inset of this class from current cursor position  
+	Inset * getInsetByCode(Inset::Code code);
+	///
+	void MenuInsertLyXFile(string const & filen);
+	///
+	bool inset_slept;
 };
 #endif