X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=166bbb5212c7145fbc1c39bbfccf44cf7441354f;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=1d824e0ddb9ca590f551748921503e626bcdd931;hpb=7c1b1b44dc3726d6cdb4681f9d44189eb4102a5a;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index 1d824e0..166bbb5 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -24,7 +25,7 @@ struct Text::CoordsToGeomData Text::Text(): - style(0) + lines(1) { } Text::Text(const Style &s, const string &t): @@ -41,16 +42,16 @@ void Text::set_style(const Style *s) { const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); - for(vector::iterator i=lines.begin(); i!=lines.end(); ++i) - i->width = static_cast(font.get_string_width(text.substr(i->start, i->length))*font_size); + for(Line &l: lines) + l.width = static_cast(font.get_string_width(text.substr(l.start, l.bytes))*font_size); } } unsigned Text::get_width() const { unsigned width = 0; - for(vector::const_iterator i=lines.begin(); i!=lines.end(); ++i) - width = max(width, i->width); + for(const Line &l: lines) + width = max(width, l.width); return width; } @@ -81,16 +82,18 @@ 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::iterator i; - for(i=lines.begin(); (i!=lines.end() && i->start+i->length=pos; }); - 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,16 +102,17 @@ 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) find_lines(); else { - vector::iterator i; - for(i=lines.begin(); (i!=lines.end() && i->start+i->length=pos; }); - 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(); @@ -123,8 +127,9 @@ unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsig unsigned line_spacing = static_cast(font_size*6/5); const Sides &margin = part.get_margin(); - unsigned vmargin = margin.top+margin.bottom+line_height-line_spacing; - unsigned n_lines = min(lines.size(), max((max(parent.h, vmargin)-vmargin)/line_spacing, 1U)); + unsigned vmargin = margin.top+margin.bottom; + unsigned free_height = max(parent.h, vmargin)-vmargin+line_spacing-line_height; + unsigned n_lines = min(lines.size(), max(free_height/line_spacing, 1U)); if(fit_height) *fit_height = line_height+(n_lines-1)*line_spacing; @@ -138,6 +143,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); + auto i = text.begin()+offs; + if(change>0) + { + for(; change>0; --change) + dec.decode_char(text, i); + } + else + { + while(change<0 && i!=text.begin()) + { + --i; + auto 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()) @@ -148,10 +179,13 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const } for(unsigned i=0; i=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; } } @@ -160,8 +194,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; + auto 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 @@ -218,11 +264,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(style->get_font().get_string_width(str)*font_size); } lines.push_back(line); @@ -233,6 +280,24 @@ void Text::find_lines() } } +unsigned Text::count_characters(unsigned start, unsigned bytes) const +{ + StringCodec::Utf8::Decoder dec; + auto i = text.begin()+start; + auto end = i+bytes; + unsigned count = 0; + for(; i void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const { @@ -266,18 +331,28 @@ void Text::build_line(unsigned i, const Geometry &rgeom, RenderData &data) const { const Line &line = lines[i]; - GL::MatrixStack::Push _pushm(data.bld->matrix()); - data.bld->matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); - data.bld->matrix() *= GL::Matrix::scaling(style->get_font_size()); + GL::VertexBuilder::PushMatrix _pushm(*data.bld); + data.bld->transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0)); + data.bld->transform(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)); + auto begin = text.begin()+lines[i].start; + auto 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(w*style->get_font_size()); }