X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=8d3c47f82331ab5e3eb643b3e8af0f2941268b72;hb=46def086def19c58fb9e577312c07f2f7e758b34;hp=271c49a4b6cda21ca063f9e7e7339ea460c96de5;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 271c49a..8d3c47f 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2007-2011 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include +#include #include -#include #include #include "entry.h" #include "graphic.h" @@ -23,15 +16,41 @@ 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) { + input_type = INPUT_TEXT; set_text(t); } +void Entry::autosize_special(const Part &part, Geometry &ageom) const +{ + if(part.get_name()=="text") + { + const Sides &margin = part.get_margin(); + const GL::Font &font = style->get_font(); + unsigned en_width = static_cast(font.get_string_width("n")*style->get_font_size()); + ageom.w = max(ageom.w, edit_width*en_width+margin.left+margin.right); + + unsigned line_height = static_cast((font.get_ascent()-font.get_descent())*style->get_font_size()); + if(multiline) + { + unsigned line_spacing = style->get_font_size()*6/5; + ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom); + } + else + ageom.h = max(ageom.h, line_height+margin.top+margin.bottom); + } + else if(part.get_name()=="slider" && multiline) + autosize_child(*slider, part, ageom); +} + void Entry::set_text(const string &t) { text = t; @@ -39,6 +58,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) @@ -52,19 +80,20 @@ void Entry::set_multiline(bool m) add(*slider); slider->set_step(1); slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed)); - reposition_slider(); + rebuild(); } check_view_range(); } } -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, state, 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; @@ -75,81 +104,112 @@ 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") - slider->render(); -} - -void Entry::key_press(unsigned key, unsigned, wchar_t ch) -{ - if(key==Input::KEY_LEFT) { - if(edit_pos>0) + if(multiline) { - --edit_pos; - check_view_range(); + reposition_child(*slider, part); + Widget::rebuild_special(part); } } - else if(key==Input::KEY_RIGHT) + 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::touch_press(int x, int y, unsigned finger) +{ + if(finger==0) + set_focus(); + Widget::touch_press(x, y, finger); +} + +bool Entry::key_press(unsigned key, unsigned) +{ + got_key_press = true; + if(key==Input::KEY_BACKSPACE) { - if(edit_pos0) { - ++edit_pos; + text.erase(--edit_pos, 1); check_view_range(); + rebuild(); } } - else if(key==Input::KEY_DOWN && multiline) + else if(key==Input::KEY_ENTER && multiline) { - unsigned row, col; - text.offset_to_coords(edit_pos, row, col); - edit_pos = text.coords_to_offset(row+1, col); + text.insert(edit_pos++, "\n"); check_view_range(); + rebuild(); } - else if(key==Input::KEY_UP && multiline) + else + return false; + + return true; +} + +bool Entry::character(wchar_t ch) +{ + if(got_key_press && ch>=' ') { - 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; + text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); + ++edit_pos; + rebuild(); + return true; } - else if(key==Input::KEY_BACKSPACE) + + return false; +} + +void Entry::focus_out() +{ + Widget::focus_out(); + got_key_press = false; +} + +bool Entry::navigate(Navigation nav) +{ + if(nav==NAV_LEFT) { if(edit_pos>0) - { - text.erase(--edit_pos, 1); - check_view_range(); - } + set_edit_position(edit_pos-1); } - else if(key==Input::KEY_ENTER) + else if(nav==NAV_RIGHT) { - if(multiline) - { - text.insert(edit_pos++, "\n"); - check_view_range(); - } - else - signal_enter.emit(); + if(edit_pos=' ') + else if(nav==NAV_DOWN && multiline) { - text.insert(edit_pos, Codecs::encode(Codecs::ustring(1, ch))); - ++edit_pos; + unsigned row, col; + text.offset_to_coords(edit_pos, row, col); + set_edit_position(text.coords_to_offset(row+1, col)); } + else if(nav==NAV_UP && multiline) + { + unsigned row, col; + text.offset_to_coords(edit_pos, row, col); + set_edit_position(row>0 ? text.coords_to_offset(row-1, col) : 0); + } + else if(nav==NAV_ACCEPT && !signal_enter.empty()) + signal_enter.emit(); + else + return false; + + return true; } void Entry::on_geometry_change() { - reposition_slider(); - if(multiline) check_view_range(); } @@ -166,23 +226,15 @@ void Entry::on_style_change() text_part = style->get_part("text"); - reposition_slider(); - if(multiline) check_view_range(); } -void Entry::reposition_slider() +void Entry::set_edit_position(unsigned ep) { - if(!style || !slider) - return; - - if(const Part *slider_part = style->get_part("slider")) - { - Geometry sgeom = slider_part->get_geometry(); - slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin()); - slider->set_geometry(sgeom); - } + edit_pos = ep; + check_view_range(); + rebuild(); } void Entry::check_view_range() @@ -190,8 +242,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(font_size*6/5); const Sides &margin = text_part->get_margin(); @@ -205,12 +256,9 @@ void Entry::check_view_range() else if(row>=first_row+visible_rows) first_row = row+1-visible_rows; - if(slider) - { - unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows; - slider->set_range(0, scroll); - slider->set_value(scroll-first_row); - } + unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows; + slider->set_range(0, scroll); + slider->set_value(scroll-first_row); } void Entry::slider_value_changed(double value) @@ -220,9 +268,17 @@ void Entry::slider_value_changed(double value) } -Entry::Loader::Loader(Entry &ent): - Widget::Loader(ent) -{ } +Entry::Loader::Loader(Entry &e): + DataFile::DerivedObjectLoader(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