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

diff --git a/source/root.h b/source/root.h
index 5d721c0..73ca276 100644
--- a/source/root.h
+++ b/source/root.h
@@ -4,6 +4,7 @@
 #include <sigc++/trackable.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/program.h>
+#include <msp/gl/renderable.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/input/mouse.h>
@@ -18,16 +19,19 @@ class Label;
 
 /**
 A Root is a special type of Panel that covers the entire viewport and receives
-input from keyboard and mouse.
+input from keyboard and mouse.  It can be used by itself or in a GL::Pipeline.
+Due to its specialized nature it's recommended to not use it with Scenes or
+other containers.
 */
-class Root: public Panel, public sigc::trackable
+class Root: public Panel, public GL::Renderable, public sigc::trackable
 {
 public:
 	sigc::signal<std::string, int, int> signal_tooltip;
 
 private:
-	const Resources &resources;
+	Resources &resources;
 	Input::Keyboard *keyboard;
+	InputMethod *input_method;
 	Input::Mouse *mouse;
 	Input::Touchscreen *touchscreen;
 	bool own_input;
@@ -35,6 +39,7 @@ private:
 	int pointer_x;
 	int pointer_y;
 	Time::TimeStamp tooltip_timeout;
+	Time::TimeStamp last_tick;
 	Widget *tooltip_target;
 	Msp::GL::Camera camera;
 	Msp::GL::Program *shprog;
@@ -42,11 +47,11 @@ private:
 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(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);
+	Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
 private:
 	void init(Graphics::Window *);
 public:
@@ -54,20 +59,18 @@ public:
 
 	virtual const char *get_class() const { return "root"; }
 
-	const Resources &get_resources() const { return resources; }
+	Resources &get_resources() const { return resources; }
 	virtual unsigned get_width() const { return geom.w; }
 	virtual unsigned get_height() const { return geom.h; }
 
 	void tick();
 	void render() const;
+	virtual void render(GL::Renderer &, const GL::Tag & = GL::Tag()) const;
 
 private:
 	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);
@@ -76,7 +79,7 @@ private:
 	void get_touch(unsigned, int &, int &);
 	void update_camera();
 
-	virtual void on_geometry_change();
+	virtual void on_size_change();
 	virtual void on_child_added(Widget &);
 };