X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=19bb7cc48b9f038d86d95401941e5b30f71cbe02;hb=3bf64bbd84cfd7a3d30c8cfbd70cacd073bccb04;hp=af6fcc6d0fd31ed5cfdbdc03f4fda57e9db6c55c;hpb=608412d18b9c42871277911c11ae885a53d83990;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index af6fcc6..19bb7cc 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -57,7 +57,17 @@ void Entry::autosize_special(const Part &part, Geometry &ageom) const
 void Entry::set_text(const string &t)
 {
 	text = t;
-	edit_pos = text.size();
+	set_edit_position(text.size());
+}
+
+void Entry::insert(unsigned pos, const string &t)
+{
+	text.insert(pos, t);
+
+	if(edit_pos>=pos)
+		edit_pos += t.size();
+	if(selection_active && selection_pos>=pos)
+		selection_pos += t.size();
 
 	if(multiline)
 		check_view_range();
@@ -65,6 +75,40 @@ void Entry::set_text(const string &t)
 	rebuild();
 }
 
+void Entry::erase(unsigned pos, unsigned len)
+{
+	text.erase(pos, len);
+
+	if(edit_pos>=pos+len)
+		edit_pos -= len;
+	else if(edit_pos>=pos)
+		edit_pos = pos;
+	if(selection_active)
+	{
+		if(selection_pos>=pos+len)
+			selection_pos -= len;
+		else if(selection_pos>=pos)
+			selection_pos = pos;
+	}
+
+	if(multiline)
+		check_view_range();
+	rebuild();
+}
+
+bool Entry::get_selection(unsigned &start, unsigned &end) const
+{
+	if(!selection_active)
+		return false;
+
+	start = selection_pos;
+	end = edit_pos;
+	if(start>end)
+		swap(start, end);
+
+	return true;
+}
+
 void Entry::set_edit_size(unsigned w, unsigned h)
 {
 	edit_width = w;
@@ -196,25 +240,17 @@ bool Entry::key_press(unsigned key, unsigned mod)
 		if(selection_active)
 			erase_selection();
 		else if(edit_pos>0)
-		{
-			text.erase(--edit_pos, 1);
-			check_view_range();
-			rebuild();
-		}
+			erase(edit_pos-1, 1);
 	}
 	else if(key==Input::KEY_DELETE)
 	{
 		if(selection_active)
 			erase_selection();
 		else
-			text.erase(edit_pos, 1);
+			erase(edit_pos, 1);
 	}
 	else if(key==Input::KEY_ENTER && multiline)
-	{
-		text.insert(edit_pos++, "\n");
-		check_view_range();
-		rebuild();
-	}
+		insert(edit_pos, "\n");
 	else if(key==Input::KEY_END)
 	{
 		unsigned row, col;
@@ -247,9 +283,7 @@ bool Entry::character(wchar_t ch)
 	{
 		if(selection_active)
 			erase_selection();
-		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
-		++edit_pos;
-		rebuild();
+		insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		return true;
 	}
 
@@ -344,8 +378,9 @@ void Entry::set_edit_position(unsigned ep, bool select)
 		selection_pos = edit_pos;
 	selection_active = select;
 
-	edit_pos = ep;
-	check_view_range();
+	edit_pos = min(ep, text.size());
+	if(multiline)
+		check_view_range();
 	rebuild();
 }
 
@@ -384,11 +419,7 @@ void Entry::check_view_range()
 	if(!multiline || !text_part)
 		return;
 
-	float font_size = style->get_font_size();
-	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
-
-	const Sides &margin = text_part->get_margin();
-	visible_rows = max((geom.h-margin.top-margin.bottom)/line_spacing, 1U);
+	visible_rows = text.get_visible_lines(*text_part, geom, 0);
 
 	unsigned row, col;
 	text.offset_to_coords(edit_pos, row, col);