X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=53f8ff3d74c37aa81a59478d37371719ad0e85c9;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=61c1a2efae2b70489a6712b8b76ab5d744b35d7a;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 61c1a2e..53f8ff3 100644
--- a/source/root.h
+++ b/source/root.h
@@ -1,15 +1,10 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_ROOT_H_
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
-#include <msp/gbase/window.h>
+#include <msp/graphics/window.h>
+#include <msp/input/keyboard.h>
+#include <msp/input/mouse.h>
 #include <msp/time/timestamp.h>
 #include "panel.h"
 
@@ -24,7 +19,7 @@ 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.
 */
-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;
@@ -32,6 +27,8 @@ public:
 private:
 	const Resources &resources;
 	Graphics::Window &window;
+	Input::Keyboard keyboard;
+	Input::Mouse mouse;
 	Label *lbl_tooltip;
 	int pointer_x;
 	int pointer_y;
@@ -40,20 +37,25 @@ private:
 
 public:
 	Root(const Resources &, Graphics::Window &);
-	void tick();
+
+	virtual const char *get_class() const { return "root"; }
 
 	const 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;
+
 private:
-	virtual const char *get_class() const { return "root"; }
-	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);
-	void translate_coords(int &, int &);
+	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);
+
+	void get_pointer(int &, int &);
 };
 
 } // namespace GLtk