+#include <msp/core/algorithm.h>
#include <msp/gl/matrix.h>
#include <msp/gl/meshbuilder.h>
#include <msp/gl/texture2d.h>
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):
{
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->bytes))*font_size);
+ for(Line &l: lines)
+ l.width = static_cast<unsigned>(font.get_string_width(text.substr(l.start, l.bytes))*font_size);
}
}
unsigned Text::get_width() const
{
unsigned width = 0;
- for(vector<Line>::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;
}
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<Line>::iterator i;
- for(i=lines.begin(); (i!=lines.end() && i->start+i->bytes<pos); ++i) ;
+ auto i = find_if(lines, [pos](const Line &l){ return l.start+l.bytes>=pos; });
if(pos+len>i->start+i->bytes)
find_lines();
}
}
-void Text::insert(unsigned pos, const string &s)
+void Text::insert(size_t pos, const string &s)
{
check_alignment(pos);
text.insert(pos, s);
find_lines();
else
{
- vector<Line>::iterator i;
- for(i=lines.begin(); (i!=lines.end() && i->start+i->bytes<pos); ++i) ;
+ auto i = find_if(lines, [pos](const Line &l){ return l.start+l.bytes>=pos; });
i->bytes += s.size();
i->length = count_characters(i->start, i->bytes);
}
}
-unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsigned *fit_height) 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();
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));
+ size_t n_lines = min<size_t>(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
+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;
}
-unsigned Text::move_offset(unsigned offs, int change) 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);
- string::const_iterator i = text.begin()+offs;
+ auto i = text.begin()+offs;
if(change>0)
{
for(; change>0; --change)
while(change<0 && i!=text.begin())
{
--i;
- string::const_iterator j = 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
+void Text::offset_to_coords(size_t offs, size_t &row, size_t &col) const
{
if(lines.empty())
{
return;
}
- for(unsigned i=0; i<lines.size(); ++i)
+ for(size_t i=0; i<lines.size(); ++i)
if(offs>=lines[i].start && offs<=lines[i].start+lines[i].bytes)
{
row = i;
}
}
-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();
else
{
StringCodec::Utf8::Decoder dec;
- string::const_iterator i = text.begin()+line.start;
+ 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;
build(part, state, parent, 0, cache);
}
-void Text::build(const Part &part, State state, const Geometry &parent, unsigned first_row, PartCache &cache) const
+void Text::build(const Part &part, State state, const Geometry &parent, size_t first_row, PartCache &cache) const
{
if(!style || lines.empty())
return;
}
}
-unsigned Text::count_characters(unsigned start, unsigned bytes) const
+size_t Text::count_characters(size_t start, size_t bytes) const
{
StringCodec::Utf8::Decoder dec;
- string::const_iterator i = text.begin()+start;
- string::const_iterator end = i+bytes;
- unsigned count = 0;
+ auto i = text.begin()+start;
+ auto end = i+bytes;
+ size_t count = 0;
for(; i<end; dec.decode_char(text, i))
++count;
return count;
}
-void Text::check_alignment(unsigned offs) const
+void Text::check_alignment(size_t offs) const
{
StringCodec::Utf8::Decoder dec;
- string::const_iterator i = text.begin()+offs;
+ auto 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
+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;
int y_offset = static_cast<int>(-font.get_descent()*font_size);
unsigned fit_height;
- unsigned n_lines = get_visible_lines(part, parent, &fit_height);
- first_row = min<unsigned>(first_row, lines.size()-n_lines);
+ size_t n_lines = get_visible_lines(part, parent, &fit_height);
+ first_row = min(first_row, lines.size()-n_lines);
- for(unsigned i=0; i<n_lines; ++i)
+ for(size_t i=0; i<n_lines; ++i)
{
const Line &line = lines[first_row+i];
}
}
-void Text::build_line(unsigned i, const Geometry &rgeom, RenderData &data) const
+void Text::build_line(size_t 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.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)
{
- string::const_iterator begin = text.begin()+lines[i].start;
- string::const_iterator j = begin;
+ 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)
+ for(size_t c=data.col; c; --c)
dec.decode_char(text, j);
}
float w = style->get_font().get_string_width(string(begin, j));
projects / libs / gltk.git / blobdiff