summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Swanson2014-12-31 06:02:40 -0800
committerMike Swanson2015-03-25 22:19:25 -0700
commit72d926022a4903df4cb2bb4822fd308cae797af1 (patch)
tree51fff5296c1213a78ae50ae2a74b94b5eca00e79 /src
parentad027ef6dbfeebabe0e6701eec968e9d474e497f (diff)
downloadchocolate-doom-72d926022a4903df4cb2bb4822fd308cae797af1.tar.gz
chocolate-doom-72d926022a4903df4cb2bb4822fd308cae797af1.tar.bz2
chocolate-doom-72d926022a4903df4cb2bb4822fd308cae797af1.zip
setup: add support for the Xbox One controller on Linux
Effectively it's a slightly re-arranged Xbox 360 controller, no major changes, so we can just use the same config as that one.
Diffstat (limited to 'src')
-rw-r--r--src/setup/joystick.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index dc94b2f0..2a07d181 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -331,6 +331,13 @@ static const known_joystick_t known_joysticks[] =
xbox360_controller_linux,
},
+ // Xbox One controller as it appears on Linux.
+ {
+ "Microsoft X-Box One pad",
+ 6, 11, 1,
+ xbox360_controller_linux,
+ },
+
{
"Logitech Dual Action",
4, 12, 1,