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

diff --git a/source/entry.h b/source/entry.h
index c880bb4..cd7d9bc 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,18 +1,15 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "container.h"
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
+class VSlider;
+
 /**
 Text entry field.
 
@@ -20,8 +17,9 @@ 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: public Widget
+class Entry: virtual public Widget, private Container
 {
 public:
 	class Loader: public Widget::Loader
@@ -30,22 +28,53 @@ public:
 		Loader(Entry &);
 	};
 
+	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 Resources &, const std::string & =std::string());
+	Entry(const std::string & = std::string());
+
+	virtual const char *get_class() const { return "entry"; }
+
+	virtual void autosize();
 
 	void set_text(const std::string &);
-	const std::string &get_text() const { return text; }
+	const std::string &get_text() const { return text.get(); }
 
-	virtual void key_press(unsigned, unsigned, wchar_t);
-	virtual void focus_in();
+	/** 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 &, CachedPart &);
+	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 const char *get_class() const { return "entry"; }
-	virtual void render_special(const Part &) const;
+	virtual void on_geometry_change();
+	virtual void on_style_change();
+
+	void set_edit_position(unsigned);
+	void reposition_slider();
+	void check_view_range();
+	void slider_value_changed(double);
 };
 
 } // namespace GLtk