X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=16ed5bd58c1d9f94a22236b8900c1db8a1be0831;hb=HEAD;hp=f4bad55beb546dfa91ee0dd9d960a7a0451b2fed;hpb=2b1a962fba03a01d641f5b6e2b8d75c6e71e2d40;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index f4bad55..16ed5bd 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,43 +1,49 @@
 #include <msp/gl/blend.h>
 #include <msp/input/keys.h>
-#include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "label.h"
 #include "style.h"
+#include "resources.h"
 #include "root.h"
+#include "systemkeyboardinput.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &window):
-	resources(r),
-	keyboard(new Input::Keyboard(window)),
-	mouse(new Input::Mouse(window)),
-	own_input(true)
+Root::Root(Resources &r, Graphics::Window &window, unique_ptr<Input::Keyboard> k, unique_ptr<Input::Mouse> m):
+	Root(r, &window, k.get(), m.get(), nullptr)
 {
-	init(&window);
+	own_input[0] = move(k);
+	own_input[1] = move(m);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m):
+Root::Root(Resources &r, Graphics::Window &window):
+	Root(r, window, make_unique<Input::Keyboard>(window), make_unique<Input::Mouse>(window))
+{ }
+
+Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
 	resources(r),
 	keyboard(k),
 	mouse(m),
-	own_input(false)
-{
-	init(window);
-}
-
-void Root::init(Graphics::Window *window)
+	touchscreen(t)
 {
 	if(window)
 		set_geometry(Geometry(0, 0, window->get_width(), window->get_height()));
 
-	lbl_tooltip = 0;
-	tooltip_target = 0;
-
 	camera.set_orthographic(geom.w, geom.h);
 	update_camera();
 
+	shprog = &resources.get<GL::Program>("ui.shader");
+
+	blend.enabled = true;
+	blend.src_factor = GL::SRC_ALPHA;
+	blend.dst_factor = GL::ONE_MINUS_SRC_ALPHA;
+
+	if(keyboard)
+		set_state(FOCUS);
+
 	update_style();
 
 	if(mouse)
@@ -47,29 +53,29 @@ void Root::init(Graphics::Window *window)
 		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));
-	}
-}
+	if(keyboard && !input_method)
+		input_method = make_unique<SystemKeyboardInput>(*this, *keyboard);
 
-Root::~Root()
-{
-	if(own_input)
+	if(touchscreen)
 	{
-		delete keyboard;
-		delete mouse;
+		touchscreen->signal_button_press.connect(sigc::mem_fun(this, &Root::touch_press_event));
+		touchscreen->signal_button_release.connect(sigc::mem_fun(this, &Root::touch_release_event));
+		touchscreen->signal_axis_motion.connect(sigc::mem_fun(this, &Root::touch_motion_event));
 	}
 }
 
 void Root::tick()
 {
+	Time::TimeStamp t = Time::now();
+	Time::TimeDelta dt = (last_tick ? t-last_tick : Time::zero);
+	last_tick = t;
+
+	animate(dt);
+
 	if(tooltip_timeout && Time::now()>tooltip_timeout)
 	{
 		std::string tip;
-		if(Widget *wdg = get_descendant_at(pointer_x, pointer_y))
+		if(Widget *wdg = find_descendant_at(pointer_x, pointer_y))
 		{
 			tip = wdg->get_tooltip();
 			tooltip_target = wdg;
@@ -84,8 +90,7 @@ void Root::tick()
 		{
 			if(!lbl_tooltip)
 			{
-				lbl_tooltip = new Label;
-				add(*lbl_tooltip);
+				lbl_tooltip = &add_new<Label>();
 				lbl_tooltip->set_style("tooltip");
 			}
 
@@ -110,11 +115,21 @@ void Root::tick()
 	}
 }
 
-void Root::render() const
+void Root::setup_frame(GL::Renderer &)
 {
-	GL::Bind bind_blend(GL::Blend::alpha());
+	rebuild_hierarchy();
+}
 
-	GL::Renderer renderer(&camera);
+void Root::render(GL::Renderer &renderer, GL::Tag tag) const
+{
+	if(tag.id)
+		return;
+
+	GL::Renderer::Push push(renderer);
+	renderer.set_camera(camera);
+	renderer.set_shader_program(shprog);
+	renderer.set_blend(&blend);
+	renderer.set_depth_test(nullptr);
 	Widget::render(renderer);
 }
 
@@ -166,11 +181,11 @@ bool Root::axis_motion_event(unsigned, float, float)
 			pointer_y = y;
 			tooltip_timeout = Time::now()+700*Time::msec;
 		}
-		else if(get_descendant_at(x, y)!=tooltip_target)
+		else if(find_descendant_at(x, y)!=tooltip_target)
 		{
 			if(lbl_tooltip)
 				lbl_tooltip->set_visible(false);
-			tooltip_target = 0;
+			tooltip_target = nullptr;
 		}
 
 		if(pointer_focus)
@@ -180,46 +195,50 @@ bool Root::axis_motion_event(unsigned, float, float)
 	return false;
 }
 
-bool Root::key_press_event(unsigned key)
+bool Root::touch_press_event(unsigned finger)
 {
-	// XXX Modifiers
 	if(visible)
 	{
-		Widget *old_focus = input_focus;
+		Widget *old_focus = touch_focus;
 
-		key_press(key, 0);
+		int x, y;
+		get_touch(finger, x, y);
+		touch_press(x, y, finger);
 
-		if(input_focus || old_focus)
+		if(touch_focus || old_focus)
 			return true;
 	}
 
 	return false;
 }
 
-bool Root::key_release_event(unsigned key)
+bool Root::touch_release_event(unsigned finger)
 {
 	if(visible)
 	{
-		Widget *old_focus = input_focus;
+		Widget *old_focus = touch_focus;
 
-		key_release(key, 0);
+		int x, y;
+		get_touch(finger, x, y);
+		touch_release(x, y, finger);
 
-		if(input_focus || old_focus)
+		if(touch_focus || old_focus)
 			return true;
 	}
 
 	return false;
 }
 
-bool Root::character_event(StringCodec::unichar ch)
+bool Root::touch_motion_event(unsigned axis, float, float)
 {
 	if(visible)
 	{
-		Widget *old_focus = input_focus;
-
-		character(ch);
+		unsigned finger = axis/2;
+		int x, y;
+		get_touch(finger, x, y);
+		touch_motion(x, y, finger);
 
-		if(input_focus || old_focus)
+		if(touch_focus)
 			return true;
 	}
 
@@ -232,6 +251,12 @@ void Root::get_pointer(int &x, int &y)
 	y = (mouse->get_axis_value(1)*0.5+0.5)*geom.h;
 }
 
+void Root::get_touch(unsigned finger, int &x, int &y)
+{
+	x = (touchscreen->get_axis_value(finger*2)*0.5+0.5)*geom.w;
+	y = (touchscreen->get_axis_value(finger*2+1)*0.5+0.5)*geom.h;
+}
+
 void Root::update_camera()
 {
 	camera.set_position(GL::Vector3(geom.w/2.0f, geom.h/2.0f, geom.h/2.0f));
@@ -239,9 +264,9 @@ void Root::update_camera()
 	camera.set_orthographic(geom.w, geom.h);
 }
 
-void Root::on_geometry_change()
+void Root::on_size_change()
 {
-	Panel::on_geometry_change();
+	Panel::on_size_change();
 	update_camera();
 }