[Scummvm-git-logs] scummvm master -> 5f450853d1ea613ba7b1cbd422c3d2a463060639
sev-
noreply at scummvm.org
Sat Jan 3 15:53:21 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:
5f450853d1 KEYMAPPER: Fix capitalization in key descriptions
Commit: 5f450853d1ea613ba7b1cbd422c3d2a463060639
https://github.com/scummvm/scummvm/commit/5f450853d1ea613ba7b1cbd422c3d2a463060639
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-01-03T16:52:40+01:00
Commit Message:
KEYMAPPER: Fix capitalization in key descriptions
Changed paths:
backends/keymapper/hardware-input.cpp
diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp
index 02598d8fefe..08749ddda1f 100644
--- a/backends/keymapper/hardware-input.cpp
+++ b/backends/keymapper/hardware-input.cpp
@@ -130,7 +130,7 @@ const KeyTableEntry defaultKeys[] = {
{"KP_MULTIPLY", KEYCODE_KP_MULTIPLY, "KP*"},
{"KP_MINUS", KEYCODE_KP_MINUS, "KP-"},
{"KP_PLUS", KEYCODE_KP_PLUS, "KP+"},
- {"KP_ENTER", KEYCODE_KP_ENTER, "KP Enter"},
+ {"KP_ENTER", KEYCODE_KP_ENTER, "KP enter"},
{"KP_EQUALS", KEYCODE_KP_EQUALS, "KP="},
// Arrows + Home/End pad
@@ -179,10 +179,10 @@ const KeyTableEntry defaultKeys[] = {
{"SLEEP", KEYCODE_SLEEP, "Sleep"},
{"MUTE", KEYCODE_MUTE, "Mute"},
{"EJECT", KEYCODE_EJECT, "Eject"},
- {"VOLUMEUP", KEYCODE_VOLUMEUP, "Volume Up"},
- {"VOLUMEDOWN", KEYCODE_VOLUMEDOWN, "Volume Down"},
- {"LEFTSOFT", KEYCODE_LEFTSOFT, "Left Soft"},
- {"RIGHTSOFT", KEYCODE_RIGHTSOFT, "Right Soft"},
+ {"VOLUMEUP", KEYCODE_VOLUMEUP, "Volume up"},
+ {"VOLUMEDOWN", KEYCODE_VOLUMEDOWN, "Volume down"},
+ {"LEFTSOFT", KEYCODE_LEFTSOFT, "Left soft"},
+ {"RIGHTSOFT", KEYCODE_RIGHTSOFT, "Right soft"},
{"CALL", KEYCODE_CALL, "Call"},
{"HANGUP", KEYCODE_HANGUP, "Hang up"},
{"CAMERA", KEYCODE_CAMERA, "Camera"},
@@ -196,35 +196,35 @@ const KeyTableEntry defaultKeys[] = {
{"CANCEL", KEYCODE_CANCEL, "Cancel"},
// Action keys
- {"AC_SEARCH", KEYCODE_AC_SEARCH, "AC Search"},
- {"AC_HOME", KEYCODE_AC_HOME, "AC Home"},
- {"AC_BACK", KEYCODE_AC_BACK, "AC Back"},
- {"AC_FORWARD", KEYCODE_AC_FORWARD, "AC Forward"},
- {"AC_STOP", KEYCODE_AC_STOP, "AC Stop"},
- {"AC_REFRESH", KEYCODE_AC_REFRESH, "AC Refresh"},
- {"AC_BOOKMARKS", KEYCODE_AC_BOOKMARKS, "AC Bookmarks"},
+ {"AC_SEARCH", KEYCODE_AC_SEARCH, "AC search"},
+ {"AC_HOME", KEYCODE_AC_HOME, "AC home"},
+ {"AC_BACK", KEYCODE_AC_BACK, "AC back"},
+ {"AC_FORWARD", KEYCODE_AC_FORWARD, "AC forward"},
+ {"AC_STOP", KEYCODE_AC_STOP, "AC stop"},
+ {"AC_REFRESH", KEYCODE_AC_REFRESH, "AC refresh"},
+ {"AC_BOOKMARKS", KEYCODE_AC_BOOKMARKS, "AC bookmarks"},
// Audio keys
- {"AUDIONEXT", KEYCODE_AUDIONEXT, "Audio Next"},
- {"AUDIOPREV", KEYCODE_AUDIOPREV, "Audio Previous"},
- {"AUDIOSTOP", KEYCODE_AUDIOSTOP, "Audio Stop"},
- {"AUDIOPLAY", KEYCODE_AUDIOPLAY, "Audio Play"},
- {"AUDIOPAUSE", KEYCODE_AUDIOPAUSE, "Audio Pause"},
- {"AUDIOPLAYPAUSE", KEYCODE_AUDIOPLAYPAUSE, "Audio Play/Pause"},
- {"AUDIOMUTE", KEYCODE_AUDIOMUTE, "Audio Mute"},
- {"AUDIOREWIND", KEYCODE_AUDIOREWIND, "Audio Rewind"},
- {"AUDIOFASTFORWARD", KEYCODE_AUDIOFASTFORWARD, "Audio Fast-Forward"},
+ {"AUDIONEXT", KEYCODE_AUDIONEXT, "Audio next"},
+ {"AUDIOPREV", KEYCODE_AUDIOPREV, "Audio previous"},
+ {"AUDIOSTOP", KEYCODE_AUDIOSTOP, "Audio stop"},
+ {"AUDIOPLAY", KEYCODE_AUDIOPLAY, "Audio play"},
+ {"AUDIOPAUSE", KEYCODE_AUDIOPAUSE, "Audio pause"},
+ {"AUDIOPLAYPAUSE", KEYCODE_AUDIOPLAYPAUSE, "Audio play/pause"},
+ {"AUDIOMUTE", KEYCODE_AUDIOMUTE, "Audio mute"},
+ {"AUDIOREWIND", KEYCODE_AUDIOREWIND, "Audio rewind"},
+ {"AUDIOFASTFORWARD", KEYCODE_AUDIOFASTFORWARD, "Audio fast-forward"},
// Modifier keys
- {"SCROLLOCK", KEYCODE_SCROLLOCK, "Scroll Lock" },
- {"CAPSLOCK", KEYCODE_CAPSLOCK, "Caps Lock" },
- {"NUMLOCK", KEYCODE_NUMLOCK, "Num Lock" },
- {"LSHIFT", KEYCODE_LSHIFT, "Left Shift" },
- {"RSHIFT", KEYCODE_RSHIFT, "Right Shift" },
- {"LALT", KEYCODE_LALT, "Left Alt" },
- {"RALT", KEYCODE_RALT, "Right Alt" },
- {"LCTRL", KEYCODE_LCTRL, "Left Control" },
- {"RCTRL", KEYCODE_RCTRL, "Right Control" },
+ {"SCROLLOCK", KEYCODE_SCROLLOCK, "Scroll lock" },
+ {"CAPSLOCK", KEYCODE_CAPSLOCK, "Caps lock" },
+ {"NUMLOCK", KEYCODE_NUMLOCK, "Num lock" },
+ {"LSHIFT", KEYCODE_LSHIFT, "Left shift" },
+ {"RSHIFT", KEYCODE_RSHIFT, "Right shift" },
+ {"LALT", KEYCODE_LALT, "Left alt" },
+ {"RALT", KEYCODE_RALT, "Right alt" },
+ {"LCTRL", KEYCODE_LCTRL, "Left control" },
+ {"RCTRL", KEYCODE_RCTRL, "Right control" },
{"LMETA", KEYCODE_LMETA, "Left " META_KEY_NAME },
{"RMETA", KEYCODE_RMETA, "Right " META_KEY_NAME },
@@ -241,13 +241,13 @@ const ModifierTableEntry defaultModifiers[] = {
};
const HardwareInputTableEntry defaultMouseButtons[] = {
- { "MOUSE_LEFT", MOUSE_BUTTON_LEFT, _s("Left Mouse Button") },
- { "MOUSE_RIGHT", MOUSE_BUTTON_RIGHT, _s("Right Mouse Button") },
- { "MOUSE_MIDDLE", MOUSE_BUTTON_MIDDLE, _s("Middle Mouse Button") },
- { "MOUSE_WHEEL_UP", MOUSE_WHEEL_UP, _s("Mouse Wheel Up") },
- { "MOUSE_WHEEL_DOWN", MOUSE_WHEEL_DOWN, _s("Mouse Wheel Down") },
- { "MOUSE_X1", MOUSE_BUTTON_X1, _s("X1 Mouse Button") },
- { "MOUSE_X2", MOUSE_BUTTON_X2, _s("X2 Mouse Button") },
+ { "MOUSE_LEFT", MOUSE_BUTTON_LEFT, _s("Left mouse button") },
+ { "MOUSE_RIGHT", MOUSE_BUTTON_RIGHT, _s("Right mouse button") },
+ { "MOUSE_MIDDLE", MOUSE_BUTTON_MIDDLE, _s("Middle mouse button") },
+ { "MOUSE_WHEEL_UP", MOUSE_WHEEL_UP, _s("Mouse wheel up") },
+ { "MOUSE_WHEEL_DOWN", MOUSE_WHEEL_DOWN, _s("Mouse wheel down") },
+ { "MOUSE_X1", MOUSE_BUTTON_X1, _s("X1 mouse button") },
+ { "MOUSE_X2", MOUSE_BUTTON_X2, _s("X2 mouse button") },
{ nullptr, 0, nullptr }
};
@@ -256,28 +256,28 @@ const HardwareInputTableEntry defaultJoystickButtons[] = {
{ "JOY_B", JOYSTICK_BUTTON_B, _s("Joy B") },
{ "JOY_X", JOYSTICK_BUTTON_X, _s("Joy X") },
{ "JOY_Y", JOYSTICK_BUTTON_Y, _s("Joy Y") },
- { "JOY_BACK", JOYSTICK_BUTTON_BACK, _s("Joy Back") },
- { "JOY_GUIDE", JOYSTICK_BUTTON_GUIDE, _s("Joy Guide") },
- { "JOY_START", JOYSTICK_BUTTON_START, _s("Joy Start") },
- { "JOY_LEFT_STICK", JOYSTICK_BUTTON_LEFT_STICK, _s("Left Stick") },
- { "JOY_RIGHT_STICK", JOYSTICK_BUTTON_RIGHT_STICK, _s("Right Stick") },
- { "JOY_LEFT_SHOULDER", JOYSTICK_BUTTON_LEFT_SHOULDER, _s("Left Shoulder") },
- { "JOY_RIGHT_SHOULDER", JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("Right Shoulder") },
- { "JOY_UP", JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { "JOY_CENTER", JOYSTICK_BUTTON_DPAD_CENTER, _s("D-pad Center") },
+ { "JOY_BACK", JOYSTICK_BUTTON_BACK, _s("Joy back") },
+ { "JOY_GUIDE", JOYSTICK_BUTTON_GUIDE, _s("Joy guide") },
+ { "JOY_START", JOYSTICK_BUTTON_START, _s("Joy start") },
+ { "JOY_LEFT_STICK", JOYSTICK_BUTTON_LEFT_STICK, _s("Left stick") },
+ { "JOY_RIGHT_STICK", JOYSTICK_BUTTON_RIGHT_STICK, _s("Right stick") },
+ { "JOY_LEFT_SHOULDER", JOYSTICK_BUTTON_LEFT_SHOULDER, _s("Left shoulder") },
+ { "JOY_RIGHT_SHOULDER", JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("Right shoulder") },
+ { "JOY_UP", JOYSTICK_BUTTON_DPAD_UP, _s("D-pad up") },
+ { "JOY_DOWN", JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad down") },
+ { "JOY_LEFT", JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad left") },
+ { "JOY_RIGHT", JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad right") },
+ { "JOY_CENTER", JOYSTICK_BUTTON_DPAD_CENTER, _s("D-pad center") },
{ nullptr, 0, nullptr }
};
const AxisTableEntry defaultJoystickAxes[] = {
- { "JOY_LEFT_TRIGGER", JOYSTICK_AXIS_LEFT_TRIGGER, kAxisTypeHalf, _s("Left Trigger") },
- { "JOY_RIGHT_TRIGGER", JOYSTICK_AXIS_RIGHT_TRIGGER, kAxisTypeHalf, _s("Right Trigger") },
- { "JOY_LEFT_STICK_X", JOYSTICK_AXIS_LEFT_STICK_X, kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", JOYSTICK_AXIS_LEFT_STICK_Y, kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", JOYSTICK_AXIS_RIGHT_STICK_X, kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", JOYSTICK_AXIS_RIGHT_STICK_Y, kAxisTypeFull, _s("Right Stick Y") },
+ { "JOY_LEFT_TRIGGER", JOYSTICK_AXIS_LEFT_TRIGGER, kAxisTypeHalf, _s("Left trigger") },
+ { "JOY_RIGHT_TRIGGER", JOYSTICK_AXIS_RIGHT_TRIGGER, kAxisTypeHalf, _s("Right trigger") },
+ { "JOY_LEFT_STICK_X", JOYSTICK_AXIS_LEFT_STICK_X, kAxisTypeFull, _s("Left stick X") },
+ { "JOY_LEFT_STICK_Y", JOYSTICK_AXIS_LEFT_STICK_Y, kAxisTypeFull, _s("Left stick Y") },
+ { "JOY_RIGHT_STICK_X", JOYSTICK_AXIS_RIGHT_STICK_X, kAxisTypeFull, _s("Right stick X") },
+ { "JOY_RIGHT_STICK_Y", JOYSTICK_AXIS_RIGHT_STICK_Y, kAxisTypeFull, _s("Right stick Y") },
{ "JOY_HAT_X", JOYSTICK_AXIS_HAT_X, kAxisTypeFull, _s("Hat X") },
{ "JOY_HAT_Y", JOYSTICK_AXIS_HAT_Y, kAxisTypeFull, _s("Hat Y") },
{ nullptr, 0, kAxisTypeFull, nullptr }
More information about the Scummvm-git-logs
mailing list