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

diff --git a/source/entry.cpp b/source/entry.cpp
index 54c5fb7..6554f7c 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -56,12 +56,19 @@ 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;
@@ -70,6 +77,7 @@ void Entry::insert(unsigned pos, const string &t)
 	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);
 
@@ -81,6 +89,9 @@ 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;
@@ -96,6 +107,7 @@ 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);
 
@@ -255,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");
@@ -299,7 +317,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;
 	}
@@ -366,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;
@@ -387,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)
@@ -406,13 +420,15 @@ void Entry::set_edit_position(unsigned ep, bool select)
 	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);
 }
 
@@ -448,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);
 }