Make sure Entry::first_row stays consistent

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

diff --git a/source/entry.cpp b/source/entry.cpp
index fec27397eaf8a445f068e8edf19b2d6f0decb882..36658dae18c0cf90bf73642a8ea77eab364f9ef1 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -62,13 +62,21 @@ void Entry::set_text(const string &t)
 
 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 +85,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 +103,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 +126,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;
@@ -236,14 +263,14 @@ 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);
        }
        else if(key==Input::KEY_DELETE)
        {
                if(selection_active)
-                       erase_selection();
+                       erase_selection(true);
                else
                        erase(edit_pos, 1);
        }
@@ -280,7 +307,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;
        }
@@ -376,19 +403,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)
 {
        unsigned start, end;
        if(!get_selection(start, end))
                return;
 
        text.erase(start, end-start);
+       if(emit_change)
+               signal_text_changed.emit(text.get());
        set_edit_position(start, false);
 }
 
@@ -418,12 +452,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);
 }
@@ -431,7 +472,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);
+       }
 }