X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Finput%2Flinux%2Fgamecontroller.cpp;h=8a4e8d43c2dbb3f06c9af66dd347dad721281f46;hb=97ea3f88027c577811bcd9717ad506f254d393f5;hp=7fc59ed6669d0f99f11758f352ac1a478550b570;hpb=e15959a69551c2027029470e65a17ea5a305545b;p=libs%2Fgui.git

diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index 7fc59ed..8a4e8d4 100644
--- a/source/input/linux/gamecontroller.cpp
+++ b/source/input/linux/gamecontroller.cpp
@@ -12,11 +12,13 @@ namespace Msp {
 namespace Input {
 
 GameController::GameController(unsigned index):
-	priv(new Private)
+	priv(new Private),
+	event_disp(0)
 {
 	priv->dev = new JsDevice(format("/dev/input/js%d", index));
+	priv->dev->signal_data_available.connect(sigc::mem_fun(this, static_cast<void (GameController::*)()>(&GameController::tick)));
 	name = priv->dev->get_name();
-	tick();
+	tick(Time::zero);
 }
 
 GameController::~GameController()
@@ -25,11 +27,25 @@ GameController::~GameController()
 	delete priv;
 }
 
+void GameController::use_event_dispatcher(IO::EventDispatcher *ed)
+{
+	if(event_disp)
+		event_disp->remove(*priv->dev);
+	event_disp = ed;
+	if(event_disp)
+		event_disp->add(*priv->dev);
+}
+
 void GameController::tick()
 {
 	js_event events[16];
+	bool first = true;
 	while(1)
 	{
+		if(!first && !IO::poll(*priv->dev, IO::P_INPUT, Time::zero))
+			break;
+
+		first = false;
 		unsigned len = priv->dev->read(reinterpret_cast<char *>(events), sizeof(events));
 
 		unsigned count = len/sizeof(js_event);
@@ -49,12 +65,20 @@ void GameController::tick()
 }
 
 
+void GameController::tick(const Time::TimeDelta &timeout)
+{
+	if(IO::poll(*priv->dev, IO::P_INPUT, timeout))
+		tick();
+}
+
+
 JsDevice::JsDevice(const string &fn)
 {
 	mode = IO::M_READ;
-	*handle = open(fn.c_str(), O_RDONLY|O_NONBLOCK);
+	*handle = open(fn.c_str(), O_RDONLY);
 	if(!handle)
 		throw system_error(format("open(%s)", fn));
+	set_events(IO::P_INPUT);
 }
 
 JsDevice::~JsDevice()