X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Flinux%2Fgamecontroller.cpp;h=38d9d2b222901ab6d6fd69462035655f7efb4c77;hb=06b42c8c1bd84c67c23a4245cbd5d3fc6f66f12b;hp=2fc624e7b83db87e677c0c2bbe5fdda0fb0ccd53;hpb=47e65794986e2b926448b3c7f99628eec40b6bb8;p=libs%2Fgui.git

diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index 2fc624e..38d9d2b 100644
--- 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,10 +12,17 @@ using namespace std;
 namespace Msp {
 namespace Input {
 
+vector<string> GameController::Private::detected_controllers;
+
 GameController::GameController(unsigned index):
 	event_disp(0)
 {
-	JsDevice *device = 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;
@@ -29,6 +37,23 @@ 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)