version 1.1, 2010/08/22 12:37:40 |
version 1.2, 2011/10/26 15:21:37 |
|
|
--- src/linux/LinuxInputManager.cpp.orig Mon Jan 28 00:24:28 2008 |
$OpenBSD$ |
+++ src/linux/LinuxInputManager.cpp Mon May 31 14:19:26 2010 |
--- src/linux/LinuxInputManager.cpp.orig Mon Aug 16 02:51:34 2010 |
@@ -22,7 +22,6 @@ restrictions: |
+++ src/linux/LinuxInputManager.cpp Fri Sep 16 16:59:56 2011 |
*/ |
@@ -22,7 +22,6 @@ restrictions:
|
#include "linux/LinuxInputManager.h" |
*/
|
#include "linux/LinuxKeyboard.h" |
#include "linux/LinuxInputManager.h"
|
-#include "linux/LinuxJoyStickEvents.h" |
#include "linux/LinuxKeyboard.h"
|
#include "linux/LinuxMouse.h" |
-#include "linux/LinuxJoyStickEvents.h"
|
#include "OISException.h" |
#include "linux/LinuxMouse.h"
|
#include <cstdlib> |
#include "OISException.h"
|
@@ -49,8 +48,6 @@ LinuxInputManager::LinuxInputManager() : InputManager( |
#include <cstdlib>
|
//--------------------------------------------------------------------------------// |
@@ -48,8 +47,6 @@ LinuxInputManager::LinuxInputManager() : InputManager( |
LinuxInputManager::~LinuxInputManager() |
//--------------------------------------------------------------------------------//
|
{ |
LinuxInputManager::~LinuxInputManager()
|
- //Close all joysticks |
{
|
- LinuxJoyStick::_clearJoys(unusedJoyStickList); |
- //Close all joysticks
|
} |
- LinuxJoyStick::_clearJoys(unusedJoyStickList);
|
|
}
|
//--------------------------------------------------------------------------------// |
|
@@ -99,8 +96,6 @@ void LinuxInputManager::_parseConfigSettings( ParamLis |
//--------------------------------------------------------------------------------//
|
void LinuxInputManager::_enumerateDevices() |
@@ -92,9 +89,6 @@ void LinuxInputManager::_parseConfigSettings( ParamLis |
{ |
//--------------------------------------------------------------------------------//
|
//Enumerate all attached devices |
void LinuxInputManager::_enumerateDevices()
|
- unusedJoyStickList = LinuxJoyStick::_scanJoys(); |
{
|
- joySticks = unusedJoyStickList.size(); |
- //Enumerate all attached devices
|
} |
- unusedJoyStickList = LinuxJoyStick::_scanJoys();
|
|
- joySticks = unusedJoyStickList.size();
|
//----------------------------------------------------------------------------// |
}
|
@@ -114,9 +109,6 @@ DeviceList LinuxInputManager::freeDeviceList() |
|
if( mouseUsed == false ) |
//----------------------------------------------------------------------------//
|
ret.insert(std::make_pair(OISMouse, mInputSystemName)); |
@@ -174,19 +168,6 @@ Object* LinuxInputManager::createObject(InputManager * |
|
obj = new LinuxMouse(this, bufferMode, grabMouse, hideMouse);
|
- for(JoyStickInfoList::iterator i = unusedJoyStickList.begin(); i != unusedJoyStickList.end(); ++i) |
break;
|
- ret.insert(std::make_pair(OISJoyStick, i->vendor)); |
}
|
- |
- case OISJoyStick:
|
return ret; |
- {
|
} |
- for(JoyStickInfoList::iterator i = unusedJoyStickList.begin(); i != unusedJoyStickList.end(); ++i)
|
|
- {
|
@@ -127,7 +119,7 @@ int LinuxInputManager::totalDevices(Type iType) |
- if(vendor == "" || i->vendor == vendor)
|
{ |
- {
|
case OISKeyboard: return 1; |
- obj = new LinuxJoyStick(this, bufferMode, *i);
|
case OISMouse: return 1; |
- unusedJoyStickList.erase(i);
|
- case OISJoyStick: return joySticks; |
- break;
|
+ case OISJoyStick: return 0; |
- }
|
default: return 0; |
- }
|
} |
- break;
|
} |
- }
|
@@ -139,7 +131,7 @@ int LinuxInputManager::freeDevices(Type iType) |
default:
|
{ |
break;
|
case OISKeyboard: return keyboardUsed ? 0 : 1; |
}
|
case OISMouse: return mouseUsed ? 0 : 1; |
@@ -204,7 +185,6 @@ void LinuxInputManager::destroyObject( Object* obj )
|
- case OISJoyStick: return (int)unusedJoyStickList.size(); |
{
|
+ case OISJoyStick: return 0; |
if( obj->type() == OISJoyStick )
|
default: return 0; |
{
|
} |
- unusedJoyStickList.push_back( ((LinuxJoyStick*)obj)->_getJoyInfo() );
|
} |
}
|
@@ -180,19 +172,6 @@ Object* LinuxInputManager::createObject(InputManager * |
|
obj = new LinuxMouse(this, bufferMode, grabMouse, hideMouse); |
delete obj;
|
break; |
|
} |
|
- case OISJoyStick: |
|
- { |
|
- for(JoyStickInfoList::iterator i = unusedJoyStickList.begin(); i != unusedJoyStickList.end(); ++i) |
|
- { |
|
- if(vendor == "" || i->vendor == vendor) |
|
- { |
|
- obj = new LinuxJoyStick(this, bufferMode, *i); |
|
- unusedJoyStickList.erase(i); |
|
- break; |
|
- } |
|
- } |
|
- break; |
|
- } |
|
default: |
|
break; |
|
} |
|
@@ -208,11 +187,6 @@ void LinuxInputManager::destroyObject( Object* obj ) |
|
{ |
|
if( obj ) |
|
{ |
|
- if( obj->type() == OISJoyStick ) |
|
- { |
|
- unusedJoyStickList.push_back( ((LinuxJoyStick*)obj)->_getJoyInfo() ); |
|
- } |
|
- |
|
delete obj; |
|
} |
|
} |
|