Rename Widget::on_geometry_change to on_size_change

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 19bb7cc48b9f038d86d95401941e5b30f71cbe02..3a91f50dad4e4178cf308aa88c1a40c603559a68 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -56,19 +56,31 @@ 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());
 }
 
 void Entry::insert(unsigned pos, const string &t)
 {
+       if(t.empty())
+               return;
+
        text.insert(pos, t);
 
+       unsigned old_edit_pos = edit_pos;
        if(edit_pos>=pos)
                edit_pos += t.size();
        if(selection_active && selection_pos>=pos)
                selection_pos += t.size();
 
+       signal_text_changed.emit(text.get());
+       if(edit_pos!=old_edit_pos)
+               signal_edit_position_changed.emit(edit_pos);
+
        if(multiline)
                check_view_range();
 
@@ -77,8 +89,12 @@ void Entry::insert(unsigned pos, const string &t)
 
 void Entry::erase(unsigned pos, unsigned len)
 {
+       if(!len)
+               return;
+
        text.erase(pos, len);
 
+       unsigned old_edit_pos = edit_pos;
        if(edit_pos>=pos+len)
                edit_pos -= len;
        else if(edit_pos>=pos)
@@ -91,8 +107,13 @@ void Entry::erase(unsigned pos, unsigned len)
                        selection_pos = pos;
        }
 
+       signal_text_changed.emit(text.get());
+       if(edit_pos!=old_edit_pos)
+               signal_edit_position_changed.emit(edit_pos);
+
        if(multiline)
                check_view_range();
+
        rebuild();
 }
 
@@ -109,6 +130,16 @@ bool Entry::get_selection(unsigned &start, unsigned &end) const
        return true;
 }
 
+void Entry::translate_position(unsigned pos, unsigned &row, unsigned &col) const
+{
+       text.offset_to_coords(pos, row, col);
+}
+
+unsigned Entry::translate_position(unsigned row, unsigned col) const
+{
+       return text.coords_to_offset(row, col);
+}
+
 void Entry::set_edit_size(unsigned w, unsigned h)
 {
        edit_width = w;
@@ -165,10 +196,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);
@@ -238,16 +267,22 @@ bool Entry::key_press(unsigned key, unsigned mod)
        if(key==Input::KEY_BACKSPACE)
        {
                if(selection_active)
-                       erase_selection();
+                       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();
+                       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");
@@ -263,6 +298,18 @@ bool Entry::key_press(unsigned key, unsigned mod)
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row, 0), mod==MOD_SHIFT);
        }
+       else if(key==Input::KEY_PGUP)
+       {
+               unsigned row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(text.coords_to_offset((row<visible_rows ? 0 : row-visible_rows), col), mod==MOD_SHIFT);
+       }
+       else if(key==Input::KEY_PGDN)
+       {
+               unsigned row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(text.coords_to_offset(row+visible_rows, col), mod==MOD_SHIFT);
+       }
        else if(key==Input::KEY_LEFT && mod==MOD_SHIFT)
                move_edit_position(NAV_LEFT, true);
        else if(key==Input::KEY_RIGHT && mod==MOD_SHIFT)
@@ -282,7 +329,7 @@ bool Entry::character(wchar_t ch)
        if(got_key_press && ch>=' ' && ch!=0x7F)
        {
                if(selection_active)
-                       erase_selection();
+                       erase_selection(false);
                insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                return true;
        }
@@ -322,7 +369,7 @@ void Entry::animate(const Time::TimeDelta &)
        rebuild();
 }
 
-void Entry::on_geometry_change()
+void Entry::on_size_change()
 {
        if(multiline)
                check_view_range();
@@ -349,15 +396,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;
@@ -370,6 +411,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)
@@ -378,23 +421,26 @@ void Entry::set_edit_position(unsigned ep, bool select)
                selection_pos = edit_pos;
        selection_active = select;
 
+       unsigned old_edit_pos = edit_pos;
        edit_pos = min(ep, text.size());
+
+       if(edit_pos!=old_edit_pos)
+               signal_edit_position_changed.emit(edit_pos);
+
        if(multiline)
                check_view_range();
        rebuild();
 }
 
-void Entry::erase_selection()
+void Entry::erase_selection(bool emit_change)
 {
-       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);
+       if(emit_change)
+               signal_text_changed.emit(text.get());
        set_edit_position(start, false);
 }
 
@@ -424,12 +470,19 @@ void Entry::check_view_range()
        unsigned row, col;
        text.offset_to_coords(edit_pos, row, col);
 
+       unsigned old_first_row = first_row;
        if(first_row>row)
                first_row = row;
        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);
+
        slider->set_range(0, scroll);
        slider->set_value(scroll-first_row);
 }
@@ -437,7 +490,12 @@ void Entry::check_view_range()
 void Entry::slider_value_changed(double value)
 {
        if(text.get_n_lines()>visible_rows)
+       {
+               unsigned old_first_row = first_row;
                first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
+               if(first_row!=old_first_row)
+                       signal_scroll_position_changed.emit(first_row);
+       }
 }