X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBufferView_pimpl.h;h=27c4961b068da93bc4bdf15233140c4e73bb298d;hb=6774c17368a3474f11c1e011cf1ce482e42f4867;hp=4358e20197396ac012b83a2343ebbfd79b25605d;hpb=b51e368b2b3e3ddd29b3dbcdb9b07a1d911188fb;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 4358e20197..27c4961b06 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -3,10 +3,16 @@
 #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"
+#include "box.h"
+#include "insets/insetspecialchar.h"
+#include "support/types.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -16,11 +22,9 @@ 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);
 	///
@@ -41,10 +45,8 @@ struct BufferView::Pimpl : public Object {
 	int resizeCurrentBuffer();
 	///
 	void update();
-	///
-	void update(BufferView::UpdateCodes);
-	///
-	void gotoError();
+	//
+	void update(LyXText *, BufferView::UpdateCodes);
   	/// Update pixmap of screen
 	void updateScreen();
 	///
@@ -53,13 +55,19 @@ struct BufferView::Pimpl : public Object {
 	void updateScrollbar();
 	///
 	void scrollCB(double value);
-	///
-	Inset * checkInsetHit(LyXText *, int & x, int & y, unsigned int button);
+	/**
+	 * Returns an inset if inset was hit, or 0 if not.
+	 *
+	 * If hit, the coordinates are changed relative to the inset.
+	 */
+	Inset * checkInsetHit(LyXText *, int & x, int & y);
 	/// 
 	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);
@@ -76,19 +84,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();
 	///
@@ -116,32 +124,89 @@ 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:
+	/**
+	 * Return the on-screen dimensions of the inset at the cursor.
+	 * Pre-condition: the cursor must be at an inset.
+	 */
+	Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const;
+	/**
+	 * check if the given co-ordinates are inside an inset at the given cursor,
+	 * if one exists. If so, the inset is returned, and the co-ordinates are
+	 * made relative. Otherwise, 0 is returned.
+	 */
+	Inset * checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const; 
+	///
+	friend class BufferView;
+	/// open and lock an updatable inset
+	bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
+	///
+	void protectedBlank(LyXText * lt);
+	/// 
+	void specialChar(InsetSpecialChar::Kind);
+	///
+	void newline();
+	///
+	void hfill();
+	///
+	void smartQuote();
+	///
+	void insertAndEditInset(Inset *);
+	///
+	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
+		lyx::pos_type par_pos;
+		///
+		Position() : par_id(0), par_pos(0) {}
+		///
+		Position(string const & f, int id, lyx::pos_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