X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=136e8209df73550deea4cafecec9f12118cc61d1;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=5f855c2e613edef8bc192f41719d97fe9b05ab3c;hpb=7390104c74c57b5b464939a73da9e4f36f7ab441;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 5f855c2e61..136e8209df 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -5,8 +5,8 @@
 
 #include "BufferView.h"
 #include "UpdateInset.h"
-#include "BackStack.h"
-#include "Timeout.h"
+#include "commandtags.h"
+#include "frontends/Timeout.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -16,7 +16,13 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-struct BufferView::Pimpl {
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
+
+///
+struct BufferView::Pimpl : public Object {
+	///
 	Pimpl(BufferView * i, LyXView * o,
 	      int xpos, int ypos, int width, int height);
 	///
@@ -30,17 +36,15 @@ struct BufferView::Pimpl {
 	///
 	void redraw();
 	/// Return true if the cursor was fitted.
-	bool fitCursor();
+	bool fitCursor(LyXText *);
 	///
 	void redoCurrentBuffer();
 	///
 	int resizeCurrentBuffer();
 	///
 	void update();
-	///
-	void update(BufferView::UpdateCodes);
-	///
-	void gotoError();
+	//
+	void update(LyXText *, BufferView::UpdateCodes);
   	/// Update pixmap of screen
 	void updateScreen();
 	///
@@ -50,12 +54,15 @@ struct BufferView::Pimpl {
 	///
 	void scrollCB(double value);
 	///
-	Inset * checkInsetHit(int & x, int & y, unsigned int button);
+	Inset * checkInsetHit(LyXText *, int & x, int & y,
+			      unsigned int button);
 	/// 
 	int scrollUp(long time);
 	///
 	int scrollDown(long time);
 	///
+	void workAreaKeyPress(KeySym, unsigned int state);
+	///
 	void workAreaMotionNotify(int x, int y, unsigned int state);
 	///
 	void workAreaButtonPress(int x, int y, unsigned int button);
@@ -72,19 +79,19 @@ struct BufferView::Pimpl {
 	///
 	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();
 	///
@@ -112,6 +119,8 @@ struct BufferView::Pimpl {
 	///
 	void center();
 	///
+	bool Dispatch(kb_action action, string const & argument);
+	///
 	BufferView * bv_;
 	///
 	LyXView * owner_;
@@ -122,17 +131,13 @@ struct BufferView::Pimpl {
 	///
 	long current_scrollbar_value;
 	///
-	bool lyx_focus;
-	///
-	bool work_area_focus;
-	///
 	FL_OBJECT * figinset_canvas;
 	///
 	Timeout cursor_timeout;
         ///
-        BackStack backstack;
+	int last_click_x;
 	///
-	int last_click_x, last_click_y;
+	int last_click_y;
 	///
 	WorkArea * workarea_;
 	///
@@ -142,6 +147,27 @@ struct BufferView::Pimpl {
 	///
 	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);
 };
 #endif