X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=f1a83f78a5532c0e355306dcd826369d31caa1e3;hb=4b52d16bc895f9d969383d7a7d6a3558c1972cc5;hp=dfef4ba7128be3b1a3e099addc5b7720a943ad8e;hpb=e6a6b3fbd760e487c5df1a6d70ed0700d151710b;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index dfef4ba..f1a83f7 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,15 +108,23 @@ 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); }
 	void set_state(State, State);
+public:
+	State get_state() const { return state; }
 
+protected:
 	void rebuild();
 	virtual void rebuild_special(const Part &);
 
@@ -128,9 +140,12 @@ 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();
 protected: