X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=86730757fd6c93889b772ac648bbcd4913a98c85;hb=720455325086e08bc9fdcd822d713480d0c2e0a0;hp=aa5ad8030efe6be34a08218932e4c0d284d2a98f;hpb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index aa5ad80..8673075 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -25,7 +25,14 @@ struct Text::CoordsToGeomData
 
 Text::Text():
 	style(0)
-{ }
+{
+	Line line;
+	line.start = 0;
+	line.bytes = 0;
+	line.length = 0;
+	line.width = 0;
+	lines.push_back(line);
+}
 
 Text::Text(const Style &s, const string &t):
 	style(&s)
@@ -42,7 +49,7 @@ void Text::set_style(const Style *s)
 		const GL::Font &font = style->get_font();
 		float font_size = style->get_font_size();
 		for(vector<Line>::iterator i=lines.begin(); i!=lines.end(); ++i)
-			i->width = static_cast<unsigned>(font.get_string_width(text.substr(i->start, i->length))*font_size);
+			i->width = static_cast<unsigned>(font.get_string_width(text.substr(i->start, i->bytes))*font_size);
 	}
 }
 
@@ -81,16 +88,19 @@ void Text::set(const string &t)
 
 void Text::erase(unsigned pos, unsigned len)
 {
+	check_alignment(pos);
+	check_alignment(pos+len);
 	text.erase(pos, len);
 
 	vector<Line>::iterator i;
-	for(i=lines.begin(); (i!=lines.end() && i->start+i->length<pos); ++i) ;
+	for(i=lines.begin(); (i!=lines.end() && i->start+i->bytes<pos); ++i) ;
 
-	if(pos+len>i->start+i->length)
+	if(pos+len>i->start+i->bytes)
 		find_lines();
 	else
 	{
-		i->length -= len;
+		i->bytes -= len;
+		i->length = count_characters(i->start, i->bytes);
 
 		for(++i; i!=lines.end(); ++i)
 			i->start -= len;
@@ -99,6 +109,7 @@ void Text::erase(unsigned pos, unsigned len)
 
 void Text::insert(unsigned pos, const string &s)
 {
+	check_alignment(pos);
 	text.insert(pos, s);
 
 	if(s.find('\n')!=string::npos)
@@ -106,15 +117,33 @@ void Text::insert(unsigned pos, const string &s)
 	else
 	{
 		vector<Line>::iterator i;
-		for(i=lines.begin(); (i!=lines.end() && i->start+i->length<pos); ++i) ;
+		for(i=lines.begin(); (i!=lines.end() && i->start+i->bytes<pos); ++i) ;
 
-		i->length += s.size();
+		i->bytes += s.size();
+		i->length = count_characters(i->start, i->bytes);
 
 		for(++i; i!=lines.end(); ++i)
 			i->start += s.size();
 	}
 }
 
+unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsigned *fit_height) const
+{
+	const GL::Font &font = style->get_font();
+	float font_size = style->get_font_size();
+	unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
+	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
+
+	const Sides &margin = part.get_margin();
+	unsigned vmargin = margin.top+margin.bottom;
+	unsigned free_height = max(parent.h, vmargin)-vmargin+line_spacing-line_height;
+	unsigned n_lines = min<unsigned>(lines.size(), max(free_height/line_spacing, 1U));
+	if(fit_height)
+		*fit_height = line_height+(n_lines-1)*line_spacing;
+
+	return n_lines;
+}
+
 unsigned Text::get_line_length(unsigned i) const
 {
 	if(i>=lines.size())
@@ -122,6 +151,32 @@ unsigned Text::get_line_length(unsigned i) const
 	return lines[i].length;
 }
 
+unsigned Text::move_offset(unsigned offs, int change) const
+{
+	check_alignment(offs);
+	if(!change)
+		return offs;
+
+	StringCodec::Utf8::Decoder dec(StringCodec::IGNORE_ERRORS);
+	string::const_iterator i = text.begin()+offs;
+	if(change>0)
+	{
+		for(; change>0; --change)
+			dec.decode_char(text, i);
+	}
+	else
+	{
+		while(change<0 && i!=text.begin())
+		{
+			--i;
+			string::const_iterator j = i;
+			if(dec.decode_char(text, j)!=-1)
+				++change;
+		}
+	}
+	return i-text.begin();
+}
+
 void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const
 {
 	if(lines.empty())
@@ -132,10 +187,13 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const
 	}
 
 	for(unsigned i=0; i<lines.size(); ++i)
-		if(offs>=lines[i].start && offs<=lines[i].start+lines[i].length)
+		if(offs>=lines[i].start && offs<=lines[i].start+lines[i].bytes)
 		{
 			row = i;
-			col = offs-lines[i].start;
+			if(lines[i].length==lines[i].bytes)
+				col = offs-lines[i].start;
+			else
+				col = count_characters(lines[i].start, offs-lines[i].start);
 			return;
 		}
 }
@@ -144,8 +202,20 @@ unsigned Text::coords_to_offset(unsigned row, unsigned col) const
 {
 	if(row>=lines.size())
 		return text.size();
+	const Line &line = lines[row];
+	if(col>line.length)
+		col = line.length;
 
-	return lines[row].start+min(col, lines[row].length);
+	if(line.length==line.bytes)
+		return line.start+col;
+	else
+	{
+		StringCodec::Utf8::Decoder dec;
+		string::const_iterator i = text.begin()+line.start;
+		for(col=min(col, line.length); col; --col)
+			dec.decode_char(text, i);
+		return i-text.begin();
+	}
 }
 
 Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsigned first_row, unsigned row, unsigned col) const
@@ -160,7 +230,7 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
 	data.row = row;
 	data.col = col;
 
-	process_lines<CoordsToGeomData, &Text::coords_to_geom_line>(part, parent, first_row, data);
+	process_lines(part, parent, first_row, &Text::coords_to_geom_line, data);
 
 	return data.result;
 }
@@ -182,7 +252,7 @@ void Text::build(const Part &part, State state, const Geometry &parent, unsigned
 	RenderData data;
 	data.bld = &bld;
 
-	process_lines<RenderData, &Text::build_line>(part, parent, first_row, data);
+	process_lines(part, parent, first_row, &Text::build_line, data);
 }
 
 Text &Text::operator=(const string &t)
@@ -202,11 +272,12 @@ void Text::find_lines()
 
 		Line line;
 		line.start = start;
-		line.length = (newline==string::npos ? text.size() : newline)-start;
+		line.bytes = (newline==string::npos ? text.size() : newline)-start;
+		line.length = count_characters(line.start, line.bytes);
 		line.width = line.length;
 		if(style)
 		{
-			string str = text.substr(line.start, line.length);
+			string str = text.substr(line.start, line.bytes);
 			line.width = static_cast<unsigned>(style->get_font().get_string_width(str)*font_size);
 		}
 		lines.push_back(line);
@@ -217,21 +288,37 @@ void Text::find_lines()
 	}
 }
 
-template<typename T, void (Text::*func)(unsigned, const Geometry &, T &) const>
-void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const
+unsigned Text::count_characters(unsigned start, unsigned bytes) const
+{
+	StringCodec::Utf8::Decoder dec;
+	string::const_iterator i = text.begin()+start;
+	string::const_iterator end = i+bytes;
+	unsigned count = 0;
+	for(; i<end; dec.decode_char(text, i))
+		++count;
+	return count;
+}
+
+void Text::check_alignment(unsigned offs) const
+{
+	StringCodec::Utf8::Decoder dec;
+	string::const_iterator i = text.begin()+offs;
+	dec.decode_char(text, i);
+}
+
+template<typename T>
+void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const
 {
 	if(!style)
 		return;
 
 	const GL::Font &font = style->get_font();
 	float font_size = style->get_font_size();
-	unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
-	unsigned height = line_height+(lines.size()-1)*line_spacing;
 	int y_offset = static_cast<int>(-font.get_descent()*font_size);
 
-	const Sides &margin = part.get_margin();
-	unsigned n_lines = min<unsigned>(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
+	unsigned fit_height;
+	unsigned n_lines = get_visible_lines(part, parent, &fit_height);
 	first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
 	for(unsigned i=0; i<n_lines; ++i)
@@ -240,7 +327,7 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 
 		Geometry rgeom;
 		rgeom.w = line.width;
-		rgeom.h = height;
+		rgeom.h = fit_height;
 		rgeom.y = (n_lines-1-i)*line_spacing+y_offset;
 		part.get_alignment().apply(rgeom, parent, part.get_margin());
 
@@ -256,14 +343,24 @@ void Text::build_line(unsigned i, const Geometry &rgeom, RenderData &data) const
 	data.bld->matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
 	data.bld->matrix() *= GL::Matrix::scaling(style->get_font_size());
 
-	style->get_font().build_string(text.substr(line.start, line.length), *data.bld);
+	style->get_font().build_string(text.substr(line.start, line.bytes), *data.bld);
 }
 
 void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomData &data) const
 {
 	if(i==data.row)
 	{
-		float w = style->get_font().get_string_width(text.substr(lines[i].start, data.col));
+		string::const_iterator begin = text.begin()+lines[i].start;
+		string::const_iterator j = begin;
+		if(lines[i].length==lines[i].bytes)
+			j += data.col;
+		else
+		{
+			StringCodec::Utf8::Decoder dec;
+			for(unsigned c=data.col; c; --c)
+				dec.decode_char(text, j);
+		}
+		float w = style->get_font().get_string_width(string(begin, j));
 		data.result = rgeom;
 		data.result.x += static_cast<unsigned>(w*style->get_font_size());
 	}