Properly handle multibyte UTF-8 in Entry and Text

[libs/gltk.git] / source / text.h

diff --git a/source/text.h b/source/text.h
index 077558bb84a34b27e7ceba181fad311a57abb031..6ddbb231b37871089f90e6cc90ecfa3ba1a735e9 100644 (file)
--- a/source/text.h
+++ b/source/text.h
@@ -3,12 +3,14 @@
 
 #include <string>
 #include <vector>
+#include "state.h"
 
 namespace Msp {
 namespace GLtk {
 
 class Geometry;
 class Part;
+class PartCache;
 class Style;
 
 /**
@@ -20,6 +22,7 @@ private:
        struct Line
        {
                unsigned start;
+               unsigned bytes;
                unsigned length;
                unsigned width;
        };
@@ -39,6 +42,7 @@ public:
 
        unsigned get_width() const;
        unsigned get_height() const;
+       void autosize(const Part &, Geometry &) const;
 
        void set(const std::string &);
        void erase(unsigned, unsigned);
@@ -46,21 +50,26 @@ public:
        const std::string &get() const { return text; }
        unsigned size() const { return text.size(); }
        unsigned get_n_lines() const { return lines.size(); }
+       unsigned get_visible_lines(const Part &, const Geometry &, unsigned *) const;
        unsigned get_line_length(unsigned) const;
+       unsigned move_offset(unsigned, int) const;
        void offset_to_coords(unsigned, unsigned &, unsigned &) const;
        unsigned coords_to_offset(unsigned, unsigned) const;
        Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
 
-       void render(const Part &, const Geometry &, unsigned = 0) const;
+       void build(const Part &, State, const Geometry &, PartCache &) const;
+       void build(const Part &, State, const Geometry &, unsigned, PartCache &) const;
 
        Text &operator=(const std::string &);
 private:
        void find_lines();
+       unsigned count_characters(unsigned, unsigned) const;
+       void check_alignment(unsigned) const;
 
-       template<typename T, void (Text::*)(unsigned, const Geometry &, T &) const>
-       void process_lines(const Part &, const Geometry &, unsigned, T &) const;
+       template<typename T>
+       void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;
 
-       void render_line(unsigned, const Geometry &, RenderData &) const;
+       void build_line(unsigned, const Geometry &, RenderData &) const;
        void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;
 };