X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=6e2063d04abec1de23c73baeb8417094c9ca0a73;hb=815194201203afd6fa59e650e1007a355c829544;hp=ec6bba702983081fa0de856911da0484a3b50953;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index ec6bba7..6e2063d 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -1,6 +1,6 @@
 #include <msp/gl/matrix.h>
+#include <msp/gl/meshbuilder.h>
 #include <msp/gl/texture.h>
-#include <msp/gl/transform.h>
 #include <msp/input/keys.h>
 #include "entry.h"
 #include "graphic.h"
@@ -35,14 +35,14 @@ void Entry::autosize()
 	if(text_part)
 	{
 		const Sides &margin = text_part->get_margin();
-		const GL::Font &font = *style->get_font();
-		unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*font.get_native_size());
+		const GL::Font &font = style->get_font();
+		unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*style->get_font_size());
 		geom.w = max(geom.w, 10*en_width+margin.left+margin.right);
 
-		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_native_size());
+		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
 		if(multiline)
 		{
-			unsigned line_spacing = font.get_native_size()*6/5;
+			unsigned line_spacing = style->get_font_size()*6/5;
 			geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom);
 		}
 		else
@@ -72,6 +72,8 @@ void Entry::autosize()
 
 		check_view_range();
 	}
+
+	rebuild();
 }
 
 void Entry::set_text(const string &t)
@@ -81,6 +83,8 @@ void Entry::set_text(const string &t)
 
 	if(multiline)
 		check_view_range();
+
+	rebuild();
 }
 
 void Entry::set_multiline(bool m)
@@ -100,68 +104,67 @@ void Entry::set_multiline(bool m)
 	}
 }
 
-void Entry::render_special(const Part &part) const
+void Entry::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="text")
-		text.render(part, geom, first_row);
+		text.build(part, geom, first_row, cache);
 	else if(part.get_name()=="cursor")
 	{
 		if(!text_part || !part.get_graphic(state))
+		{
+			cache.texture = 0;
 			return;
+		}
 
 		unsigned row, col;
 		text.offset_to_coords(edit_pos, row, col);
 
 		if(row<first_row || row>=first_row+visible_rows)
+		{
+			cache.texture = 0;
 			return;
+		}
 
 		Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
 
-		GL::push_matrix();
-		GL::translate(rgeom.x, rgeom.y, 0);
-		part.get_graphic(state)->render(part.get_geometry().w, part.get_geometry().h);
-		GL::pop_matrix();
+		cache.texture = part.get_graphic(state)->get_texture();
+		cache.clear_mesh();
+
+		GL::MeshBuilder bld(*cache.mesh);
+		bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+		part.get_graphic(state)->build(part.get_geometry().w, part.get_geometry().h, bld);
 	}
-	else if(part.get_name()=="slider" && multiline)
-		slider->render();
 }
 
-void Entry::key_press(unsigned key, unsigned, wchar_t ch)
+void Entry::render_special(const Part &part, GL::Renderer &renderer) const
+{
+	if(part.get_name()=="slider" && multiline)
+		slider->render(renderer);
+}
+
+void Entry::key_press(unsigned key, unsigned)
 {
 	if(key==Input::KEY_LEFT)
 	{
 		if(edit_pos>0)
-		{
-			--edit_pos;
-			check_view_range();
-		}
+			set_edit_position(edit_pos-1);
 	}
 	else if(key==Input::KEY_RIGHT)
 	{
 		if(edit_pos<text.size())
-		{
-			++edit_pos;
-			check_view_range();
-		}
+			set_edit_position(edit_pos+1);
 	}
 	else if(key==Input::KEY_DOWN && multiline)
 	{
 		unsigned row, col;
 		text.offset_to_coords(edit_pos, row, col);
-		edit_pos = text.coords_to_offset(row+1, col);
-		check_view_range();
+		set_edit_position(text.coords_to_offset(row+1, col));
 	}
 	else if(key==Input::KEY_UP && multiline)
 	{
 		unsigned row, col;
 		text.offset_to_coords(edit_pos, row, col);
-		if(row>0)
-		{
-			edit_pos = text.coords_to_offset(row-1, col);
-			check_view_range();
-		}
-		else
-			edit_pos = 0;
+		set_edit_position(row>0 ? text.coords_to_offset(row-1, col) : 0);
 	}
 	else if(key==Input::KEY_BACKSPACE)
 	{
@@ -169,6 +172,7 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 		{
 			text.erase(--edit_pos, 1);
 			check_view_range();
+			rebuild();
 		}
 	}
 	else if(key==Input::KEY_ENTER)
@@ -177,14 +181,20 @@ void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 		{
 			text.insert(edit_pos++, "\n");
 			check_view_range();
+			rebuild();
 		}
 		else
 			signal_enter.emit();
 	}
-	else if(ch>=' ')
+}
+
+void Entry::character(wchar_t ch)
+{
+	if(ch>=' ')
 	{
-		text.insert(edit_pos, Codecs::encode<Codecs::Utf8>(Codecs::ustring(1, ch)));
+		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		++edit_pos;
+		rebuild();
 	}
 }
 
@@ -214,6 +224,13 @@ void Entry::on_style_change()
 		check_view_range();
 }
 
+void Entry::set_edit_position(unsigned ep)
+{
+	edit_pos = ep;
+	check_view_range();
+	rebuild();
+}
+
 void Entry::reposition_slider()
 {
 	if(!style || !slider)
@@ -241,8 +258,7 @@ void Entry::check_view_range()
 	if(!multiline || !text_part)
 		return;
 
-	const GL::Font *font = style->get_font();
-	float font_size = font->get_default_size();
+	float font_size = style->get_font_size();
 	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
 
 	const Sides &margin = text_part->get_margin();