implement device descriptions in InputHandler_Linux_Joystick to fix auto-mapping

This commit is contained in:
Glenn Maynard
2005-05-17 21:16:36 +00:00
parent 9fe86706a4
commit fc9a003562
2 changed files with 11 additions and 1 deletions
@@ -57,7 +57,16 @@ InputHandler_Linux_Joystick::InputHandler_Linux_Joystick()
fds[i] = open( Paths[i], O_RDONLY );
if(fds[i] != -1)
{
char szName[1024];
ZERO( szName );
if( ioctl(fds[i], JSIOCGNAME(sizeof(szName)), szName) < 0 )
m_sDescription[i] = ssprintf( "Unknown joystick at %s", Paths[i] );
else
m_sDescription[i] = szName;
LOG->Info("Opened %s", Paths[i]);
}
}
}
@@ -148,7 +157,7 @@ void InputHandler_Linux_Joystick::GetDevicesAndDescriptions(vector<InputDevice>&
continue;
vDevicesOut.push_back( InputDevice(DEVICE_JOY1+i) );
vDescriptionsOut.push_back( ssprintf("Joystick %i", i) );
vDescriptionsOut.push_back( m_sDescription[i] );
}
}