X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=4c1713a022306d4b7670ef3953be2a62457f85a9;hb=5f73de83d46138faa2b4c1b0a725d0a705988388;hp=af6fcc6d0fd31ed5cfdbdc03f4fda57e9db6c55c;hpb=608412d18b9c42871277911c11ae885a53d83990;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index af6fcc6..4c1713a 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -5,8 +5,8 @@ #include "entry.h" #include "graphic.h" #include "part.h" +#include "slider.h" #include "style.h" -#include "vslider.h" using namespace std; @@ -56,13 +56,88 @@ void Entry::autosize_special(const Part &part, Geometry &ageom) const void Entry::set_text(const string &t) { - text = t; - edit_pos = text.size(); + 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) +{ + if(t.empty()) + return; + + text.insert(pos, t); + + unsigned old_edit_pos = edit_pos; + if(edit_pos>=pos) + edit_pos += t.size(); + if(selection_active && selection_pos>=pos) + selection_pos += t.size(); + + signal_text_changed.emit(text.get()); + if(edit_pos!=old_edit_pos) + signal_edit_position_changed.emit(edit_pos); if(multiline) check_view_range(); - rebuild(); + mark_rebuild(); +} + +void Entry::erase(unsigned pos, unsigned len) +{ + if(!len) + return; + + text.erase(pos, len); + + unsigned old_edit_pos = edit_pos; + 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; + } + + signal_text_changed.emit(text.get()); + if(edit_pos!=old_edit_pos) + signal_edit_position_changed.emit(edit_pos); + + if(multiline) + check_view_range(); + + mark_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::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) @@ -83,7 +158,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(); } @@ -121,10 +196,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); @@ -194,27 +267,25 @@ 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) { - text.erase(--edit_pos, 1); - check_view_range(); - rebuild(); + 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 - text.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) - { - text.insert(edit_pos++, "\n"); - check_view_range(); - rebuild(); - } + insert(edit_pos, "\n"); else if(key==Input::KEY_END) { unsigned row, col; @@ -227,6 +298,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(); - text.insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); - ++edit_pos; - rebuild(); + erase_selection(false); + insert(edit_pos, StringCodec::encode(StringCodec::ustring(1, ch))); return true; } @@ -285,10 +366,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(); @@ -315,15 +396,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::set_edit_position(unsigned ep, bool select) @@ -344,39 +421,46 @@ void Entry::set_edit_position(unsigned ep, bool select) selection_pos = edit_pos; selection_active = select; - edit_pos = ep; - check_view_range(); - rebuild(); + 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); + + if(multiline) + check_view_range(); + 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() @@ -384,29 +468,39 @@ 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); + 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(); + } }