X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=ef83bb9de3af842b8fe37878d1f4eb2185d36c12;hb=70e7a223a069874cda84673a4ca541aa44b12bf2;hp=a90ea5a23d9eec4a3b3bacc34b94fb1a912b8b4c;hpb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index a90ea5a..ef83bb9 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,20 +1,19 @@
 #include <msp/gl/blend.h>
-#include <msp/gl/extensions/arb_shader_objects.h>
-#include <msp/gl/programbuilder.h>
-#include <msp/gl/uniform.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"
 
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &window):
+Root::Root(Resources &r, Graphics::Window &window):
 	resources(r),
 	keyboard(new Input::Keyboard(window)),
+	input_method(0),
 	mouse(new Input::Mouse(window)),
 	touchscreen(0),
 	own_input(true)
@@ -22,9 +21,10 @@ Root::Root(const Resources &r, Graphics::Window &window):
 	init(&window);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
+Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
 	resources(r),
 	keyboard(k),
+	input_method(0),
 	mouse(m),
 	touchscreen(t),
 	own_input(false)
@@ -43,17 +43,14 @@ void Root::init(Graphics::Window *window)
 	camera.set_orthographic(geom.w, geom.h);
 	update_camera();
 
-	if(GL::ARB_shader_objects)
-	{
-		shprog = new GL::Program;
-		GL::ProgramBuilder::StandardFeatures features;
-		features.material = true;
-		features.texture = true;
-		GL::ProgramBuilder(features).add_shaders(*shprog);
-		shprog->link();
-	}
-	else
-		shprog = 0;
+	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();
 
@@ -64,12 +61,8 @@ 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 = new SystemKeyboardInput(*this, *keyboard);
 
 	if(touchscreen)
 	{
@@ -81,7 +74,7 @@ void Root::init(Graphics::Window *window)
 
 Root::~Root()
 {
-	delete shprog;
+	delete input_method;
 	if(own_input)
 	{
 		delete keyboard;
@@ -91,6 +84,12 @@ Root::~Root()
 
 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;
@@ -135,12 +134,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(0);
 	Widget::render(renderer);
 }
 
@@ -206,52 +214,6 @@ bool Root::axis_motion_event(unsigned, float, float)
 	return false;
 }
 
-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;
-}
-
-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;
-}
-
-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;
-}
-
 bool Root::touch_press_event(unsigned finger)
 {
 	if(visible)
@@ -321,9 +283,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();
 }