]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/entry.cpp
Rework how widget ownership works in Container
[libs/gltk.git] / source / entry.cpp
index fec27397eaf8a445f068e8edf19b2d6f0decb882..b2c78004b233b6ad9243e781639a6756a417387e 100644 (file)
@@ -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,47 +43,45 @@ 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)
+void Entry::insert(size_t 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)
+void Entry::erase(size_t pos, size_t 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
+bool Entry::get_selection(size_t &start, size_t &end) const
 {
        if(!selection_active)
                return false;
@@ -109,6 +94,16 @@ bool Entry::get_selection(unsigned &start, unsigned &end) const
        return true;
 }
 
+void Entry::translate_position(size_t pos, size_t &row, size_t &col) const
+{
+       text.offset_to_coords(pos, row, col);
+}
+
+size_t Entry::translate_position(size_t row, size_t col) const
+{
+       return text.coords_to_offset(row, col);
+}
+
 void Entry::set_edit_size(unsigned w, unsigned h)
 {
        edit_width = w;
@@ -123,11 +118,12 @@ void Entry::set_multiline(bool m)
        {
                if(!slider)
                {
-                       slider = new VSlider;
-                       add(*slider);
+                       unique_ptr<VSlider> s = make_unique<VSlider>();
+                       slider = s.get();
+                       add(move(s));
                        slider->set_step(1);
                        slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-                       rebuild();
+                       mark_rebuild();
                }
                check_view_range();
        }
@@ -144,7 +140,7 @@ void Entry::rebuild_special(const Part &part)
                if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
 
                if(row<first_row || row>=first_row+visible_rows)
@@ -153,7 +149,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,12 +161,12 @@ void Entry::rebuild_special(const Part &part)
                if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
-               unsigned start, end;
+               size_t start, end;
                get_selection(start, end);
 
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(start, row, col);
-               unsigned end_row, end_col;
+               size_t end_row, end_col;
                text.offset_to_coords(end, end_row, end_col);
 
                if(end_row<first_row || row>=first_row+visible_rows)
@@ -190,14 +186,14 @@ void Entry::rebuild_special(const Part &part)
 
                while(row<=end_row)
                {
-                       unsigned ec = (row==end_row ? end_col : text.get_line_length(row));
+                       size_t 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);
+                               bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
                                graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld);
                        }
 
@@ -236,31 +232,49 @@ 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);
+               {
+                       size_t 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);
+               {
+                       size_t 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");
        else if(key==Input::KEY_END)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row, text.get_line_length(row)), mod==MOD_SHIFT);
        }
        else if(key==Input::KEY_HOME)
        {
-               unsigned row, col;
+               size_t 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_PGUP)
+       {
+               size_t row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(text.coords_to_offset((row<visible_rows ? 0 : row-visible_rows), col), mod==MOD_SHIFT);
+       }
+       else if(key==Input::KEY_PGDN)
+       {
+               size_t row, col;
+               text.offset_to_coords(edit_pos, row, col);
+               set_edit_position(text.coords_to_offset(row+visible_rows, col), 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)
@@ -280,7 +294,7 @@ bool Entry::character(wchar_t ch)
        if(got_key_press && ch>=' ' && ch!=0x7F)
        {
                if(selection_active)
-                       erase_selection();
+                       erase_selection(false);
                insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                return true;
        }
@@ -306,8 +320,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;
 
@@ -317,10 +329,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();
@@ -332,11 +344,11 @@ void Entry::on_style_change()
 
        if(!style)
        {
-               text_part = 0;
+               text_part = nullptr;
                return;
        }
 
-       text_part = style->get_part("text");
+       text_part = style->find_part("text");
 
        if(multiline)
                check_view_range();
@@ -347,65 +359,109 @@ 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_pos<text.size())
-                       set_edit_position(edit_pos+1, select);
-       }
+               set_edit_position(text.move_offset(edit_pos, 1), select);
        else if(nav==NAV_DOWN)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row+1, col), select);
        }
        else if(nav==NAV_UP)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position((row>0 ? 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)
+void Entry::adjust_edit_position_for_change(size_t pos, ptrdiff_t change)
 {
+       size_t old_edit_pos = edit_pos;
+       size_t 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<size_t>(edit_pos-pos, -change);
+               if(selection_active && selection_pos>=pos)
+                       selection_pos -= min<size_t>(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))
+       {
+               size_t start, end;
+               if(get_selection(start, end))
+                       signal_selection_changed.emit(start, end);
+       }
+}
+
+void Entry::set_edit_position(size_t ep, bool select)
+{
+       bool selection_was_active = selection_active;
        if(select && !selection_active)
                selection_pos = edit_pos;
        selection_active = select;
 
+       size_t old_edit_pos = edit_pos;
        edit_pos = min(ep, text.size());
+
+       if(edit_pos!=old_edit_pos)
+       {
+               signal_edit_position_changed.emit(edit_pos);
+               size_t 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)
 {
-       unsigned start, end;
+       size_t start, end;
        if(!get_selection(start, end))
                return;
 
        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->find_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()
@@ -413,25 +469,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;
+       size_t row, col;
        text.offset_to_coords(edit_pos, row, col);
 
+       size_t 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;
+       size_t scroll = max<size_t>(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)
-               first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
+       {
+               size_t old_first_row = first_row;
+               first_row = text.get_n_lines()-visible_rows-static_cast<size_t>(value);
+               if(first_row!=old_first_row)
+                       signal_scroll_position_changed.emit(first_row);
+               mark_rebuild();
+       }
 }