X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=165b7c731a91ef110cf1a9180b57e96ae079ea59;hb=b391f4b774d17c53dfd9062fc7c7a6b14f72f926;hp=cd7d9bc4690636b8d9164c0c63d452ee037cfb91;hpb=45a351cb7bd00fd5d847507f020541f883599178;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index cd7d9bc..165b7c7 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,12 +22,21 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
 	{
 	public:
 		Loader(Entry &);
+
+	private:
+		void multiline(bool);
 	};
 
+	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;
+
+	// Deprecated
 	sigc::signal<void> signal_enter;
 
 private:
@@ -41,17 +50,32 @@ 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());
 
 	virtual const char *get_class() const { return "entry"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
 
+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);
@@ -60,19 +84,26 @@ public:
 	bool is_multiline() const { return multiline; }
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void rebuild_special(const Part &);
 	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 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);
 };