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

diff --git a/source/root.h b/source/root.h
index 5d721c0..aeb2b9b 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,9 +19,11 @@ 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;
@@ -28,6 +31,7 @@ public:
 private:
 	const Resources &resources;
 	Input::Keyboard *keyboard;
+	InputMethod *input_method;
 	Input::Mouse *mouse;
 	Input::Touchscreen *touchscreen;
 	bool own_input;
@@ -59,15 +63,13 @@ public:
 	virtual unsigned get_height() const { return geom.h; }
 
 	void tick();
-	void render() const;
+	virtual void render(const GL::Tag & = GL::Tag()) 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);