Use a GL::Renderer to render widgets

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index a0df8cb9e423c1372c56997be5cf1ba74db50c9b..6e2063d04abec1de23c73baeb8417094c9ca0a73 100644 (file)
--- 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"
@@ -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,30 +104,42 @@ 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::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)
@@ -131,37 +147,24 @@ 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)
                {
                        text.erase(--edit_pos, 1);
                        check_view_range();
+                       rebuild();
                }
        }
        else if(key==Input::KEY_ENTER)
@@ -177,6 +181,7 @@ void Entry::key_press(unsigned key, unsigned)
                {
                        text.insert(edit_pos++, "\n");
                        check_view_range();
+                       rebuild();
                }
                else
                        signal_enter.emit();
@@ -189,6 +194,7 @@ void Entry::character(wchar_t ch)
        {
                text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                ++edit_pos;
+               rebuild();
        }
 }
 
@@ -218,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)