X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=5d721c0c2370f5e1ac68d68ef1aee8e987bdbde0;hb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;hp=53f8ff3d74c37aa81a59478d37371719ad0e85c9;hpb=d88af5a7898020e4493fef8ec0cb9e88666b66df;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 53f8ff3..5d721c0 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,9 +2,12 @@
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
+#include <msp/gl/camera.h>
+#include <msp/gl/program.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/input/mouse.h>
+#include <msp/input/touchscreen.h>
 #include <msp/time/timestamp.h>
 #include "panel.h"
 
@@ -14,10 +17,8 @@ namespace GLtk {
 class Label;
 
 /**
-A Root is a special type of Panel that covers and entire Window and accepts
-input from it.  When created, a Root widget will take its size from the window
-it is created for.  The size can be changed, but a Root should always be
-rendered to fill the window in order to get coordinates mapped correctly.
+A Root is a special type of Panel that covers the entire viewport and receives
+input from keyboard and mouse.
 */
 class Root: public Panel, public sigc::trackable
 {
@@ -26,18 +27,31 @@ public:
 
 private:
 	const Resources &resources;
-	Graphics::Window &window;
-	Input::Keyboard keyboard;
-	Input::Mouse mouse;
+	Input::Keyboard *keyboard;
+	Input::Mouse *mouse;
+	Input::Touchscreen *touchscreen;
+	bool own_input;
 	Label *lbl_tooltip;
 	int pointer_x;
 	int pointer_y;
 	Time::TimeStamp tooltip_timeout;
 	Widget *tooltip_target;
+	Msp::GL::Camera camera;
+	Msp::GL::Program *shprog;
 
 public:
+	/** Creates a Root widget for a window.  The geometry is set to match the
+	window's size, and input devices are created automatically. */
 	Root(const Resources &, Graphics::Window &);
 
+	/** Creates a Root widget with custom input devices.  If window is not null,
+	it is used to set the widget's initial geometry. */
+	Root(const Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
+private:
+	void init(Graphics::Window *);
+public:
+	virtual ~Root();
+
 	virtual const char *get_class() const { return "root"; }
 
 	const Resources &get_resources() const { return resources; }
@@ -48,14 +62,22 @@ public:
 	void render() const;
 
 private:
-	void button_press_event(unsigned);
-	void button_release_event(unsigned);
-	void axis_motion_event(unsigned, float, float);
-	void key_press_event(unsigned);
-	void key_release_event(unsigned);
-	void character_event(StringCodec::unichar);
+	bool button_press_event(unsigned);
+	bool button_release_event(unsigned);
+	bool axis_motion_event(unsigned, float, float);
+	bool key_press_event(unsigned);
+	bool key_release_event(unsigned);
+	bool character_event(StringCodec::unichar);
+	bool touch_press_event(unsigned);
+	bool touch_release_event(unsigned);
+	bool touch_motion_event(unsigned, float, float);
 
 	void get_pointer(int &, int &);
+	void get_touch(unsigned, int &, int &);
+	void update_camera();
+
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
 };
 
 } // namespace GLtk