X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=8e1bed9247e00bd2693bd9fe904ab16995591c9a;hb=5791712b89bda9d70987592620c659b7b9f2435b;hp=4e5309fe888f23234ca4d1d976f17fb0b596a742;hpb=d9d787503ae41842309f74a2eabc5b848abe1f22;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 4e5309f..8e1bed9 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,6 +2,8 @@
 #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>
@@ -32,15 +34,19 @@ private:
 	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 &);
 
-	Root(const Resources &, Input::Keyboard *, Input::Mouse *);
+	/** 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 *);
 private:
-	void init();
+	void init(Graphics::Window *);
 public:
 	virtual ~Root();
 
@@ -54,14 +60,18 @@ 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);
 
 	void get_pointer(int &, int &);
+	void update_camera();
+
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
 };
 
 } // namespace GLtk