X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Flinux%2Fgamecontroller.cpp;h=06008bcf90b0adcd2abd89d6e05eac457b049992;hb=HEAD;hp=c00379d4c70e9e595c0c1257a7ac92881f574861;hpb=7262f1e7e9ea88a021c14de9dc06ebe76112afd7;p=libs%2Fgui.git

diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index c00379d..06008bc 100644
--- a/source/input/linux/gamecontroller.cpp
+++ b/source/input/linux/gamecontroller.cpp
@@ -1,11 +1,12 @@
+#include "gamecontroller.h"
+#include "gamecontroller_platform.h"
 #include <fcntl.h>
 #include <linux/joystick.h>
+#include <msp/core/algorithm.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"
-#include "gamecontroller_platform.h"
 
 using namespace std;
 
@@ -15,7 +16,7 @@ namespace Input {
 vector<string> GameController::Private::detected_controllers;
 
 GameController::GameController(unsigned index):
-	event_disp(0)
+	Device(GAME_CONTROLLER)
 {
 	if(!detect_done)
 		detect();
@@ -42,10 +43,11 @@ unsigned GameController::detect()
 	Private::detected_controllers.clear();
 
 	FS::Path dev_input = "/dev/input";
-	list<string> devices = FS::list_filtered(dev_input, "^js[0-9]+");
-	for(list<string>::const_iterator i=devices.begin(); i!=devices.end(); ++i)
+	vector<string> devices = FS::list_filtered(dev_input, "^js[0-9]+");
+	sort(devices);
+	for(const string &f: devices)
 		// TODO check permissions
-		Private::detected_controllers.push_back((dev_input / *i).str());
+		Private::detected_controllers.push_back((dev_input/f).str());
 
 	detect_done = true;
 	n_detected_controllers = Private::detected_controllers.size();
@@ -77,11 +79,11 @@ void GameController::tick()
 		unsigned count = len/sizeof(js_event);
 		for(unsigned i=0; i<count; ++i)
 		{
-			unsigned type = events[i].type&0x7F;
+			unsigned etype = events[i].type&0x7F;
 			bool init = events[i].type&JS_EVENT_INIT;
-			if(type==JS_EVENT_AXIS)
+			if(etype==JS_EVENT_AXIS)
 				set_axis_value(events[i].number, events[i].value/32768.0f, !init);
-			else if(type==JS_EVENT_BUTTON)
+			else if(etype==JS_EVENT_BUTTON)
 				set_button_state(events[i].number, events[i].value, !init);
 		}
 
@@ -121,12 +123,12 @@ string JsDevice::get_name() const
 	return buf;
 }
 
-unsigned JsDevice::do_read(char *buf, unsigned size)
+size_t JsDevice::do_read(char *buf, size_t size)
 {
 	return IO::sys_read(handle, buf, size);
 }
 
-unsigned JsDevice::do_write(const char *, unsigned)
+size_t JsDevice::do_write(const char *, size_t)
 {
 	throw IO::invalid_access(IO::M_WRITE);
 }