X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.h;h=6de3573fc6dfda35495b40d303065d412413a599;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=db58b2462621aad9dcd0e66db32baa7195d1ae36;hpb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;p=libs%2Fgltk.git

diff --git a/source/text.h b/source/text.h
index db58b24..6de3573 100644
--- a/source/text.h
+++ b/source/text.h
@@ -3,6 +3,8 @@
 
 #include <string>
 #include <vector>
+#include "mspgltk_api.h"
+#include "state.h"
 
 namespace Msp {
 namespace GLtk {
@@ -15,20 +17,21 @@ class Style;
 /**
 Stores and renders text.  Supports multiline text.
 */
-class Text
+class MSPGLTK_API Text
 {
 private:
 	struct Line
 	{
-		unsigned start;
-		unsigned length;
-		unsigned width;
+		unsigned start = 0;
+		unsigned bytes = 0;
+		unsigned length = 0;
+		unsigned width = 0;
 	};
 
 	struct RenderData;
 	struct CoordsToGeomData;
 
-	const Style *style;
+	const Style *style = nullptr;
 	std::string text;
 	std::vector<Line> lines;
 
@@ -48,20 +51,24 @@ public:
 	const std::string &get() const { return text; }
 	unsigned size() const { return text.size(); }
 	unsigned get_n_lines() const { return lines.size(); }
+	unsigned get_visible_lines(const Part &, const Geometry &, unsigned *) const;
 	unsigned get_line_length(unsigned) const;
+	unsigned move_offset(unsigned, int) const;
 	void offset_to_coords(unsigned, unsigned &, unsigned &) const;
 	unsigned coords_to_offset(unsigned, unsigned) const;
 	Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
 
-	void build(const Part &, const Geometry &, PartCache &) const;
-	void build(const Part &, const Geometry &, unsigned, PartCache &) const;
+	void build(const Part &, State, const Geometry &, PartCache &) const;
+	void build(const Part &, State, const Geometry &, unsigned, PartCache &) const;
 
 	Text &operator=(const std::string &);
 private:
 	void find_lines();
+	unsigned count_characters(unsigned, unsigned) const;
+	void check_alignment(unsigned) const;
 
-	template<typename T, void (Text::*)(unsigned, const Geometry &, T &) const>
-	void process_lines(const Part &, const Geometry &, unsigned, T &) const;
+	template<typename T>
+	void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;
 
 	void build_line(unsigned, const Geometry &, RenderData &) const;
 	void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;