X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=bd1fe2cf22a112a28021622281d54dbdf47e5900;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=541675f7cb60799a3bf7cb3b50ef55154079aa78;hpb=707b59d45ae50b69c94918f8f74313283b304597;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 541675f..bd1fe2c 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -31,6 +31,11 @@ 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;
 
 private:
@@ -44,6 +49,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());
@@ -55,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);
@@ -69,15 +87,21 @@ private:
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-	virtual void key_press(unsigned, unsigned);
-	virtual void character(wchar_t);
+	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 reposition_slider();
+	void move_edit_position(Navigation, bool);
+	void set_edit_position(unsigned, bool);
+	void erase_selection(bool);
+	void check_cursor_blink();
 	void check_view_range();
 	void slider_value_changed(double);
 };