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 243c3a617f6cf2806a2272caf71cf4a44f45121e..6ddbb231b37871089f90e6cc90ecfa3ba1a735e9 100644 (file)
--- a/source/text.h
+++ b/source/text.h
@@ -22,6 +22,7 @@ private:
        struct Line
        {
                unsigned start;
+               unsigned bytes;
                unsigned length;
                unsigned width;
        };
@@ -51,6 +52,7 @@ public:
        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;
@@ -61,6 +63,8 @@ public:
        Text &operator=(const std::string &);
 private:
        void find_lines();
+       unsigned count_characters(unsigned, unsigned) const;
+       void check_alignment(unsigned) const;
 
        template<typename T>
        void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;