X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=f75f2005bc2cdd880d4960cf26b6f1db2cde6cf1;hb=b391f4b774d17c53dfd9062fc7c7a6b14f72f926;hp=36658dae18c0cf90bf73642a8ea77eab364f9ef1;hpb=b600936dca600693729eb800b6952070f204a63f;p=libs%2Fgltk.git diff --git a/source/entry.cpp b/source/entry.cpp index 36658da..f75f200 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,7 +56,11 @@ 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()); } @@ -66,21 +70,13 @@ void Entry::insert(unsigned pos, const string &t) 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); + adjust_edit_position_for_change(pos, t.size()); if(multiline) check_view_range(); - rebuild(); + mark_rebuild(); } void Entry::erase(unsigned pos, unsigned len) @@ -89,28 +85,13 @@ void Entry::erase(unsigned pos, unsigned 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); + adjust_edit_position_for_change(pos, -len); if(multiline) check_view_range(); - rebuild(); + mark_rebuild(); } bool Entry::get_selection(unsigned &start, unsigned &end) const @@ -154,7 +135,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(); } @@ -265,14 +246,20 @@ bool Entry::key_press(unsigned key, unsigned mod) if(selection_active) 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(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"); @@ -288,6 +275,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((row0) - 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; @@ -407,11 +433,18 @@ void Entry::set_edit_position(unsigned ep, bool select) 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(bool emit_change) @@ -428,18 +461,21 @@ void Entry::erase_selection(bool emit_change) 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() @@ -466,6 +502,7 @@ void Entry::check_view_range() signal_scroll_position_changed.emit(first_row); slider->set_range(0, scroll); + slider->set_page_size(visible_rows); slider->set_value(scroll-first_row); } @@ -477,6 +514,7 @@ void Entry::slider_value_changed(double value) 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(); } }