Applied patch [ 1213066 ] correct device names for Joystick in Linux

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-06-02 08:06:29 +00:00
parent 86828e0f9f
commit dcd5c3d048

View File

@@ -183,10 +183,17 @@ wxJoystick::wxJoystick(int joystick)
{
wxString dev_name;
// Assume it's the same device name on all Linux systems ...
// old /dev structure
dev_name.Printf( wxT("/dev/js%d"), (joystick == wxJOYSTICK1) ? 0 : 1);
m_device = open(dev_name.fn_str(), O_RDONLY);
// new /dev structure with "input" subdirectory
if (m_device == -1)
{
dev_name.Printf( wxT("/dev/input/js%d"), (joystick == wxJOYSTICK1) ? 0 : 1);
m_device = open(dev_name.fn_str(), O_RDONLY);
}
if (m_device != -1)
{
m_thread = new wxJoystickThread(m_device, m_joystick);