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

diff --git a/source/root.h b/source/root.h
index b66f016..53f8ff3 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,7 +2,9 @@
 #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"
 
@@ -17,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;
@@ -25,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;
@@ -44,13 +48,14 @@ 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);
+	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 translate_coords(int &, int &);
+	void get_pointer(int &, int &);
 };
 
 } // namespace GLtk