X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=11efee42987ed6c784e400b1d845fcdf60c51cde;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=234d86a8169461b16c4143eb9653c963d409dc1c;hpb=f1687373b1486e0f66b6545acae3b4384c195658;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 234d86a816..11efee4298 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,17 +15,13 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "CoordCache.h"
-#include "Cursor.h"
-#include "MetricsInfo.h"
-#include "TextMetrics.h"
+#include "Dimension.h"
 #include "update_flags.h"
 
+#include "support/strfwd.h"
 #include "support/types.h"
 
-#include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
-#include <boost/signal.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <utility>
 #include <string>
@@ -36,19 +32,23 @@ namespace lyx {
 namespace support { class FileName; }
 
 namespace frontend { class Painter; }
+namespace frontend { class GuiBufferViewDelegate; }
 
 class Buffer;
 class Change;
+class CoordCache;
+class Cursor;
 class DocIterator;
 class FuncRequest;
 class FuncStatus;
 class Intl;
-class Cursor;
-class Text;
+class Inset;
 class ParIterator;
 class ParagraphMetrics;
+class Text;
+class TextMetrics;
 class ViewMetricsInfo;
- 
+
 enum CursorStatus {
 	CUR_INSIDE,
 	CUR_ABOVE,
@@ -89,7 +89,7 @@ class BufferView : boost::noncopyable {
 public:
 	///
 	BufferView(Buffer & buffer);
-
+	///
 	~BufferView();
 
 	/// return the buffer being viewed.
@@ -102,7 +102,7 @@ public:
 	 * \c Update::Force means to force an update in any case.
 	 * \retval true if a screen redraw is needed
 	 */
-	bool update(Update::flags flags = Update::FitCursor | Update::Force);
+	void processUpdateFlags(Update::flags flags);
 
 	/// move the screen to fit the cursor.
 	/// Only to be called with good y coordinates (after a bv::metrics)
@@ -171,8 +171,7 @@ public:
 
 	/// dispatch method helper for \c WorkArea
 	/// \sa WorkArea
-	/// \retval true if a redraw is needed
-	bool workAreaDispatch(FuncRequest const & ev);
+	void mouseEventDispatch(FuncRequest const & ev);
 
 	/// access to anchor.
 	pit_type anchor_ref() const;
@@ -191,7 +190,7 @@ public:
 	bool checkDepm(Cursor & cur, Cursor & old);
 	/// sets cursor.
 	/// This is used when handling LFUN_MOUSE_PRESS.
-	bool mouseSetCursor(Cursor & cur);
+	bool mouseSetCursor(Cursor & cur, bool select = false);
 
 	/// sets the selection.
 	/* When \c backwards == false, set anchor
@@ -218,41 +217,53 @@ public:
 	ParagraphMetrics const & parMetrics(Text const *, pit_type) const;
 
 	///
-	CoordCache & coordCache() { return coord_cache_; }
+	CoordCache & coordCache();
 	///
-	CoordCache const & coordCache() const { return coord_cache_; }
+	CoordCache const & coordCache() const;
+
+	///
+	Point getPos(DocIterator const & dit, bool boundary) const;
+
 
 	///
 	void draw(frontend::Painter & pain);
 
 	/// get this view's keyboard map handler.
-	Intl & getIntl() { return *intl_.get(); }
+	Intl & getIntl();
 	///
-	Intl const & getIntl() const { return *intl_.get(); }
+	Intl const & getIntl() const;
 
+	//
+	// Messages to the GUI
+	//
 	/// This signal is emitted when some message shows up.
-	boost::signal<void(docstring)> message;
+	void message(docstring const & msg);
 
 	/// This signal is emitted when some dialog needs to be shown.
-	boost::signal<void(std::string name)> showDialog;
+	void showDialog(std::string const & name);
 
 	/// This signal is emitted when some dialog needs to be shown with
 	/// some data.
-	boost::signal<void(std::string name,
-		std::string data)> showDialogWithData;
+	void showDialogWithData(std::string const & name, std::string const & data);
 
 	/// This signal is emitted when some inset dialogs needs to be shown.
-	boost::signal<void(std::string name, std::string data,
-		Inset * inset)> showInsetDialog;
+	void showInsetDialog(std::string const & name, std::string const & data,
+		Inset * inset);
 
 	/// This signal is emitted when some dialogs needs to be updated.
-	boost::signal<void(std::string name,
-		std::string data)> updateDialog;
+	void updateDialog(std::string const & name, std::string const & data);
 
-	/// This signal is emitted when the layout at the cursor is changed.
-	boost::signal<void(docstring layout)> layoutChanged;
+	///
+	void setGuiDelegate(frontend::GuiBufferViewDelegate *);
+
+	///
+	docstring contentsOfPlaintextFile(std::string const & f, bool asParagraph);
+	// Insert plain text file (if filename is empty, prompt for one)
+	void insertPlaintextFile(std::string const & fileName, bool asParagraph);
 
 private:
+	// the position relative to (0, baseline) of outermost paragraph
+	Point coordOffset(DocIterator const & dit, bool boundary) const;
 	/// Update current paragraph metrics.
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
@@ -272,48 +283,15 @@ private:
 	///
 	int height_;
 	///
-	ScrollbarParameters scrollbarParameters_;
-
-	///
-	ViewMetricsInfo metrics_info_;
-	///
-	CoordCache coord_cache_;
-	///
 	Buffer & buffer_;
 
-	/// Estimated average par height for scrollbar.
-	int wh_;
 	///
 	void menuInsertLyXFile(std::string const & filen);
 
-	/// this is used to handle XSelection events in the right manner.
-	struct {
-		CursorSlice cursor;
-		CursorSlice anchor;
-		bool set;
-	} xsel_cache_;
-	///
-	Cursor cursor_;
-	///
-	bool multiparsel_cache_;
-	///
-	pit_type anchor_ref_;
-	///
-	int offset_ref_;
-	///
 	void updateOffsetRef();
-	///
-	bool need_centering_;
-
-	/// keyboard mapping object.
-	boost::scoped_ptr<Intl> const intl_;
-
-	/// last visited inset (kept to send setMouseHover(false) )
-	Inset * last_inset_;
 
-	/// A map from a Text to the associated text metrics
-	typedef std::map<Text const *, TextMetrics> TextMetricsCache;
-	mutable TextMetricsCache text_metrics_;
+	struct Private;
+	Private * const d;
 };
 
 /// some space for drawing the 'nested' markers (in pixel)