X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=de2472797199108870d8b045679d53019ad815a8;hb=c8291177b545ec81930603a5915234a60296db51;hp=e7c0a9251eadebfe8863e3549e4571737c0b24aa;hpb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index e7c0a92..de24727 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -9,24 +9,56 @@
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &w):
+Root::Root(const Resources &r, Graphics::Window &window):
 	resources(r),
-	window(w),
-	keyboard(window),
-	mouse(window),
-	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(&window);
+}
+
+Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m):
+	resources(r),
+	keyboard(k),
+	mouse(m),
+	own_input(false)
+{
+	init(window);
+}
+
+void Root::init(Graphics::Window *window)
+{
+	if(window)
+		set_geometry(Geometry(0, 0, window->get_width(), window->get_height()));
+
+	lbl_tooltip = 0;
+	tooltip_target = 0;
 
 	update_style();
 
-	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));
+	if(mouse)
+	{
+		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));
+	}
+
+	if(keyboard)
+	{
+		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()
@@ -85,27 +117,41 @@ void Root::render() const
 	Widget::render(renderer);
 }
 
-void Root::button_press_event(unsigned btn)
+bool Root::button_press_event(unsigned btn)
 {
 	if(visible)
 	{
+		Widget *old_focus = pointer_focus;
+
 		int x, y;
 		get_pointer(x, y);
 		button_press(x, y, btn);
+
+		if(pointer_focus || old_focus)
+			return true;
 	}
+
+	return false;
 }
 
-void Root::button_release_event(unsigned btn)
+bool Root::button_release_event(unsigned btn)
 {
 	if(visible)
 	{
+		Widget *old_focus = pointer_focus;
+
 		int x, y;
 		get_pointer(x, y);
 		button_release(x, y, btn);
+
+		if(pointer_focus || old_focus)
+			return true;
 	}
+
+	return false;
 }
 
-void Root::axis_motion_event(unsigned, float, float)
+bool Root::axis_motion_event(unsigned, float, float)
 {
 	if(visible)
 	{
@@ -125,32 +171,70 @@ void Root::axis_motion_event(unsigned, float, float)
 				lbl_tooltip->set_visible(false);
 			tooltip_target = 0;
 		}
+
+		if(pointer_focus)
+			return true;
 	}
+
+	return false;
 }
 
-void Root::key_press_event(unsigned key)
+bool Root::key_press_event(unsigned key)
 {
 	// XXX Modifiers
 	if(visible)
+	{
+		Widget *old_focus = input_focus;
+
 		key_press(key, 0);
+
+		if(input_focus || old_focus)
+			return true;
+	}
+
+	return false;
 }
 
-void Root::key_release_event(unsigned key)
+bool Root::key_release_event(unsigned key)
 {
 	if(visible)
+	{
+		Widget *old_focus = input_focus;
+
 		key_release(key, 0);
+
+		if(input_focus || old_focus)
+			return true;
+	}
+
+	return false;
 }
 
-void Root::character_event(StringCodec::unichar ch)
+bool Root::character_event(StringCodec::unichar ch)
 {
 	if(visible)
+	{
+		Widget *old_focus = input_focus;
+
 		character(ch);
+
+		if(input_focus || old_focus)
+			return true;
+	}
+
+	return false;
 }
 
 void Root::get_pointer(int &x, int &y)
 {
-	x = (mouse.get_axis_value(0)*0.5+0.5)*geom.w;
-	y = (mouse.get_axis_value(1)*0.5+0.5)*geom.h;
+	x = (mouse->get_axis_value(0)*0.5+0.5)*geom.w;
+	y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
+}
+
+void Root::on_child_added(Widget &wdg)
+{
+	if(&wdg!=lbl_tooltip)
+		Panel::on_child_added(wdg);
 }
 
 } // namespace GLtk