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

diff --git a/source/root.cpp b/source/root.cpp
index f4bad55..c54ab7b 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,4 +1,7 @@
 #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>
@@ -13,15 +16,17 @@ Root::Root(const Resources &r, Graphics::Window &window):
 	resources(r),
 	keyboard(new Input::Keyboard(window)),
 	mouse(new Input::Mouse(window)),
+	touchscreen(0),
 	own_input(true)
 {
 	init(&window);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m):
+Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
 	resources(r),
 	keyboard(k),
 	mouse(m),
+	touchscreen(t),
 	own_input(false)
 {
 	init(window);
@@ -38,6 +43,18 @@ 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;
+
 	update_style();
 
 	if(mouse)
@@ -53,10 +70,18 @@ void Root::init(Graphics::Window *window)
 		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(touchscreen)
+	{
+		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));
+	}
 }
 
 Root::~Root()
 {
+	delete shprog;
 	if(own_input)
 	{
 		delete keyboard;
@@ -115,6 +140,7 @@ void Root::render() const
 	GL::Bind bind_blend(GL::Blend::alpha());
 
 	GL::Renderer renderer(&camera);
+	renderer.set_shader_program(shprog);
 	Widget::render(renderer);
 }
 
@@ -183,43 +209,72 @@ bool Root::axis_motion_event(unsigned, float, float)
 bool Root::key_press_event(unsigned key)
 {
 	// XXX Modifiers
+	if(visible)
+		return key_press(key, 0);
+
+	return false;
+}
+
+bool Root::key_release_event(unsigned key)
+{
+	if(visible)
+		return key_release(key, 0);
+
+	return false;
+}
+
+bool Root::character_event(StringCodec::unichar ch)
+{
+	if(visible)
+		return character(ch);
+
+	return false;
+}
+
+bool Root::touch_press_event(unsigned finger)
+{
 	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 +287,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));