X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=6d13ccdd0377eaaff11b29db0c27981d5b9cacc0;hb=7c1b1b44dc3726d6cdb4681f9d44189eb4102a5a;hp=6e2063d04abec1de23c73baeb8417094c9ca0a73;hpb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 6e2063d..6d13ccd 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -16,70 +16,91 @@ 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), + cursor_blink(true), + selection_active(false), + selection_pos(0) { + input_type = INPUT_TEXT; set_text(t); } -void Entry::autosize() +void Entry::autosize_special(const Part &part, Geometry &ageom) const { - 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(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((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); } + else if(part.get_name()=="slider" && multiline) + autosize_child(*slider, part, ageom); +} - if(multiline) - { - if(const Part *slider_part = style->get_part("slider")) - { - 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; - } +void Entry::set_text(const string &t) +{ + text = t; + set_edit_position(text.size()); +} - 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); +void Entry::insert(unsigned pos, const string &t) +{ + text.insert(pos, t); - reposition_slider(); - } + if(edit_pos>=pos) + edit_pos += t.size(); + if(selection_active && selection_pos>=pos) + selection_pos += t.size(); + if(multiline) check_view_range(); + + 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(); } -void Entry::set_text(const string &t) +void Entry::set_edit_position(unsigned pos) { - text = t; - edit_pos = text.size(); + edit_pos = min(pos, text.size()); + selection_active = false; if(multiline) check_view_range(); @@ -87,6 +108,26 @@ void Entry::set_text(const string &t) 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; + edit_height = h; + signal_autosize_changed.emit(); +} + void Entry::set_multiline(bool m) { multiline = m; @@ -98,42 +139,96 @@ 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::rebuild_special(const Part &part, CachedPart &cache) +void Entry::rebuild_special(const Part &part) { if(part.get_name()=="text") - text.build(part, geom, first_row, cache); + text.build(part, state, geom, first_row, part_cache); else if(part.get_name()=="cursor") { - if(!text_part || !part.get_graphic(state)) - { - cache.texture = 0; + State cursor_state = (cursor_blink ? ACTIVE : NORMAL); + const Graphic *graphic = part.get_graphic(state|cursor_state); + if(!text_part || !graphic || !graphic->get_texture()) return; - } unsigned row, col; text.offset_to_coords(edit_pos, row, col); if(row=first_row+visible_rows) - { - cache.texture = 0; return; - } Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); - cache.texture = part.get_graphic(state)->get_texture(); - cache.clear_mesh(); - - GL::MeshBuilder bld(*cache.mesh); + GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture())); bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); - part.get_graphic(state)->build(part.get_geometry().w, part.get_geometry().h, bld); + graphic->build(part.get_geometry().w, part.get_geometry().h, bld); + } + else if(part.get_name()=="selection") + { + if(!selection_active) + return; + + const Graphic *graphic = part.get_graphic(state); + if(!text_part || !graphic || !graphic->get_texture()) + return; + + unsigned start = selection_pos; + unsigned end = edit_pos; + if(start>end) + swap(start, end); + + unsigned row, col; + text.offset_to_coords(start, row, col); + unsigned end_row, end_col; + text.offset_to_coords(end, end_row, end_col); + + if(end_row=first_row+visible_rows) + return; + + if(row=first_row+visible_rows) + { + end_row = first_row+visible_rows-1; + end_col = text.get_line_length(end_row); + } + + while(row<=end_row) + { + unsigned ec = (row==end_row ? end_col : text.get_line_length(row)); + if(ec>col) + { + Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); + Geometry egeom = text.coords_to_geometry(*text_part, geom, first_row, row, ec); + + GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture())); + bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); + graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld); + } + + ++row; + col = 0; + } } + else if(part.get_name()=="slider") + { + if(multiline) + { + reposition_child(*slider, part); + Widget::rebuild_special(part); + } + } + else + Widget::rebuild_special(part); } void Entry::render_special(const Part &part, GL::Renderer &renderer) const @@ -142,66 +237,115 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const slider->render(renderer); } -void Entry::key_press(unsigned key, unsigned) +void Entry::touch_press(int x, int y, unsigned finger) { - if(key==Input::KEY_LEFT) + if(finger==0) + set_focus(); + Widget::touch_press(x, y, finger); +} + +bool Entry::key_press(unsigned key, unsigned mod) +{ + got_key_press = true; + if(key==Input::KEY_BACKSPACE) { - if(edit_pos>0) - set_edit_position(edit_pos-1); + if(selection_active) + erase_selection(); + else if(edit_pos>0) + { + text.erase(--edit_pos, 1); + check_view_range(); + rebuild(); + } } - else if(key==Input::KEY_RIGHT) + else if(key==Input::KEY_DELETE) { - if(edit_pos0 ? text.coords_to_offset(row-1, col) : 0); - } - else if(key==Input::KEY_BACKSPACE) - { - if(edit_pos>0) - { - text.erase(--edit_pos, 1); - check_view_range(); - rebuild(); - } + set_edit_position(text.coords_to_offset(row, text.get_line_length(row)), mod==MOD_SHIFT); } - else if(key==Input::KEY_ENTER) + else if(key==Input::KEY_HOME) { - if(multiline) - { - text.insert(edit_pos++, "\n"); - check_view_range(); - rebuild(); - } - else - signal_enter.emit(); + unsigned row, col; + text.offset_to_coords(edit_pos, row, col); + set_edit_position(text.coords_to_offset(row, 0), mod==MOD_SHIFT); } + else if(key==Input::KEY_LEFT && mod==MOD_SHIFT) + move_edit_position(NAV_LEFT, true); + else if(key==Input::KEY_RIGHT && mod==MOD_SHIFT) + move_edit_position(NAV_RIGHT, true); + else if(key==Input::KEY_UP && mod==MOD_SHIFT && multiline) + move_edit_position(NAV_UP, true); + else if(key==Input::KEY_DOWN && mod==MOD_SHIFT && multiline) + move_edit_position(NAV_DOWN, true); + else + return false; + + return true; } -void Entry::character(wchar_t ch) +bool Entry::character(wchar_t ch) { - if(ch>=' ') + if(got_key_press && ch>=' ' && ch!=0x7F) { + if(selection_active) + erase_selection(); text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); ++edit_pos; rebuild(); + return true; } + + return false; } -void Entry::on_geometry_change() +void Entry::focus_in() { - reposition_slider(); + cursor_blink = true; + Widget::focus_in(); + check_cursor_blink(); +} +void Entry::focus_out() +{ + Widget::focus_out(); + got_key_press = false; + check_cursor_blink(); +} + +bool Entry::navigate(Navigation nav) +{ + if(nav==NAV_LEFT || nav==NAV_RIGHT || ((nav==NAV_DOWN || nav==NAV_UP) && multiline)) + move_edit_position(nav, false); + else if(nav==NAV_ACCEPT && !signal_enter.empty()) + signal_enter.emit(); + else + return false; + + return true; +} + +void Entry::animate(const Time::TimeDelta &) +{ + cursor_blink = !cursor_blink; + rebuild(); +} + +void Entry::on_geometry_change() +{ if(multiline) check_view_range(); } @@ -218,39 +362,77 @@ void Entry::on_style_change() text_part = style->get_part("text"); - reposition_slider(); - if(multiline) check_view_range(); + + check_cursor_blink(); } -void Entry::set_edit_position(unsigned ep) +void Entry::move_edit_position(Navigation nav, bool select) { + if(nav==NAV_LEFT) + { + if(edit_pos>0) + set_edit_position(edit_pos-1, select); + } + else if(nav==NAV_RIGHT) + { + if(edit_pos0 ? text.coords_to_offset(row-1, col) : 0), select); + } +} + +void Entry::set_edit_position(unsigned ep, bool select) +{ + if(select && !selection_active) + selection_pos = edit_pos; + selection_active = select; + edit_pos = ep; check_view_range(); rebuild(); } -void Entry::reposition_slider() +void Entry::erase_selection() { - if(!style || !slider) + if(!selection_active) return; - if(const Part *slider_part = style->get_part("slider")) + unsigned start = selection_pos; + unsigned end = edit_pos; + if(start>end) + swap(start, end); + + text.erase(start, end-start); + set_edit_position(start, false); +} + +void Entry::check_cursor_blink() +{ + cursor_blink = (state&FOCUS); + if((state&FOCUS) && style) { - Geometry sgeom = slider_part->get_geometry(); - if(!sgeom.w || !sgeom.h) + const Part *cursor_part = style->get_part("cursor"); + if(cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS)) { - slider->autosize(); - if(!sgeom.w) - sgeom.w = slider->get_geometry().w; - if(!sgeom.h) - sgeom.h = slider->get_geometry().h; + set_animation_interval(Time::sec/2); + return; } - - slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin()); - slider->set_geometry(sgeom); } + + stop_animation(); } void Entry::check_view_range() @@ -258,11 +440,7 @@ void Entry::check_view_range() if(!multiline || !text_part) return; - float font_size = style->get_font_size(); - unsigned line_spacing = static_cast(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); @@ -284,9 +462,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