+#include <msp/core/algorithm.h>
#include <msp/gl/matrix.h>
#include <msp/gl/meshbuilder.h>
#include <msp/gl/texture2d.h>
Text::Text():
- style(0)
-{
- Line line;
- line.start = 0;
- line.bytes = 0;
- line.length = 0;
- line.width = 0;
- lines.push_back(line);
-}
+ lines(1)
+{ }
Text::Text(const Style &s, const string &t):
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->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;
}
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();
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);
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;
}
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();
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;
+ auto i = text.begin()+start;
+ auto end = i+bytes;
unsigned count = 0;
for(; i<end; dec.decode_char(text, i))
++count;
void Text::check_alignment(unsigned offs) const
{
StringCodec::Utf8::Decoder dec;
- string::const_iterator i = text.begin()+offs;
+ auto i = text.begin()+offs;
dec.decode_char(text, i);
}
{
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