[Scummvm-git-logs] scummvm master -> ef0b6e30f3e6d70e9b6c5f8b6a26786b44cb5add
sev-
noreply at scummvm.org
Thu Feb 5 00:02:57 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ef0b6e30f3 BACKENDS: Normalized keymapper action names
Commit: ef0b6e30f3e6d70e9b6c5f8b6a26786b44cb5add
https://github.com/scummvm/scummvm/commit/ef0b6e30f3e6d70e9b6c5f8b6a26786b44cb5add
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-05T01:02:00+01:00
Commit Message:
BACKENDS: Normalized keymapper action names
Changed paths:
backends/platform/3ds/osystem-events.cpp
backends/platform/ds/osystem_ds.cpp
backends/platform/sdl/miyoo/miyoo.cpp
backends/platform/sdl/opendingux/opendingux.cpp
backends/platform/sdl/ps3/ps3.cpp
backends/platform/sdl/psp2/psp2.cpp
backends/platform/sdl/switch/switch.cpp
diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp
index a911d6e5c08..b1add0b6aec 100644
--- a/backends/platform/3ds/osystem-events.cpp
+++ b/backends/platform/3ds/osystem-events.cpp
@@ -52,16 +52,16 @@ static const Common::HardwareInputTableEntry ctrJoystickButtons[] = {
{ "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("ZR") },
{ "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
{ "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
{ nullptr, 0, nullptr }
};
static const Common::AxisTableEntry ctrJoystickAxes[] = {
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("C-Pad X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("C-Pad Y") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("C-pad X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("C-pad Y") },
{ nullptr, 0, Common::kAxisTypeFull, nullptr }
};
diff --git a/backends/platform/ds/osystem_ds.cpp b/backends/platform/ds/osystem_ds.cpp
index 5d9050fa9dd..12019b09e51 100644
--- a/backends/platform/ds/osystem_ds.cpp
+++ b/backends/platform/ds/osystem_ds.cpp
@@ -179,10 +179,10 @@ static const Common::HardwareInputTableEntry ndsJoystickButtons[] = {
{ "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
{ "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
{ "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
{ nullptr, 0, nullptr }
};
diff --git a/backends/platform/sdl/miyoo/miyoo.cpp b/backends/platform/sdl/miyoo/miyoo.cpp
index bfb0ef43c3d..6b331f9fa0a 100644
--- a/backends/platform/sdl/miyoo/miyoo.cpp
+++ b/backends/platform/sdl/miyoo/miyoo.cpp
@@ -71,10 +71,10 @@ static const Common::KeyTableEntry odKeyboardButtons[] = {
{ "JOY_LEFT_SHOULDER", Common::KEYCODE_e, _s("L") },
// I18N: Hardware key
{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_t, _s("R") },
- { "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::KEYCODE_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad right") },
// I18N: Hardware key
{ "JOY_LEFT_STICK", Common::KEYCODE_TAB, _s("L2") },
// I18N: Hardware key
@@ -98,10 +98,10 @@ static const Common::KeyTableEntry odKeyboardButtons[] = {
{ "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") },
// I18N: Hardware key
{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") },
- { "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::KEYCODE_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad right") },
// I18N: Hardware key
{ "JOY_LEFT_STICK", Common::KEYCODE_PAGEUP, _s("L2") },
// I18N: Hardware key
diff --git a/backends/platform/sdl/opendingux/opendingux.cpp b/backends/platform/sdl/opendingux/opendingux.cpp
index 3c0c7eaa255..2dd1b0e3396 100644
--- a/backends/platform/sdl/opendingux/opendingux.cpp
+++ b/backends/platform/sdl/opendingux/opendingux.cpp
@@ -61,10 +61,10 @@ static const Common::KeyTableEntry odKeyboardButtons[] = {
{ "JOY_LEFT_SHOULDER", Common::KEYCODE_TAB, _s("L") },
// I18N: Hardware key
{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE, _s("R") },
- { "JOY_UP", Common::KEYCODE_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::KEYCODE_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::KEYCODE_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::KEYCODE_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::KEYCODE_RIGHT, _s("D-pad right") },
{nullptr, Common::KEYCODE_INVALID, nullptr }
};
@@ -75,8 +75,8 @@ static const Common::HardwareInputTableEntry odJoystickButtons[] = {
};
static const Common::AxisTableEntry odJoystickAxes[] = {
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left stick Y") },
{ nullptr, 0, Common::kAxisTypeFull, nullptr }
};
diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp
index 68a01ff4160..277f164d513 100644
--- a/backends/platform/sdl/ps3/ps3.cpp
+++ b/backends/platform/sdl/ps3/ps3.cpp
@@ -37,31 +37,37 @@
#include <sys/stat.h>
static const Common::HardwareInputTableEntry playstationJoystickButtons[] = {
+ // I18N: Hardware key on controller
{ "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
+ // I18N: Hardware key on controller
{ "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
+ // I18N: Hardware key on controller
{ "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
+ // I18N: Hardware key on controller
{ "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
+ // I18N: Hardware key on controller
{ "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
{ "JOY_GUIDE", Common::JOYSTICK_BUTTON_GUIDE, _s("PS") },
+ // I18N: Hardware key on controller
{ "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
{ "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
{ "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
{ "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L1") },
{ "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R1") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
{ nullptr, 0, nullptr }
};
static const Common::AxisTableEntry playstationJoystickAxes[] = {
{ "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("L2") },
{ "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("R2") },
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right stick Y") },
{ nullptr, 0, Common::kAxisTypeFull, nullptr }
};
diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index e53d6b3ed51..8925e4754e6 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -39,26 +39,32 @@
static const Common::HardwareInputTableEntry psp2JoystickButtons[] = {
+ // I18N: Hardware key on controller
{ "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
+ // I18N: Hardware key on controller
{ "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
+ // I18N: Hardware key on controller
{ "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
+ // I18N: Hardware key on controller
{ "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
+ // I18N: Hardware key on controller
{ "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
+ // I18N: Hardware key on controller
{ "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
{ "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
{ "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
{ nullptr, 0, nullptr }
};
static const Common::AxisTableEntry psp2JoystickAxes[] = {
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right stick Y") },
{ nullptr, 0, Common::kAxisTypeFull, nullptr }
};
diff --git a/backends/platform/sdl/switch/switch.cpp b/backends/platform/sdl/switch/switch.cpp
index 09365cab1d6..730f07982b0 100644
--- a/backends/platform/sdl/switch/switch.cpp
+++ b/backends/platform/sdl/switch/switch.cpp
@@ -45,20 +45,20 @@ static const Common::HardwareInputTableEntry switchJoystickButtons[] = {
{ "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
{ "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
{ "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
{ nullptr, 0, nullptr }
};
static const Common::AxisTableEntry switchJoystickAxes[] = {
{ "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("ZL") },
{ "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("ZR") },
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right stick Y") },
{ nullptr, 0, Common::kAxisTypeFull, nullptr }
};
More information about the Scummvm-git-logs
mailing list