Properly handle multibyte UTF-8 in Entry and Text

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index 751f173d0c234a36a10c340987112fa6a7dd1605..6554f7cb1b5ada9e52cf6cad423baedc9f30337d 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -56,7 +56,11 @@ void Entry::autosize_special(const Part &part, Geometry &ageom) const
 
 void Entry::set_text(const string &t)
 {
-       text = t;
+       if(t!=text.get())
+       {
+               text = t;
+               signal_text_changed.emit(text.get());
+       }
        set_edit_position(text.size());
 }
 
@@ -265,14 +269,20 @@ bool Entry::key_press(unsigned key, unsigned mod)
                if(selection_active)
                        erase_selection(true);
                else if(edit_pos>0)
-                       erase(edit_pos-1, 1);
+               {
+                       unsigned start_pos = text.move_offset(edit_pos, -1);
+                       erase(start_pos, edit_pos-start_pos);
+               }
        }
        else if(key==Input::KEY_DELETE)
        {
                if(selection_active)
                        erase_selection(true);
                else
-                       erase(edit_pos, 1);
+               {
+                       unsigned end_pos = text.move_offset(edit_pos, 1);
+                       erase(edit_pos, end_pos-edit_pos);
+               }
        }
        else if(key==Input::KEY_ENTER && multiline)
                insert(edit_pos, "\n");
@@ -374,15 +384,9 @@ void Entry::on_style_change()
 void Entry::move_edit_position(Navigation nav, bool select)
 {
        if(nav==NAV_LEFT)
-       {
-               if(edit_pos>0)
-                       set_edit_position(edit_pos-1, select);
-       }
+               set_edit_position(text.move_offset(edit_pos, -1), select);
        else if(nav==NAV_RIGHT)
-       {
-               if(edit_pos<text.size())
-                       set_edit_position(edit_pos+1, select);
-       }
+               set_edit_position(text.move_offset(edit_pos, 1), select);
        else if(nav==NAV_DOWN)
        {
                unsigned row, col;
@@ -395,6 +399,8 @@ void Entry::move_edit_position(Navigation nav, bool select)
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position((row>0 ? text.coords_to_offset(row-1, col) : 0), select);
        }
+       else
+               throw invalid_argument("Entry::move_edit_position");
 }
 
 void Entry::set_edit_position(unsigned ep, bool select)
@@ -458,10 +464,13 @@ void Entry::check_view_range()
        else if(row>=first_row+visible_rows)
                first_row = row+1-visible_rows;
 
+       unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+       if(first_row>scroll)
+               first_row = scroll;
+
        if(first_row!=old_first_row)
                signal_scroll_position_changed.emit(first_row);
 
-       unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
        slider->set_range(0, scroll);
        slider->set_value(scroll-first_row);
 }