Move private part of BufferView to a private implementation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20896 a592a061-630c-0410-9148-cb99ea01b6c8

src/BufferView.h

@@ -15,12 +15,10 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "CoordCache.h"
+#include "Dimension.h"
-#include "Cursor.h"
-#include "MetricsInfo.h"
-#include "TextMetrics.h"
 #include "update_flags.h"
 
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <boost/noncopyable.hpp>
@@ -38,14 +36,17 @@ namespace frontend { class GuiBufferViewDelegate; }
 
 class Buffer;
 class Change;
+class CoordCache;
+class Cursor;
 class DocIterator;
 class FuncRequest;
 class FuncStatus;
 class Intl;
-class Cursor;
+class Inset;
-class Text;
 class ParIterator;
 class ParagraphMetrics;
+class Text;
+class TextMetrics;
 class ViewMetricsInfo;
 
 enum CursorStatus {
@@ -216,9 +217,9 @@ 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;
@@ -228,9 +229,9 @@ public:
 	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
@@ -259,6 +260,7 @@ public:
 	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;
@@ -281,51 +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.
+	struct BufferViewPrivate;
-	boost::scoped_ptr<Intl> const intl_;
+	BufferViewPrivate & d;
-
-	/// 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_;
-
-	// Whom to notify. Not owned, so don't delete.
-	frontend::GuiBufferViewDelegate * gui_;
 };
 
 /// some space for drawing the 'nested' markers (in pixel)

src/CoordCache.h

@@ -29,18 +29,6 @@ class Paragraph;
 
 void lyxbreaker(void const * data, const char * hint, int size);
 
-class Point {
-public:
-	Point()
-		: x_(0), y_(0)
-	{}
-
-	Point(int x, int y);
-
-	int x_, y_;
-};
-
-
 struct Geometry {
 	Point pos;
 	Dimension dim;

src/Cursor.cpp

@@ -33,6 +33,7 @@
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParIterator.h"
+#include "TextMetrics.h"
 
 #include "insets/InsetTabular.h"
 #include "insets/InsetText.h"

src/Dimension.h

@@ -77,6 +77,16 @@ bool operator!=(Dimension const & a, Dimension const & b)
 	return a.wid != b.wid || a.asc != b.asc || a.des != b.des ;
 }
 
+class Point {
+public:
+	Point()
+		: x_(0), y_(0)
+	{}
+
+	Point(int x, int y);
+
+	int x_, y_;
+};
 
 } // namespace lyx
 

src/Text.cpp

@@ -45,6 +45,7 @@
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "Undo.h"
+#include "TextMetrics.h"
 #include "VSpace.h"
 #include "WordLangTuple.h"
 

src/Text2.cpp

@@ -47,6 +47,7 @@
 #include "ParIterator.h"
 #include "Server.h"
 #include "ServerSocket.h"
+#include "TextMetrics.h"
 #include "Undo.h"
 #include "VSpace.h"
 

src/Text3.cpp

@@ -43,6 +43,7 @@
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "TextMetrics.h"
 #include "Undo.h"
 #include "VSpace.h"
 #include "ParIterator.h"

src/VSpace.cpp

@@ -17,6 +17,7 @@
 #include "gettext.h"
 #include "lengthcommon.h"
 #include "Text.h"
+#include "TextMetrics.h" // for defaultRowHeight()
 
 #include "support/convert.h"
 #include "support/lstrings.h"

src/frontends/qt4/GuiView.cpp

@@ -37,6 +37,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "BufferList.h"
+#include "Cursor.h"
 #include "debug.h"
 #include "FuncRequest.h"
 #include "Layout.h"

src/frontends/qt4/GuiWorkArea.cpp

@@ -23,6 +23,7 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "Color.h"
+#include "Cursor.h"
 #include "debug.h"
 #include "FuncRequest.h"
 #include "LyXFunc.h"

src/insets/InsetTabular.cpp

@@ -43,6 +43,7 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
+#include "TextMetrics.h"
 #include "Undo.h"
 
 #include "support/convert.h"

src/insets/InsetText.cpp

@@ -42,6 +42,7 @@
 #include "ParIterator.h"
 #include "Row.h"
 #include "sgml.h"
+#include "TextMetrics.h"
 #include "TexRow.h"
 #include "Undo.h"
 

src/mathed/MathData.cpp

@@ -19,11 +19,12 @@
 #include "MathSupport.h"
 #include "ReplaceData.h"
 
-#include "BufferView.h"
 #include "Buffer.h"
+#include "BufferView.h"
+#include "CoordCache.h"
+#include "Color.h"
 #include "Cursor.h"
 #include "debug.h"
-#include "Color.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"