X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=b55cf924e27bcc0e73c52ba1ef0e44f893a0da0e;hb=e7ef29fa2d516b8593aa3cccb6548de5686e8a9a;hp=6599d6c6e7bcbb837b566f035bccdda3ed7508f8;hpb=35b6b4c8d0f76e5f8b57da0ef0d10249b4408c81;p=lyx.git

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 6599d6c6e7..b55cf924e2 100644
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -18,65 +18,64 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include "errorlist.h"
 #include "BufferView.h"
+#include "cursor.h"
+#include "errorlist.h"
 
 #include "insets/inset.h"
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
 #include "frontends/Timeout.h"
 
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
 class Change;
+class LyXKeySym;
 class LyXView;
 class WorkArea;
 class LyXScreen;
 class FuncRequest;
+class FuncStatus;
+class ViewMetricsInfo;
+
 
 ///
-struct BufferView::Pimpl : public boost::signals::trackable {
+class BufferView::Pimpl : public boost::signals::trackable {
+public:
 	///
-	Pimpl(BufferView * i, LyXView * o,
-	      int xpos, int ypos, int width, int height);
+	Pimpl(BufferView & bv, LyXView * owner, int width, int height);
 	///
 	Painter & painter() const;
 	/// return the screen for this bview
 	LyXScreen & screen() const;
 	///
-	void buffer(Buffer *);
-	/// Return true if the cursor was fitted.
-	bool fitCursor();
-	///
-	void redoCurrentBuffer();
+	void setBuffer(Buffer * buf);
 	///
 	void resizeCurrentBuffer();
+	//
+	bool fitCursor();
 	///
-	void update();
-	/**
-	 * Repaint pixmap. Used for when we've made a visible
-	 * change but don't need the full update() logic
-	 */
+	void update(Update::flags flags = Update::Force);
 	///
-	bool newFile(string const &, string const &, bool);
+	void newFile(std::string const &, std::string const &, bool);
 	///
-	bool loadLyXFile(string const &, bool);
+	bool loadLyXFile(std::string const &, bool);
 	///
 	void workAreaResize();
 	///
 	void updateScrollbar();
 	///
 	void scrollDocView(int value);
-	/**
-	 * Wheel mouse scroll, move by multiples of text->defaultRowHeight().
-	 */
+	/// Wheel mouse scroll, move by multiples of text->defaultRowHeight().
 	void scroll(int lines);
 	///
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+	///
 	void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
 	///
 	void selectionRequested();
@@ -89,8 +88,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	/// get the change at the cursor position
 	Change const getCurrentChange();
 	///
-	void beforeChange(LyXText *);
-	///
 	void savePosition(unsigned int i);
 	///
 	void restorePosition(unsigned int i);
@@ -99,24 +96,14 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	///
 	void switchKeyMap();
 	///
-	void insetUnlock();
-	///
 	void center();
-	///
-	bool insertInset(InsetOld * inset, string const & lout = string());
-	///
-	void updateInset(InsetOld const * inset);
 	/// a function should be executed from the workarea
 	bool workAreaDispatch(FuncRequest const & ev);
+	/// return true for events that will handle
+	FuncStatus getStatus(FuncRequest const & cmd);
 	/// a function should be executed
 	bool dispatch(FuncRequest const & ev);
-	///
-	int top_y() const;
-	///
-	void top_y(int y);
 private:
-	/// the y coordinate of the top of the screen
-	int top_y_;
 	/// An error list (replaces the error insets)
 	ErrorList errorlist_;
 	/// add an error to the list
@@ -144,13 +131,6 @@ private:
 	/// notify readonly status
 	void showReadonly(bool);
 
-	/**
-	 * Change all insets with the given code's contents to a new
-	 * string. May only be used with InsetCommand-derived insets
-	 * Returns true if a screen update is needed.
-	 */
-	bool ChangeInsets(InsetOld::Code code, string const & from,
-			  string const & to);
 
 	///
 	friend class BufferView;
@@ -165,16 +145,19 @@ private:
 	boost::scoped_ptr<LyXScreen> screen_;
 	///
 	boost::scoped_ptr<WorkArea> workarea_;
+	/// Estimated average par height for scrollbar
+	int wh_;
 	///
 	Timeout cursor_timeout;
 	///
-	void stuffClipboard(string const &) const;
+	void stuffClipboard(std::string const &) const;
 	///
 	bool using_xterm_cursor;
 	///
-	struct Position {
+	class Position {
+	public:
 		/// Filename
-		string filename;
+		std::string filename;
 		/// Cursor paragraph Id
 		int par_id;
 		/// Cursor position
@@ -182,16 +165,31 @@ private:
 		///
 		Position() : par_id(0), par_pos(0) {}
 		///
-		Position(string const & f, int id, lyx::pos_type pos)
+		Position(std::string const & f, int id, lyx::pos_type pos)
 			: filename(f), par_id(id), par_pos(pos) {}
 	};
 	///
 	std::vector<Position> saved_positions;
-	/// Get next inset of this class from current cursor position
-	InsetOld * getInsetByCode(InsetOld::Code code);
 	///
-	void MenuInsertLyXFile(string const & filen);
+	void MenuInsertLyXFile(std::string const & filen);
 	/// our workarea
 	WorkArea & workarea() const;
+	/// this is used to handle XSelection events in the right manner
+	struct {
+		CursorSlice cursor;
+		CursorSlice anchor;
+		bool set;
+	} xsel_cache_;
+	///
+	LCursor cursor_;
+	///
+	///
+	lyx::pit_type anchor_ref_;
+	///
+	int offset_ref_;
+	///
+	ViewMetricsInfo metrics(bool singlepar = false);
+
+
 };
 #endif // BUFFERVIEW_PIMPL_H