X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=3a91f50dad4e4178cf308aa88c1a40c603559a68;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=751f173d0c234a36a10c340987112fa6a7dd1605;hpb=474578fd04355c3247e8f9f6383d17e37c2c3015;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 751f173..3a91f50 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -56,7 +56,11 @@ 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());
 }
 
@@ -265,14 +269,20 @@ bool Entry::key_press(unsigned key, unsigned mod)
 		if(selection_active)
 			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(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");
@@ -288,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)
@@ -347,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();
@@ -374,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;
@@ -395,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)
@@ -458,10 +476,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);
 }