X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=2e4d9cb88f4c5c0394b2edf137866dc14cbb295f;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=a4ec22668537946a6d72e4ded8c0adbfdaadfb43;hpb=11d1b67a9180a0e468b56e355fbe0c88d104ef72;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index a4ec226..2e4d9cb 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -1,6 +1,8 @@ -#include +#include #include +#include #include +#include "partcache.h" #include "style.h" #include "text.h" @@ -16,14 +18,14 @@ struct Text::RenderData struct Text::CoordsToGeomData { - unsigned row; - unsigned col; + size_t row; + size_t col; Geometry result; }; Text::Text(): - style(0) + lines(1) { } Text::Text(const Style &s, const string &t): @@ -38,17 +40,18 @@ void Text::set_style(const Style *s) if(style) { + 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(style->get_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; } @@ -57,63 +60,116 @@ unsigned Text::get_height() const if(!style) return lines.size(); - const GL::Font *font = style->get_font(); + const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); - unsigned line_height = static_cast((font->get_ascent()-font->get_descent())*font_size); + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*font_size); unsigned line_spacing = line_height*6/5; return line_height+(lines.size()-1)*line_spacing; } +void Text::autosize(const Part &part, Geometry &geom) const +{ + const Sides &margin = part.get_margin(); + geom.w = max(geom.w, get_width()+margin.left+margin.right); + geom.h = max(geom.h, get_height()+margin.top+margin.bottom); +} + void Text::set(const string &t) { text = t; find_lines(); } -void Text::erase(unsigned pos, unsigned len) +void Text::erase(size_t pos, size_t 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; } } -void Text::insert(unsigned pos, const string &s) +void Text::insert(size_t 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(); } } -unsigned Text::get_line_length(unsigned i) const +size_t 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((font.get_ascent()-font.get_descent())*font_size); + unsigned line_spacing = static_cast(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; + size_t n_lines = min(lines.size(), max(free_height/line_spacing, 1U)); + if(fit_height) + *fit_height = line_height+(n_lines-1)*line_spacing; + + return n_lines; +} + +size_t Text::get_line_length(size_t i) const { if(i>=lines.size()) throw out_of_range("Text::get_line_length"); return lines[i].length; } -void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const +size_t Text::move_offset(size_t offs, ptrdiff_t 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(size_t offs, size_t &row, size_t &col) const { if(lines.empty()) { @@ -122,24 +178,39 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const return; } - for(unsigned i=0; i=lines[i].start && offs<=lines[i].start+lines[i].length) + for(size_t i=0; i=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; } } -unsigned Text::coords_to_offset(unsigned row, unsigned col) const +size_t Text::coords_to_offset(size_t row, size_t 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 +Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, size_t first_row, size_t row, size_t col) const { if(row>=lines.size()) row = lines.size()-1; @@ -151,27 +222,29 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi data.row = row; data.col = col; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, &Text::coords_to_geom_line, data); return data.result; } -void Text::render(const Part &part, const Geometry &parent, unsigned first_row) const +void Text::build(const Part &part, State state, const Geometry &parent, PartCache &cache) const +{ + build(part, state, parent, 0, cache); +} + +void Text::build(const Part &part, State state, const Geometry &parent, size_t first_row, PartCache &cache) const { if(!style || lines.empty()) return; - const GL::Font *font = style->get_font(); - const GL::Color &color = style->get_font_color(); - GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2)); - imm.color(color.r, color.g, color.b); + const GL::Font &font = style->get_font(); + GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture())); + bld.color(style->get_font_color(state)); RenderData data; - data.bld = &imm; - - GL::Bind bind_tex(font->get_texture()); + data.bld = &bld; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, &Text::build_line, data); } Text &Text::operator=(const string &t) @@ -191,12 +264,13 @@ 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); - line.width = static_cast(style->get_font()->get_string_width(str)*font_size); + 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); @@ -206,30 +280,46 @@ void Text::find_lines() } } -template -void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const +size_t Text::count_characters(size_t start, size_t bytes) const +{ + StringCodec::Utf8::Decoder dec; + auto i = text.begin()+start; + auto end = i+bytes; + size_t count = 0; + for(; i +void Text::process_lines(const Part &part, const Geometry &parent, size_t first_row, void (Text::*func)(size_t, const Geometry &, T &) const, T &data) const { if(!style) return; - const GL::Font *font = style->get_font(); + const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); - unsigned line_height = static_cast((font->get_ascent()-font->get_descent())*font_size); unsigned line_spacing = static_cast(font_size*6/5); - unsigned height = line_height+(lines.size()-1)*line_spacing; - int y_offset = static_cast(-font->get_descent()*font_size); + int y_offset = static_cast(-font.get_descent()*font_size); - const Sides &margin = part.get_margin(); - unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U)); + unsigned fit_height; + size_t n_lines = get_visible_lines(part, parent, &fit_height); first_row = min(first_row, lines.size()-n_lines); - for(unsigned i=0; iget_font(); - GL::PushMatrix _pushm; - GL::translate(rgeom.x, rgeom.y, 0); - GL::scale_uniform(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())); - 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 +void Text::coords_to_geom_line(size_t i, const Geometry &rgeom, CoordsToGeomData &data) const { if(i==data.row) { - const Line &line = lines[i]; - const GL::Font *font = style->get_font(); - + 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(size_t 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(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size()); + data.result.x += static_cast(w*style->get_font_size()); } }