Refactor edit position adjustments from Entry::insert and delete

[libs/gltk.git] / source / entry.h

diff --git a/source/entry.h b/source/entry.h
index cd80ab0ac573b860b44775dbaa1aefbe6b88af2e..da29a5134f5fd4c3e7e9a86e58eeade3530057c4 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -31,6 +31,10 @@ public:
                void multiline(bool);
        };
 
+       sigc::signal<void, unsigned> signal_edit_position_changed;
+       sigc::signal<void, unsigned> signal_scroll_position_changed;
+       sigc::signal<void, const std::string &> signal_text_changed;
+
        // Deprecated
        sigc::signal<void> signal_enter;
 
@@ -46,6 +50,8 @@ private:
        VSlider *slider;
        bool got_key_press;
        bool cursor_blink;
+       bool selection_active;
+       unsigned selection_pos;
 
 public:
        Entry(const std::string & = std::string());
@@ -57,8 +63,18 @@ private:
 
 public:
        void set_text(const std::string &);
+       void insert(unsigned, const std::string &);
+       void erase(unsigned, unsigned);
        const std::string &get_text() const { return text.get(); }
 
+       void set_edit_position(unsigned p) { set_edit_position(p, false); }
+       unsigned get_edit_position() const { return edit_pos; }
+       unsigned get_scroll_position() const { return first_row; }
+       unsigned get_visible_rows() const { return visible_rows; }
+       bool get_selection(unsigned &, unsigned &) const;
+       void translate_position(unsigned, unsigned &, unsigned &) const;
+       unsigned translate_position(unsigned, unsigned) const;
+
        /** Sets the minimum size of the editing area, in characters and rows.  This
        only affects autosizing. */
        void set_edit_size(unsigned w, unsigned h);
@@ -79,10 +95,13 @@ public:
        virtual bool navigate(Navigation);
        virtual void animate(const Time::TimeDelta &);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 
-       void set_edit_position(unsigned);
+       void move_edit_position(Navigation, bool);
+       void adjust_edit_position_for_change(unsigned, int);
+       void set_edit_position(unsigned, bool);
+       void erase_selection(bool);
        void check_cursor_blink();
        void check_view_range();
        void slider_value_changed(double);