Sort game controller devices for consistency

[libs/gui.git] / source / input / linux / gamecontroller.cpp

diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index 7fc59ed6669d0f99f11758f352ac1a478550b570..38d9d2b222901ab6d6fd69462035655f7efb4c77 100644 (file)
--- a/source/input/linux/gamecontroller.cpp
+++ b/source/input/linux/gamecontroller.cpp
@@ -1,6 +1,7 @@
 #include <fcntl.h>
 #include <linux/joystick.h>
 #include <msp/core/systemerror.h>
+#include <msp/fs/dir.h>
 #include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include "gamecontroller.h"
@@ -11,12 +12,23 @@ using namespace std;
 namespace Msp {
 namespace Input {
 
+vector<string> GameController::Private::detected_controllers;
+
 GameController::GameController(unsigned index):
-       priv(new Private)
+       event_disp(0)
 {
-       priv->dev = new JsDevice(format("/dev/input/js%d", index));
+       if(!detect_done)
+               detect();
+       if(index>=Private::detected_controllers.size())
+               throw device_not_available(format("GameController(%d)", index));
+
+       JsDevice *device = new JsDevice(Private::detected_controllers[index]);
+
+       priv = new Private;
+       priv->dev = device;
+       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 +37,42 @@ GameController::~GameController()
        delete priv;
 }
 
+unsigned GameController::detect()
+{
+       Private::detected_controllers.clear();
+
+       FS::Path dev_input = "/dev/input";
+       list<string> devices = FS::list_filtered(dev_input, "^js[0-9]+");
+       devices.sort();
+       for(list<string>::const_iterator i=devices.begin(); i!=devices.end(); ++i)
+               // TODO check permissions
+               Private::detected_controllers.push_back((dev_input / *i).str());
+
+       detect_done = true;
+       n_detected_controllers = Private::detected_controllers.size();
+
+       return Private::detected_controllers.size();
+}
+
+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 +92,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()