X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=eb8fa2324350b42335eb92a0bd8aec7fc70e2f7b;hb=1597579a34a8d87d4dea0a0cdc0895e6247b6126;hp=7c601d2b5860668b426e3b8466ef316ab92fb2c3;hpb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 7c601d2..eb8fa23 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
 {
@@ -47,12 +47,15 @@ protected:
 	const Style *style;
 	State state;
 	bool visible;
-	bool focusable;
+	InputType input_type;
 	Container *parent;
 	std::string tooltip;
 	PartCache part_cache;
 
 	Widget();
+private:
+	Widget(const Widget &);
+	Widget &operator=(const Widget &);
 public:
 	virtual ~Widget();
 
@@ -62,8 +65,9 @@ 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; }
@@ -104,9 +108,14 @@ 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); }
@@ -131,11 +140,15 @@ 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; }
 protected:
 	virtual void on_geometry_change() { }
 	virtual void on_style_change() { }