X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=7cbec37a5455e62957d7ad8e02ff0eda17f9fbad;hb=878faa0c9283ee1e6e5e67b6ea1324cc52385742;hp=9caae9fb6216180654c9165dbe1893f2f1fec999;hpb=707b59d45ae50b69c94918f8f74313283b304597;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 9caae9f..7cbec37 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -5,6 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/gl/renderer.h>
 #include "geometry.h"
+#include "inputmethod.h"
 #include "partcache.h"
 #include "state.h"
 
@@ -17,8 +18,7 @@ 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
 {
@@ -40,6 +40,8 @@ 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;
@@ -47,10 +49,12 @@ protected:
 	const Style *style;
 	State state;
 	bool visible;
-	bool focusable;
+	InputType input_type;
 	Container *parent;
 	std::string tooltip;
 	PartCache part_cache;
+	bool rebuild_needed;
+	Time::TimeDelta anim_interval;
 
 	Widget();
 private:
@@ -108,12 +112,15 @@ 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); }
 
+	// Deprecated
+	void set_focusable(bool);
+
 protected:
 	void set_state(State s) { set_state(s, s); }
 	void clear_state(State s) { set_state(s, NORMAL); }
@@ -122,6 +129,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 &);
 
@@ -137,15 +152,23 @@ 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() { on_geometry_change(); }
 	virtual void on_style_change() { }
 	virtual void on_reparent() { }
+
+	// Deprecated
+	virtual void on_geometry_change() { }
 };
 
 } // namespace GLtk