X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=5aadbc262d355805e3b4fe338714a2a0bb8d4311;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=19bb7cc48b9f038d86d95401941e5b30f71cbe02;hpb=3bf64bbd84cfd7a3d30c8cfbd70cacd073bccb04;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 19bb7cc..5aadbc2 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -5,28 +5,15 @@ #include "entry.h" #include "graphic.h" #include "part.h" +#include "slider.h" #include "style.h" -#include "vslider.h" using namespace std; namespace Msp { 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), - got_key_press(false), - cursor_blink(true), - selection_active(false), - selection_pos(0) +Entry::Entry(const string &t) { input_type = INPUT_TEXT; set_text(t); @@ -56,44 +43,42 @@ void Entry::autosize_special(const Part &part, Geometry &ageom) const void Entry::set_text(const string &t) { - text = t; + if(t!=text.get()) + { + text = t; + signal_text_changed.emit(text.get()); + } set_edit_position(text.size()); } void Entry::insert(unsigned pos, const string &t) { - text.insert(pos, t); + if(t.empty()) + return; - if(edit_pos>=pos) - edit_pos += t.size(); - if(selection_active && selection_pos>=pos) - selection_pos += t.size(); + text.insert(pos, t); + signal_text_changed.emit(text.get()); + adjust_edit_position_for_change(pos, t.size()); if(multiline) check_view_range(); - rebuild(); + mark_rebuild(); } void Entry::erase(unsigned pos, unsigned len) { - text.erase(pos, len); + if(!len) + return; - 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; - } + text.erase(pos, len); + signal_text_changed.emit(text.get()); + adjust_edit_position_for_change(pos, -len); if(multiline) check_view_range(); - rebuild(); + + mark_rebuild(); } bool Entry::get_selection(unsigned &start, unsigned &end) const @@ -109,6 +94,16 @@ bool Entry::get_selection(unsigned &start, unsigned &end) const return true; } +void Entry::translate_position(unsigned pos, unsigned &row, unsigned &col) const +{ + text.offset_to_coords(pos, row, col); +} + +unsigned Entry::translate_position(unsigned row, unsigned col) const +{ + return text.coords_to_offset(row, col); +} + void Entry::set_edit_size(unsigned w, unsigned h) { edit_width = w; @@ -127,7 +122,7 @@ 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)); - rebuild(); + mark_rebuild(); } check_view_range(); } @@ -153,7 +148,7 @@ void Entry::rebuild_special(const Part &part) Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture())); - bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); + bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0)); graphic->build(part.get_geometry().w, part.get_geometry().h, bld); } else if(part.get_name()=="selection") @@ -165,10 +160,8 @@ void Entry::rebuild_special(const Part &part) if(!text_part || !graphic || !graphic->get_texture()) return; - unsigned start = selection_pos; - unsigned end = edit_pos; - if(start>end) - swap(start, end); + unsigned start, end; + get_selection(start, end); unsigned row, col; text.offset_to_coords(start, row, col); @@ -199,7 +192,7 @@ void Entry::rebuild_special(const Part &part) 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); + bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0)); graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld); } @@ -238,16 +231,22 @@ bool Entry::key_press(unsigned key, unsigned mod) if(key==Input::KEY_BACKSPACE) { if(selection_active) - erase_selection(); + erase_selection(true); else if(edit_pos>0) - erase(edit_pos-1, 1); + { + unsigned start_pos = text.move_offset(edit_pos, -1); + erase(start_pos, edit_pos-start_pos); + } } else if(key==Input::KEY_DELETE) { if(selection_active) - erase_selection(); + erase_selection(true); else - erase(edit_pos, 1); + { + unsigned end_pos = text.move_offset(edit_pos, 1); + erase(edit_pos, end_pos-edit_pos); + } } else if(key==Input::KEY_ENTER && multiline) insert(edit_pos, "\n"); @@ -263,6 +262,18 @@ bool Entry::key_press(unsigned key, unsigned mod) 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_PGUP) + { + unsigned row, col; + text.offset_to_coords(edit_pos, row, col); + set_edit_position(text.coords_to_offset((row=' ' && ch!=0x7F) { if(selection_active) - erase_selection(); + erase_selection(false); insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); return true; } @@ -308,8 +319,6 @@ 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; @@ -319,10 +328,10 @@ bool Entry::navigate(Navigation nav) void Entry::animate(const Time::TimeDelta &) { cursor_blink = !cursor_blink; - rebuild(); + mark_rebuild(); } -void Entry::on_geometry_change() +void Entry::on_size_change() { if(multiline) check_view_range(); @@ -334,7 +343,7 @@ void Entry::on_style_change() if(!style) { - text_part = 0; + text_part = nullptr; return; } @@ -349,15 +358,9 @@ void Entry::on_style_change() void Entry::move_edit_position(Navigation nav, bool select) { if(nav==NAV_LEFT) - { - if(edit_pos>0) - set_edit_position(edit_pos-1, select); - } + set_edit_position(text.move_offset(edit_pos, -1), select); else if(nav==NAV_RIGHT) - { - if(edit_pos0 ? text.coords_to_offset(row-1, col) : 0), select); } + else + throw invalid_argument("Entry::move_edit_position"); +} + +void Entry::adjust_edit_position_for_change(unsigned pos, int change) +{ + unsigned old_edit_pos = edit_pos; + unsigned old_select_pos = selection_pos; + + if(change>0) + { + if(edit_pos>=pos) + edit_pos += change; + if(selection_active && selection_pos>=pos) + selection_pos += change; + } + else if(change<0) + { + if(edit_pos>=pos) + edit_pos -= min(edit_pos-pos, -change); + if(selection_active && selection_pos>=pos) + selection_pos -= min(selection_pos-pos, -change); + } + + if(edit_pos!=old_edit_pos) + signal_edit_position_changed.emit(edit_pos); + if(selection_active && (edit_pos!=old_edit_pos || selection_pos!=old_select_pos)) + { + unsigned start, end; + if(get_selection(start, end)) + signal_selection_changed.emit(start, end); + } } void Entry::set_edit_position(unsigned ep, bool select) { + bool selection_was_active = selection_active; if(select && !selection_active) selection_pos = edit_pos; selection_active = select; + unsigned old_edit_pos = edit_pos; edit_pos = min(ep, text.size()); + + if(edit_pos!=old_edit_pos) + { + signal_edit_position_changed.emit(edit_pos); + unsigned start, end; + if(get_selection(start, end)) + signal_selection_changed.emit(start, end); + else if(selection_was_active) + signal_selection_changed.emit(edit_pos, edit_pos); + } + if(multiline) check_view_range(); - rebuild(); + mark_rebuild(); } -void Entry::erase_selection() +void Entry::erase_selection(bool emit_change) { - if(!selection_active) + unsigned start, end; + if(!get_selection(start, end)) return; - unsigned start = selection_pos; - unsigned end = edit_pos; - if(start>end) - swap(start, end); - text.erase(start, end-start); + if(emit_change) + signal_text_changed.emit(text.get()); set_edit_position(start, false); } void Entry::check_cursor_blink() { + const Part *cursor_part = style->get_part("cursor"); + bool has_blink = (cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS)); + cursor_blink = (state&FOCUS); - if((state&FOCUS) && style) + if((state&FOCUS) && style && has_blink) { - const Part *cursor_part = style->get_part("cursor"); - if(cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS)) - { - set_animation_interval(Time::sec/2); - return; - } + set_animation_interval(Time::sec/2); + mark_rebuild(); + } + else + { + if(has_blink) + mark_rebuild(); + stop_animation(); } - - stop_animation(); } void Entry::check_view_range() @@ -419,25 +468,39 @@ void Entry::check_view_range() if(!multiline || !text_part) return; - visible_rows = text.get_visible_lines(*text_part, geom, 0); + visible_rows = text.get_visible_lines(*text_part, geom, nullptr); unsigned row, col; text.offset_to_coords(edit_pos, row, col); + unsigned old_first_row = first_row; if(first_row>row) first_row = row; else if(row>=first_row+visible_rows) first_row = row+1-visible_rows; unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows; + if(first_row>scroll) + first_row = scroll; + + if(first_row!=old_first_row) + signal_scroll_position_changed.emit(first_row); + slider->set_range(0, scroll); + slider->set_page_size(visible_rows); slider->set_value(scroll-first_row); } void Entry::slider_value_changed(double value) { if(text.get_n_lines()>visible_rows) + { + unsigned old_first_row = first_row; first_row = text.get_n_lines()-visible_rows-static_cast(value); + if(first_row!=old_first_row) + signal_scroll_position_changed.emit(first_row); + mark_rebuild(); + } }