X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=89db305ea5bd291e7cfc9823c7a5a2964a837ec6;hb=815194201203afd6fa59e650e1007a355c829544;hp=826a5403dee110a77ed54d5e48640233124d10c7;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index 826a540..89db305 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -9,21 +9,48 @@
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &w):
+Root::Root(const Resources &r, Graphics::Window &window):
 	resources(r),
-	window(w),
-	lbl_tooltip(0),
-	tooltip_target(0)
+	keyboard(new Input::Keyboard(window)),
+	mouse(new Input::Mouse(window)),
+	own_input(true)
 {
 	set_geometry(Geometry(0, 0, window.get_width(), window.get_height()));
 
+	init();
+}
+
+Root::Root(const Resources &r, Input::Keyboard *k, Input::Mouse *m):
+	resources(r),
+	keyboard(k),
+	mouse(m),
+	own_input(false)
+{
+	init();
+}
+
+void Root::init()
+{
+	lbl_tooltip = 0;
+	tooltip_target = 0;
+
 	update_style();
 
-	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));
+	mouse->signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
+	mouse->signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
+	mouse->signal_axis_motion.connect(sigc::mem_fun(this, &Root::axis_motion_event));
+	keyboard->signal_button_press.connect(sigc::mem_fun(this, &Root::key_press_event));
+	keyboard->signal_button_release.connect(sigc::mem_fun(this, &Root::key_release_event));
+	keyboard->signal_character.connect(sigc::mem_fun(this, &Root::character_event));
+}
+
+Root::~Root()
+{
+	if(own_input)
+	{
+		delete keyboard;
+		delete mouse;
+	}
 }
 
 void Root::tick()
@@ -78,42 +105,36 @@ void Root::render() const
 	GL::MatrixStack::modelview() = GL::Matrix();
 	GL::Bind bind_blend(GL::Blend::alpha());
 
-	Widget::render();
+	GL::Renderer renderer(0);
+	Widget::render(renderer);
 }
 
-void Root::button_press_event(int x, int y, unsigned btn, unsigned mod)
+void Root::button_press_event(unsigned btn)
 {
 	if(visible)
 	{
-		Widget *old_focus = pointer_focus;
-
-		translate_coords(x, y);
+		int x, y;
+		get_pointer(x, y);
 		button_press(x, y, btn);
-
-		if(!pointer_focus && !old_focus)
-			signal_button_press.emit(x, geom.h-1-y, btn, mod);
 	}
 }
 
-void Root::button_release_event(int x, int y, unsigned btn, unsigned mod)
+void Root::button_release_event(unsigned btn)
 {
 	if(visible)
 	{
-		Widget *old_focus = pointer_focus;
-
-		translate_coords(x, y);
+		int x, y;
+		get_pointer(x, y);
 		button_release(x, y, btn);
-
-		if(!pointer_focus && !old_focus)
-			signal_button_release.emit(x, geom.h-1-y, btn, mod);
 	}
 }
 
-void Root::pointer_motion_event(int x, int y)
+void Root::axis_motion_event(unsigned, float, float)
 {
 	if(visible)
 	{
-		translate_coords(x, y);
+		int x, y;
+		get_pointer(x, y);
 		pointer_motion(x, y);
 
 		if(!tooltip_target)
@@ -128,42 +149,32 @@ void Root::pointer_motion_event(int x, int y)
 				lbl_tooltip->set_visible(false);
 			tooltip_target = 0;
 		}
-
-		if(!pointer_focus)
-			signal_pointer_motion.emit(x, geom.h-1-y);
 	}
 }
 
-void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch)
+void Root::key_press_event(unsigned key)
 {
+	// XXX Modifiers
 	if(visible)
-	{
-		Widget *old_focus = input_focus;
-
-		key_press(Input::key_from_sys(key), mod, ch);
-
-		if(!input_focus && !old_focus)
-			signal_key_press.emit(key, mod, ch);
-	}
+		key_press(key, 0);
 }
 
-void Root::key_release_event(unsigned key, unsigned mod)
+void Root::key_release_event(unsigned key)
 {
 	if(visible)
-	{
-		Widget *old_focus = input_focus;
-
-		key_release(Input::key_from_sys(key), mod);
+		key_release(key, 0);
+}
 
-		if(!input_focus && !old_focus)
-			signal_key_release.emit(key, mod);
-	}
+void Root::character_event(StringCodec::unichar ch)
+{
+	if(visible)
+		character(ch);
 }
 
-void Root::translate_coords(int &x, int &y)
+void Root::get_pointer(int &x, int &y)
 {
-	x = x*geom.w/window.get_width();
-	y = geom.h-1-y*geom.h/window.get_height();
+	x = (mouse->get_axis_value(0)*0.5+0.5)*geom.w;
+	y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
 }
 
 } // namespace GLtk