X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=b79bca367d3e22c51ca3c86ad61bf6683728337e;hb=2b1a962fba03a01d641f5b6e2b8d75c6e71e2d40;hp=b66f016fc15249a162217eee371e002332d17eab;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index b66f016..b79bca3 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,7 +2,10 @@
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
-#include <msp/gbase/window.h>
+#include <msp/gl/camera.h>
+#include <msp/graphics/window.h>
+#include <msp/input/keyboard.h>
+#include <msp/input/mouse.h>
 #include <msp/time/timestamp.h>
 #include "panel.h"
 
@@ -12,28 +15,39 @@ 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 Graphics::EventSource, public sigc::trackable
+class Root: public Panel, public sigc::trackable
 {
 public:
 	sigc::signal<std::string, int, int> signal_tooltip;
 
 private:
 	const Resources &resources;
-	Graphics::Window &window;
+	Input::Keyboard *keyboard;
+	Input::Mouse *mouse;
+	bool own_input;
 	Label *lbl_tooltip;
 	int pointer_x;
 	int pointer_y;
 	Time::TimeStamp tooltip_timeout;
 	Widget *tooltip_target;
+	Msp::GL::Camera camera;
 
 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 *);
+private:
+	void init(Graphics::Window *);
+public:
+	virtual ~Root();
+
 	virtual const char *get_class() const { return "root"; }
 
 	const Resources &get_resources() const { return resources; }
@@ -44,13 +58,18 @@ public:
 	void render() const;
 
 private:
-	void button_press_event(int, int, unsigned, unsigned);
-	void button_release_event(int, int, unsigned, unsigned);
-	void pointer_motion_event(int, int);
-	void key_press_event(unsigned, unsigned, wchar_t);
-	void key_release_event(unsigned, unsigned);
+	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();
 
-	void translate_coords(int &, int &);
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
 };
 
 } // namespace GLtk