X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=ee390a0421116df51cc2b701a21249fd26f8faed;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=0ff5466a613e11bcd545002b4409727b253ef9ef;hpb=ef4660c4bdf38e126e13b426649fc2f997027b65;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 0ff5466..ee390a0 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,19 +1,16 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "container.h"
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
+class VSlider;
+
 /**
 Text entry field.
 
@@ -21,37 +18,92 @@ 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 MSPGLTK_API Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class MSPGLTK_API 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;
+
 private:
 	Text text;
-	bool multiline;
-	unsigned edit_pos;
+	bool multiline = false;
+	unsigned edit_width = 10;
+	unsigned edit_height = 1;
+	std::size_t edit_pos = 0;
+	std::size_t first_row = 0;
+	unsigned visible_rows = 1;
+	const Part *text_part = nullptr;
+	VSlider *slider = nullptr;
+	bool got_key_press = false;
+	bool cursor_blink = true;
+	bool selection_active = false;
+	std::size_t selection_pos = 0;
 
 public:
-	sigc::signal<void> signal_enter;
+	Entry(const std::string & = std::string());
+
+	const char *get_class() const override { return "entry"; }
 
-	Entry(const Resources &, const std::string & =std::string());
+private:
+	void autosize_special(const Part &, Geometry &) const override;
 
+public:
 	void set_text(const std::string &);
+	void insert(std::size_t, const std::string &);
+	void erase(std::size_t, std::size_t);
 	const std::string &get_text() const { return text.get(); }
+
+	void set_edit_position(std::size_t p) { set_edit_position(p, false); }
+	std::size_t 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(std::size_t &, std::size_t &) const;
+	void translate_position(std::size_t, std::size_t &, std::size_t &) const;
+	std::size_t translate_position(std::size_t, std::size_t) 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);
+
 	void set_multiline(bool);
 	bool is_multiline() const { return multiline; }
 
-	virtual void key_press(unsigned, unsigned, wchar_t);
 private:
-	virtual const char *get_class() const { return "entry"; }
-	virtual void render_special(const Part &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
-	virtual void on_style_change();
+public:
+	void touch_press(int, int, unsigned) override;
+	bool key_press(unsigned, unsigned) override;
+	bool character(wchar_t) override;
+	void focus_in() override;
+	void focus_out() override;
+	bool navigate(Navigation) override;
+	void animate(const Time::TimeDelta &) override;
+private:
+	void on_size_change() override;
+	void on_style_change() override;
+
+	void move_edit_position(Navigation, bool);
+	void adjust_edit_position_for_change(std::size_t, std::ptrdiff_t);
+	void set_edit_position(std::size_t, bool);
+	void erase_selection(bool);
+	void check_cursor_blink();
+	void check_view_range();
+	void slider_value_changed(double);
 };
 
 } // namespace GLtk