X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=4854340a14f730a1fe90fcc9c847be1ce87514ce;hb=ec63df81f6c3f77454b0fe3bdae24876c84616b1;hp=2c9c31448cd4f2c6c3b6403297956109427b412e;hpb=131ac8ff2c06f94d40f4bf98d4a6ec0d113cdffc;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 2c9c314..4854340 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,26 +1,85 @@
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "container.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Entry: public Widget
+class VSlider;
+
+/**
+Text entry field.
+
+Special parts:
+
+  text    The current text of the widget.  Graphics are ignored.
+  cursor  Indicates the current input position.  Fill_x is ignored.
+  slider  A vertical slider for multiline entries.
+*/
+class Entry: virtual public Widget, private Container
 {
 public:
-	Entry(const Resources &, const std::string & =std::string());
-	void set_text(const std::string &);
-	const std::string &get_text() const { return text; }
-	void key_press(unsigned, unsigned, wchar_t);
-	void focus_in();
-	void focus_out();
+	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
+	{
+	public:
+		Loader(Entry &);
+
+	private:
+		void multiline(bool);
+	};
+
+	sigc::signal<void> signal_enter;
+
 private:
-	std::string text;
+	Text text;
+	bool multiline;
+	unsigned edit_width;
+	unsigned edit_height;
 	unsigned edit_pos;
+	unsigned first_row;
+	unsigned visible_rows;
+	const Part *text_part;
+	VSlider *slider;
+	bool got_key_press;
+
+public:
+	Entry(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "entry"; }
+
+private:
+	virtual void autosize_special(const Part &, Geometry &);
+
+public:
+	void set_text(const std::string &);
+	const std::string &get_text() const { return text.get(); }
+
+	/** Sets the minimum size of the editing area, in characters and rows.  This
+	only affects autosizing. */
+	void set_edit_size(unsigned w, unsigned h);
+
+	void set_multiline(bool);
+	bool is_multiline() const { return multiline; }
+
+private:
+	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 focus_out();
+private:
+	virtual void on_geometry_change();
+	virtual void on_style_change();
 
-	const char *get_class() const { return "entry"; }
-	void render_part(const Part &) const;
+	void set_edit_position(unsigned);
+	void reposition_slider();
+	void check_view_range();
+	void slider_value_changed(double);
 };
 
 } // namespace GLtk