X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=1c030e82c8c38f103fa5234bde231163fceb3706;hb=a9d04a73afcdf40c33d889090d303117b7fd3a7d;hp=83042a63f3c8a62339d40b7ae5708306fef398da;hpb=e7bc29984e91ee36555d6a4e4eece22170d10ba4;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index 83042a6..1c030e8 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,9 +1,17 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/input/keys.h>
 #include "root.h"
 
 namespace Msp {
 namespace GLtk {
 
-Root::Root(Resources &r, Window &w):
+Root::Root(Resources &r, Graphics::Window &w):
 	Panel(r),
 	window(w)
 {
@@ -14,21 +22,53 @@ Root::Root(Resources &r, Window &w):
 	window.signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
 	window.signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
 	window.signal_pointer_motion.connect(sigc::mem_fun(this, &Root::pointer_motion_event));
+	window.signal_key_press.connect(sigc::mem_fun(this, &Root::key_press_event));
+	window.signal_key_release.connect(sigc::mem_fun(this, &Root::key_release_event));
 }
 
 void Root::button_press_event(int x, int y, unsigned btn, unsigned)
 {
-	button_press(x, y, btn);
+	if(visible)
+	{
+		translate_coords(x, y);
+		button_press(x, y, btn);
+	}
 }
 
 void Root::button_release_event(int x, int y, unsigned btn, unsigned)
 {
-	button_release(x, y, btn);
+	if(visible)
+	{
+		translate_coords(x, y);
+		button_release(x, y, btn);
+	}
 }
 
 void Root::pointer_motion_event(int x, int y)
 {
-	pointer_motion(x, y);
+	if(visible)
+	{
+		translate_coords(x, y);
+		pointer_motion(x, y);
+	}
+}
+
+void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch)
+{
+	if(visible)
+		key_press(Input::key_from_sys(key), mod, ch);
+}
+
+void Root::key_release_event(unsigned key, unsigned mod)
+{
+	if(visible)
+		key_release(Input::key_from_sys(key), mod);
+}
+
+void Root::translate_coords(int &x, int &y)
+{
+	x=x*geom.w/window.get_width();
+	y=geom.h-1-y*geom.h/window.get_height();
 }
 
 } // namespace GLtk