]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/text.cpp
Convert loops and iterators to use C++11 features
[libs/gltk.git] / source / text.cpp
index 45b6567db5c640bcec37e0dfccee877323fde230..bffb6e6a86cc0b33f6b35285d6a22338cfb7c8ae 100644 (file)
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
 #include <msp/gl/texture2d.h>
@@ -25,7 +26,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)
@@ -41,16 +49,16 @@ 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);
+               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;
 }
 
@@ -81,16 +89,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<Line>::iterator i;
-       for(i=lines.begin(); (i!=lines.end() && i->start+i->length<pos); ++i) ;
+       auto i = find_if(lines, [pos](const Line &l){ return l.start+l.bytes>=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 +109,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<Line>::iterator i;
-               for(i=lines.begin(); (i!=lines.end() && i->start+i->length<pos); ++i) ;
+               auto i = find_if(lines, [pos](const Line &l){ return l.start+l.bytes>=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();
@@ -139,6 +150,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())
@@ -149,10 +186,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;
                }
 }
@@ -161,8 +201,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
@@ -219,11 +271,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);
@@ -234,6 +287,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<end; dec.decode_char(text, i))
+               ++count;
+       return count;
+}
+
+void Text::check_alignment(unsigned offs) const
+{
+       StringCodec::Utf8::Decoder dec;
+       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
 {
@@ -267,18 +338,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<unsigned>(w*style->get_font_size());
        }