diff options
| author | Simon Howard | 2014-08-13 21:14:21 -0400 |
|---|---|---|
| committer | Simon Howard | 2014-08-13 21:14:21 -0400 |
| commit | 6b422a3ed52742adeb57da3fa934090130696d2a (patch) | |
| tree | 2313b0b6344ee12d7a6869bb12b1bf1fa72867f7 /src/setup | |
| parent | b83132a4962787aabf2e07ae90d37d6d87b001b3 (diff) | |
| parent | af553de8c714a80ea6ada5cc7487c689ed9fccb0 (diff) | |
| download | chocolate-doom-6b422a3ed52742adeb57da3fa934090130696d2a.tar.gz chocolate-doom-6b422a3ed52742adeb57da3fa934090130696d2a.tar.bz2 chocolate-doom-6b422a3ed52742adeb57da3fa934090130696d2a.zip | |
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Diffstat (limited to 'src/setup')
| -rw-r--r-- | src/setup/joystick.c | 27 | ||||
| -rw-r--r-- | src/setup/setup.desktop.in | 6 |
2 files changed, 30 insertions, 3 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index b57667f4..4cc62fe1 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -206,6 +206,26 @@ static const joystick_config_t xbox360_controller[] = {NULL, 0}, }; +// Xbox 360 controller under Linux. +static const joystick_config_t xbox360_controller_linux[] = +{ + {"joystick_x_axis", CREATE_HAT_AXIS(0, HAT_AXIS_HORIZONTAL)}, + {"joystick_y_axis", CREATE_HAT_AXIS(0, HAT_AXIS_VERTICAL)}, + // Ideally we'd like the trigger buttons to be strafe left/right + // But Linux presents each trigger button as its own axis, which + // we can't really work with. So we have to settle for a + // suboptimal setup. + {"joyb_fire", 2}, // X + {"joyb_speed", 0}, // A + {"joyb_jump", 3}, // Y + {"joyb_use", 1}, // B + {"joyb_strafeleft", 4}, // LB + {"joyb_straferight", 5}, // RB + {"joyb_menu_activate", 7}, // Start + {"joyb_prevweapon", 6}, // Back + {NULL, 0}, +}; + // Logitech Dual Action (F310, F710). Thanks to Brad Harding for details. static const joystick_config_t logitech_f310_controller[] = { @@ -249,6 +269,13 @@ static const known_joystick_t known_joysticks[] = xbox360_controller, }, + // Xbox 360 controller as it appears on Linux. + { + "Microsoft X-Box 360 pad", + 6, 11, 1, + xbox360_controller_linux, + }, + { "Logitech Dual Action", 4, 12, 1, diff --git a/src/setup/setup.desktop.in b/src/setup/setup.desktop.in index 4b1cf69c..91decb41 100644 --- a/src/setup/setup.desktop.in +++ b/src/setup/setup.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -Name=@PACKAGE_NAME@ Setup -Exec=@PROGRAM_PREFIX@doom-setup +Name=@PACKAGE_SHORTNAME@ Setup +Exec=@PROGRAM_PREFIX@setup Icon=@PROGRAM_PREFIX@setup Type=Application -Comment=Setup tool for @PACKAGE_NAME@ +Comment=Setup tool for @PACKAGE_SHORTNAME@ Categories=Settings |