Avoid duplicating the logic in Entry::get_selection

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 6d13ccdd0377eaaff11b29db0c27981d5b9cacc0..fec27397eaf8a445f068e8edf19b2d6f0decb882 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -93,18 +93,6 @@ void Entry::erase(unsigned pos, unsigned len)
 
        if(multiline)
                check_view_range();
-
-       rebuild();
-}
-
-void Entry::set_edit_position(unsigned pos)
-{
-       edit_pos = min(pos, text.size());
-       selection_active = false;
-
-       if(multiline)
-               check_view_range();
-
        rebuild();
 }
 
@@ -177,10 +165,8 @@ void Entry::rebuild_special(const Part &part)
                if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
-               unsigned start = selection_pos;
-               unsigned end = edit_pos;
-               if(start>end)
-                       swap(start, end);
+               unsigned start, end;
+               get_selection(start, end);
 
                unsigned row, col;
                text.offset_to_coords(start, row, col);
@@ -252,25 +238,17 @@ bool Entry::key_press(unsigned key, unsigned mod)
                if(selection_active)
                        erase_selection();
                else if(edit_pos>0)
-               {
-                       text.erase(--edit_pos, 1);
-                       check_view_range();
-                       rebuild();
-               }
+                       erase(edit_pos-1, 1);
        }
        else if(key==Input::KEY_DELETE)
        {
                if(selection_active)
                        erase_selection();
                else
-                       text.erase(edit_pos, 1);
+                       erase(edit_pos, 1);
        }
        else if(key==Input::KEY_ENTER && multiline)
-       {
-               text.insert(edit_pos++, "\n");
-               check_view_range();
-               rebuild();
-       }
+               insert(edit_pos, "\n");
        else if(key==Input::KEY_END)
        {
                unsigned row, col;
@@ -303,9 +281,7 @@ bool Entry::character(wchar_t ch)
        {
                if(selection_active)
                        erase_selection();
-               text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
-               ++edit_pos;
-               rebuild();
+               insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                return true;
        }
 
@@ -400,21 +376,18 @@ void Entry::set_edit_position(unsigned ep, bool select)
                selection_pos = edit_pos;
        selection_active = select;
 
-       edit_pos = ep;
-       check_view_range();
+       edit_pos = min(ep, text.size());
+       if(multiline)
+               check_view_range();
        rebuild();
 }
 
 void Entry::erase_selection()
 {
-       if(!selection_active)
+       unsigned start, end;
+       if(!get_selection(start, end))
                return;
 
-       unsigned start = selection_pos;
-       unsigned end = edit_pos;
-       if(start>end)
-               swap(start, end);
-
        text.erase(start, end-start);
        set_edit_position(start, false);
 }