]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/entry.cpp
Some new datafile keywords
[libs/gltk.git] / source / entry.cpp
index a0df8cb9e423c1372c56997be5cf1ba74db50c9b..12eff06ae4ffbc542e3b80726242b60ea03ee4ee 100644 (file)
@@ -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"
@@ -16,61 +16,51 @@ namespace GLtk {
 Entry::Entry(const string &t):
        text(),
        multiline(false),
+       edit_width(10),
+       edit_height(1),
        edit_pos(0),
        first_row(0),
        visible_rows(1),
        text_part(0),
-       slider(0)
+       slider(0),
+       got_key_press(false)
 {
        set_text(t);
 }
 
-void Entry::autosize()
+void Entry::autosize_special(const Part &part, Geometry &ageom)
 {
-       if(!style)
-               return;
-
-       Widget::autosize();
-
-       if(text_part)
+       if(part.get_name()=="text")
        {
-               const Sides &margin = text_part->get_margin();
+               const Sides &margin = part.get_margin();
                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);
+               ageom.w = max(ageom.w, edit_width*en_width+margin.left+margin.right);
 
                unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
                if(multiline)
                {
                        unsigned line_spacing = style->get_font_size()*6/5;
-                       geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom);
+                       ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom);
                }
                else
-                       geom.h = max(geom.h, line_height+margin.top+margin.bottom);
+                       ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
        }
-
-       if(multiline)
+       else if(part.get_name()=="slider" && multiline)
        {
-               if(const Part *slider_part = style->get_part("slider"))
+               Geometry sgeom = part.get_geometry();
+               if(!sgeom.w || !sgeom.h)
                {
-                       Geometry sgeom = slider_part->get_geometry();
-                       if(!sgeom.w || !sgeom.h)
-                       {
-                               slider->autosize();
-                               if(!sgeom.w)
-                                       sgeom.w = slider->get_geometry().w;
-                               if(!sgeom.h)
-                                       sgeom.h = slider->get_geometry().h;
-                       }
-
-                       const Sides &margin = slider_part->get_margin();
-                       geom.w = max(geom.w, sgeom.w+margin.left+margin.right);
-                       geom.h = max(geom.h, sgeom.h+margin.top+margin.bottom);
-
-                       reposition_slider();
+                       slider->autosize();
+                       if(!sgeom.w)
+                               sgeom.w = slider->get_geometry().w;
+                       if(!sgeom.h)
+                               sgeom.h = slider->get_geometry().h;
                }
 
-               check_view_range();
+               const Sides &margin = part.get_margin();
+               ageom.w = max(ageom.w, sgeom.w+margin.left+margin.right);
+               ageom.h = max(ageom.h, sgeom.h+margin.top+margin.bottom);
        }
 }
 
@@ -81,6 +71,15 @@ void Entry::set_text(const string &t)
 
        if(multiline)
                check_view_range();
+
+       rebuild();
+}
+
+void Entry::set_edit_size(unsigned w, unsigned h)
+{
+       edit_width = w;
+       edit_height = h;
+       signal_autosize_changed.emit();
 }
 
 void Entry::set_multiline(bool m)
@@ -100,13 +99,14 @@ void Entry::set_multiline(bool m)
        }
 }
 
-void Entry::render_special(const Part &part) const
+void Entry::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.render(part, geom, first_row);
+               text.build(part, geom, first_row, part_cache);
        else if(part.get_name()=="cursor")
        {
-               if(!text_part || !part.get_graphic(state))
+               const Graphic *graphic = part.get_graphic(state);
+               if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
                unsigned row, col;
@@ -117,51 +117,44 @@ void Entry::render_special(const Part &part) const
 
                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();
+               GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
+               bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+               graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
        }
-       else if(part.get_name()=="slider" && multiline)
-               slider->render();
+       else
+               Widget::rebuild_special(part);
+}
+
+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)
 {
+       got_key_press = true;
        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 +162,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 +171,7 @@ void Entry::key_press(unsigned key, unsigned)
                {
                        text.insert(edit_pos++, "\n");
                        check_view_range();
+                       rebuild();
                }
                else
                        signal_enter.emit();
@@ -185,13 +180,20 @@ void Entry::key_press(unsigned key, unsigned)
 
 void Entry::character(wchar_t ch)
 {
-       if(ch>=' ')
+       if(got_key_press && ch>=' ')
        {
                text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                ++edit_pos;
+               rebuild();
        }
 }
 
+void Entry::focus_out()
+{
+       Widget::focus_out();
+       got_key_press = false;
+}
+
 void Entry::on_geometry_change()
 {
        reposition_slider();
@@ -218,6 +220,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)
@@ -271,9 +280,17 @@ void Entry::slider_value_changed(double value)
 }
 
 
-Entry::Loader::Loader(Entry &ent):
-       Widget::Loader(ent)
-{ }
+Entry::Loader::Loader(Entry &e):
+       DataFile::DerivedObjectLoader<Entry, Widget::Loader>(e)
+{
+       add("edit_size", &Entry::edit_width, &Entry::edit_height);
+       add("multiline", &Loader::multiline);
+}
+
+void Entry::Loader::multiline(bool m)
+{
+       obj.set_multiline(m);
+}
 
 } // namespace GLtk
 } // namespace Msp