X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=eb8fa2324350b42335eb92a0bd8aec7fc70e2f7b;hb=HEAD;hp=6cb3d0654362f60142e4d083561291879713a7c8;hpb=2e3bb9608ef4c74a8ba9c101ba24b68285405090;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 6cb3d06..001da84 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -2,9 +2,12 @@
 #define MSP_GLTK_WIDGET_H_
 
 #include <string>
+#include <msp/core/noncopyable.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/gl/renderer.h>
 #include "geometry.h"
+#include "inputmethod.h"
+#include "mspgltk_api.h"
 #include "partcache.h"
 #include "state.h"
 
@@ -17,10 +20,9 @@ class Resources;
 class Style;
 
 /**
-Base class for all widgets.  Derived classes should call update_style in 
-constructor, because it can't be done correctly in the Widget constructor.
+Base class for all widgets.
 */
-class Widget
+class MSPGLTK_API Widget: public NonCopyable
 {
 	friend class Container;
 
@@ -29,6 +31,7 @@ public:
 	{
 	public:
 		Loader(Widget &);
+
 	private:
 		void position(int, int);
 		void size(unsigned, unsigned);
@@ -40,19 +43,23 @@ public:
 	sigc::signal<void> signal_request_focus;
 	sigc::signal<void> signal_grab_pointer;
 	sigc::signal<void> signal_ungrab_pointer;
+	sigc::signal<void, const Time::TimeDelta &> signal_request_animation;
+	sigc::signal<void> signal_rebuild_needed;
 
 protected:
 	Geometry geom;
 	std::string style_name;
-	const Style *style;
-	State state;
-	bool visible;
-	bool focusable;
-	Container *parent;
+	const Style *style = nullptr;
+	State state = NORMAL;
+	bool visible = true;
+	InputType input_type = INPUT_NONE;
+	Container *parent = nullptr;
 	std::string tooltip;
 	PartCache part_cache;
+	bool rebuild_needed = false;
+	Time::TimeDelta anim_interval;
 
-	Widget();
+	Widget() = default;
 public:
 	virtual ~Widget();
 
@@ -62,13 +69,15 @@ public:
 	void set_position(int, int);
 	void set_size(unsigned, unsigned);
 	void autosize();
+	void autosize(Geometry &) const;
 protected:
-	virtual void autosize_special(const Part &, Geometry &) { }
+	virtual void autosize_special(const Part &, Geometry &) const { };
 public:
 	void set_geometry(const Geometry &);
 	const Geometry &get_geometry() const { return geom; }
 
 	void map_coords_to_ancestor(int &, int &, const Widget &) const;
+	void map_coords_to_root(int &, int &) const;
 
 protected:
 	/** Sets the widget's parent Container.  The widget must be unparented when
@@ -104,8 +113,8 @@ public:
 
 	void set_visible(bool);
 	bool is_visible() const { return visible; }
-	void set_focusable(bool);
-	bool is_focusable() const { return focusable; }
+	InputType get_input_type() const { return input_type; }
+	bool is_focusable() const { return visible && input_type!=INPUT_NONE; }
 	void set_focus();
 	void set_enabled(bool);
 	bool is_enabled() const { return !(state&DISABLED); }
@@ -118,6 +127,14 @@ public:
 	State get_state() const { return state; }
 
 protected:
+	void set_animation_interval(const Time::TimeDelta &);
+	void stop_animation();
+public:
+	const Time::TimeDelta &get_animation_interval() const { return anim_interval; }
+
+protected:
+	void mark_rebuild();
+	virtual void rebuild_hierarchy();
 	void rebuild();
 	virtual void rebuild_special(const Part &);
 
@@ -133,13 +150,18 @@ public:
 	virtual void pointer_motion(int, int) { }
 	virtual void pointer_enter();
 	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned) { }
-	virtual void key_release(unsigned, unsigned) { }
-	virtual void character(wchar_t) { }
+	virtual void touch_press(int, int, unsigned);
+	virtual void touch_release(int, int, unsigned);
+	virtual void touch_motion(int, int, unsigned);
+	virtual bool key_press(unsigned, unsigned) { return false; }
+	virtual bool key_release(unsigned, unsigned) { return false; }
+	virtual bool character(wchar_t) { return false; }
 	virtual void focus_in();
 	virtual void focus_out();
+	virtual bool navigate(Navigation) { return false; }
+	virtual void animate(const Time::TimeDelta &) { }
 protected:
-	virtual void on_geometry_change() { }
+	virtual void on_size_change() { }
 	virtual void on_style_change() { }
 	virtual void on_reparent() { }
 };