X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=54c5fb7cbcdd49fc48f06dae0761c9843fd6b0de;hb=bbc49b78e8b766fc695ab90fdbe00f579882fc99;hp=fec27397eaf8a445f068e8edf19b2d6f0decb882;hpb=fa949807cca17c8c247e37a885e83b90c6176a21;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index fec2739..54c5fb7 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -64,11 +64,15 @@ void Entry::insert(unsigned pos, const string &t)
 {
 	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();
 
+	if(edit_pos!=old_edit_pos)
+		signal_edit_position_changed.emit(edit_pos);
+
 	if(multiline)
 		check_view_range();
 
@@ -79,6 +83,7 @@ void Entry::erase(unsigned pos, unsigned len)
 {
 	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 +96,12 @@ void Entry::erase(unsigned pos, unsigned len)
 			selection_pos = pos;
 	}
 
+	if(edit_pos!=old_edit_pos)
+		signal_edit_position_changed.emit(edit_pos);
+
 	if(multiline)
 		check_view_range();
+
 	rebuild();
 }
 
@@ -109,6 +118,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;
@@ -376,7 +395,12 @@ 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();
@@ -418,11 +442,15 @@ 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;
 
+	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);
@@ -431,7 +459,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);
+	}
 }