X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fcontrol.cpp;h=b2f9badd45b673026b90645bca2fcfef104cb648;hb=a5be5c703808817dda8feafb03b0aec04b20afbb;hp=f3f1919d45815535561932e99c7d23b29b59b16d;hpb=a50eef72fac4b253bd014a32ec43b90e990b5784;p=libs%2Fgui.git

diff --git a/source/input/control.cpp b/source/input/control.cpp
index f3f1919..b2f9bad 100644
--- a/source/input/control.cpp
+++ b/source/input/control.cpp
@@ -1,4 +1,6 @@
+#include <sigc++/bind_return.h>
 #include <msp/strings/lexicalcast.h>
+#include "binarycontrol.h"
 #include "control.h"
 #include "device.h"
 
@@ -35,27 +37,36 @@ std::string ControlSource::str() const
 
 
 Control::Control():
-	capture_dev(0)
+	capture_dev(0),
+	activator(0),
+	origin(0)
 { }
 
 Control::Control(const ControlSource &s):
 	src(s),
-	capture_dev(0)
+	capture_dev(0),
+	activator(0),
+	origin(0)
 { }
 
 Control::Control(Device &d, ControlSrcType t, unsigned i):
 	src(d, t, i),
-	capture_dev(0)
+	capture_dev(0),
+	activator(0),
+	origin(0)
 {
 	connect_signals();
 }
 
+Control::~Control()
+{ }
+
 void Control::capture(Device &d)
 {
 	notify_callbacks();
 	capture_dev = &d;
-	capture_dev->signal_button_press.connect(sigc::mem_fun(this, &Control::button_press));
-	capture_dev->signal_axis_motion.connect(sigc::mem_fun(this, &Control::axis_motion));
+	capture_dev->signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_press), false));
+	capture_dev->signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Control::axis_motion), false));
 }
 
 void Control::cancel_capture()
@@ -77,6 +88,13 @@ void Control::set_source(const ControlSource &s)
 	connect_signals();
 }
 
+void Control::set_activator(BinaryControl *ctrl)
+{
+	notify_callbacks();
+	activator = ctrl;
+	connect_signals();
+}
+
 void Control::connect_signals()
 {
 	switch(src.type)
@@ -84,14 +102,17 @@ void Control::connect_signals()
 	case NONE:
 		break;
 	case BUTTON:
-		src.dev->signal_button_press.connect(sigc::mem_fun(this, &Control::button_press));
-		src.dev->signal_button_release.connect(sigc::mem_fun(this, &Control::button_release));
+		src.dev->signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_press), false));
+		src.dev->signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &Control::button_release), false));
 		break;
 	case AXIS_POS:
 	case AXIS_NEG:
-		src.dev->signal_axis_motion.connect(sigc::mem_fun(this, &Control::axis_motion));
+		src.dev->signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Control::axis_motion), false));
 		break;
 	}
+
+	if(activator)
+		activator->signal_release.connect(sigc::mem_fun(this, &Control::deactivate));
 }
 
 void Control::button_press(unsigned i)
@@ -107,13 +128,13 @@ void Control::button_press(unsigned i)
 		connect_signals();
 		signal_capture_complete.emit();
 	}
-	else if(src.type==BUTTON && i==src.index)
+	else if(src.type==BUTTON && i==src.index && (!activator || activator->get_state()))
 		on_press();
 }
 
 void Control::button_release(unsigned i)
 {
-	if(src.type==BUTTON && i==src.index)
+	if(src.type==BUTTON && i==src.index && (!activator || activator->get_state()))
 		on_release();
 }
 
@@ -139,10 +160,24 @@ void Control::axis_motion(unsigned i, float v, float r)
 			signal_capture_complete.emit();
 		}
 	}
-	else if(src.type==AXIS_POS && i==src.index && v>=0)
-		on_motion(v, r);
-	else if(src.type==AXIS_NEG && i==src.index && v<=0)
-		on_motion(-v, -r);
+	else if(activator && !activator->get_state() && i==src.index)
+		origin = v;
+	else if(src.type==AXIS_POS && i==src.index && v>=origin)
+		on_motion(v-origin, r);
+	else if(src.type==AXIS_NEG && i==src.index && v<=origin)
+		on_motion(origin-v, -r);
+}
+
+void Control::deactivate()
+{
+	if(src.type==BUTTON)
+		on_release();
+	else if(src.type==AXIS_POS || src.type==AXIS_NEG)
+	{
+		float v = src.dev->get_axis_value(src.index);
+		on_motion(0, (src.type==AXIS_POS ? origin-v : v-origin));
+		origin = v;
+	}
 }
 
 } // namespace Input