X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.h;h=a0cba3b776f8ffe3fce88443775bff461304d85b;hb=83f553a382ce554951594de85e4fd7b854305463;hp=89e3259e3bdbf71791ed445bb3587b1e8ec80e0d;hpb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;p=libs%2Fgltk.git

diff --git a/source/container.h b/source/container.h
index 89e3259..a0cba3b 100644
--- a/source/container.h
+++ b/source/container.h
@@ -4,26 +4,27 @@
 #include <list>
 #include <stdexcept>
 #include <sigc++/trackable.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class hierarchy_error: public std::logic_error
+class MSPGLTK_API hierarchy_error: public std::logic_error
 {
 public:
 	hierarchy_error(const std::string &);
-	virtual ~hierarchy_error() throw() { }
 };
 
 
-class Container: virtual public Widget
+class MSPGLTK_API Container: virtual public Widget
 {
 protected:
 	struct Child: public sigc::trackable
 	{
 		Container &container;
-		Widget *widget;
+		Widget *widget = nullptr;
+		Time::TimeDelta time_since_animate;
 
 		Child(Container &, Widget *);
 		virtual ~Child();
@@ -32,17 +33,21 @@ protected:
 		void request_focus();
 		void grab_pointer();
 		void ungrab_pointer();
+		void request_animation(const Time::TimeDelta &);
+		void rebuild_needed();
 	};
 
 	std::list<Child *> children;
-	Widget *click_focus;
-	unsigned click_button;
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
-	Widget *touch_focus;
-
-	Container();
+	Widget *click_focus = nullptr;
+	unsigned click_button = 0;
+	Widget *pointer_focus = nullptr;
+	bool pointer_grabbed = false;
+	Widget *input_focus = nullptr;
+	Widget *saved_input_focus = nullptr;
+	Widget *touch_focus = nullptr;
+	bool children_rebuild_needed = false;
+
+	Container() = default;
 public:
 	virtual ~Container();
 
@@ -60,12 +65,19 @@ public:
 	void raise(Widget &);
 
 protected:
-	void set_pointer_focus(Widget *);
+	void set_pointer_focus(Widget *, bool = false);
 	void set_input_focus(Widget *);
 public:
 	Widget *get_input_focus() const { return input_focus; }
 	Widget *get_final_input_focus() const;
 
+private:
+	void check_animation_interval();
+
+protected:
+	virtual void rebuild_hierarchy();
+
+public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
 	virtual void pointer_motion(int, int);
@@ -73,17 +85,21 @@ private:
 	Widget *get_pointer_target(int, int, bool) const;
 public:
 	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned);
-	virtual void key_release(unsigned, unsigned);
 	virtual void touch_press(int, int, unsigned);
 	virtual void touch_release(int, int, unsigned);
 	virtual void touch_motion(int, int, unsigned);
-	virtual void character(wchar_t);
+	virtual bool key_press(unsigned, unsigned);
+	virtual bool key_release(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 &);
 protected:
 	virtual void on_reparent();
 	virtual void on_child_added(Widget &) { }
 	virtual void on_child_removed(Widget &) { }
+	virtual void on_input_focus_changed(Widget *);
 };
 
 } // namespace GLtk