From dcd5c3d0487b80a026c87bf67e887be0289bc4eb Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 2 Jun 2005 08:06:29 +0000 Subject: [PATCH] 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 --- src/unix/joystick.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp index 0a32033ee3..a9c434cbc1 100644 --- a/src/unix/joystick.cpp +++ b/src/unix/joystick.cpp @@ -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); -- 2.45.2