X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=f7dd4ae8a76fe5489064ee9b4a613670ecaa016d;hb=771764f735ffe01cb170a10b24eb7dfc2a81b34d;hp=a3b160735b61ad22b31704296db48ff9c71b5d70;hpb=46def086def19c58fb9e577312c07f2f7e758b34;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index a3b1607..f7dd4ae 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -31,8 +31,10 @@ public:
 		void multiline(bool);
 	};
 
-	// Deprecated
-	sigc::signal<void> signal_enter;
+	sigc::signal<void, unsigned> signal_edit_position_changed;
+	sigc::signal<void, unsigned> signal_scroll_position_changed;
+	sigc::signal<void, unsigned, unsigned> signal_selection_changed;
+	sigc::signal<void, const std::string &> signal_text_changed;
 
 private:
 	Text text;
@@ -45,6 +47,9 @@ private:
 	const Part *text_part;
 	VSlider *slider;
 	bool got_key_press;
+	bool cursor_blink;
+	bool selection_active;
+	unsigned selection_pos;
 
 public:
 	Entry(const std::string & = std::string());
@@ -56,8 +61,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);
@@ -73,13 +88,19 @@ public:
 	virtual void touch_press(int, int, unsigned);
 	virtual bool key_press(unsigned, unsigned);
 	virtual bool character(wchar_t);
+	virtual void focus_in();
 	virtual void focus_out();
 	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);
 };