aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Data: Add additional PromptFont glyphs

Browse Source 
Fixes missing glyphs for guide/PS buttons.
pull/3699/head
Stenzek 5 months ago
parent 10b96b9847
commit 4f6c42e0f7
No known key found for this signature in database
8 changed files with 4480 additions and 54 deletions
Show Stats Download Patch File Download Diff File

BIN
data/resources/fonts/promptfont.otf
View File

Binary file not shown.

39
dep/imgui/include/IconsPromptFont.h
Unescape Escape View File

@ -248,17 +248,6 @@
#define ICON_PF_MOUSE_UP_DOWN "\xE2\x9F\xBB"
#define ICON_PF_MOUSE_ANY "\xE2\x9F\xBC"
#define ICON_PF_BOX_CRATE "\xE2\xAC\x9B"
#define ICON_PF_PLAYSTATION "\xEE\x80\x80"
#define ICON_PF_XBOX "\xEE\x80\x81"
#define ICON_PF_NINTENDO_SWITCH "\xEE\x80\x82"
#define ICON_PF_AYANEO "\xEE\x80\x83"
#define ICON_PF_LENOVO_LEGION "\xEE\x80\x84"
#define ICON_PF_ROG_ALLY_ARMOURY "\xEE\x80\x85"
#define ICON_PF_ROG_ALLOY_COMMAND "\xEE\x80\x86"
#define ICON_PF_APPLE_MAC "\xEE\x80\x87"
#define ICON_PF_WINDOWS "\xEE\x80\x88"
#define ICON_PF_LINUX "\xEE\x80\x89"
#define ICON_PF_BSD "\xEE\x80\x8A"
#define ICON_PF_KEY_0 "\xF0\x9F\xB2\xA0"
#define ICON_PF_KEY_1 "\xF0\x9F\xB2\xA1"
#define ICON_PF_KEY_2 "\xF0\x9F\xB2\xA2"
@ -385,4 +374,30 @@
#define ICON_PF_ADD "\xE2\xAC\xBC"
#define ICON_PF_REMOVE "\xE2\xAC\xBD"
#define ICON_PF_TRASH "\xE2\xAC\xBE"
#define ICON_PF_LED "\xF0\x9F\xB3\xA2"
#define ICON_PF_MOUSE_WHEEL_BUTTON "\xF0\x9F\xB3\xA3"
#define ICON_PF_DUALSHOCK_CONTROLLER "\xF0\x9F\xB3\xA4"
#define ICON_PF_PLAYSTATION "\xF0\x9F\xB3\xA5"
#define ICON_PF_XBOX "\xF0\x9F\xB3\xA6"
#define ICON_PF_KEY_SUPER "\xF0\x9F\xB3\xA7"
#define ICON_PF_KEY_NUMPAD_1 "\xF0\x9F\xB3\xA8"
#define ICON_PF_KEY_NUMPAD_2 "\xF0\x9F\xB3\xA9"
#define ICON_PF_KEY_NUMPAD_3 "\xF0\x9F\xB3\xAA"
#define ICON_PF_KEY_NUMPAD_4 "\xF0\x9F\xB3\xAB"
#define ICON_PF_KEY_NUMPAD_5 "\xF0\x9F\xB3\xAC"
#define ICON_PF_KEY_NUMPAD_6 "\xF0\x9F\xB3\xAD"
#define ICON_PF_KEY_NUMPAD_7 "\xF0\x9F\xB3\xAE"
#define ICON_PF_KEY_NUMPAD_8 "\xF0\x9F\xB3\xAF"
#define ICON_PF_KEY_NUMPAD_9 "\xF0\x9F\xB3\xB0"
#define ICON_PF_KEY_NUMPAD_0 "\xF0\x9F\xB3\xB1"
#define ICON_PF_KEY_NUMPAD_DECIMAL "\xF0\x9F\xB3\xB2"
#define ICON_PF_KEY_NUMPAD_ENTER "\xF0\x9F\xB3\xB3"
#define ICON_PF_KEY_NUMPAD_SUBTRACT "\xF0\x9F\xB3\xB4"
#define ICON_PF_KEY_NUMPAD_ADD "\xF0\x9F\xB3\xB5"
#define ICON_PF_KEY_NUMPAD_DIVIDE "\xF0\x9F\xB3\xB6"
#define ICON_PF_KEY_NUMPAD_MULTIPLY "\xF0\x9F\xB3\xB7"
#define ICON_PF_KEY_NUMPAD_EQUAL "\xF0\x9F\xB3\xB8"
#define ICON_PF_KEY_OPTION "\xF0\x9F\xB3\xB9"
#define ICON_PF_KEY_COMMAND "\xF0\x9F\xB3\xBA"
#define ICON_PF_MENU "\xF0\x9F\xB3\xBB"
#define ICON_PF_KEY_MINUS "\xF0\x9F\xB3\xBC"

4432
extras/fonts/promptfont.sfd
View File

File diff suppressed because it is too large Load Diff

40
src/common/thirdparty/usb_key_code_data.inl vendored
Unescape Escape View File

@ -51,7 +51,7 @@ KEY_ENTRY(ESCAPE, 0x70029, 0x0001, 0x0009, 0x0001, 0x0035, "Escape", ICON_PF_ESC
KEY_ENTRY(BACKSPACE, 0x7002a, 0x000e, 0x0016, 0x000e, 0x0033, "Backspace", ICON_PF_BACKSPACE)
KEY_ENTRY(TAB, 0x7002b, 0x000f, 0x0017, 0x000f, 0x0030, "Tab", ICON_PF_TAB)
KEY_ENTRY(SPACE, 0x7002c, 0x0039, 0x0041, 0x0039, 0x0031, "Space", ICON_PF_SPACE)
KEY_ENTRY(MINUS, 0x7002d, 0x000c, 0x0014, 0x000c, 0x001b, "Minus", ICON_PF_MINUS)
KEY_ENTRY(MINUS, 0x7002d, 0x000c, 0x0014, 0x000c, 0x001b, "Minus", ICON_PF_KEY_MINUS)
KEY_ENTRY(EQUAL, 0x7002e, 0x000d, 0x0015, 0x000d, 0x0018, "Equal", ICON_PF_KEY_EQUAL)
KEY_ENTRY(BRACKET_LEFT, 0x7002f, 0x001a, 0x0022, 0x001a, 0x0021, "BracketLeft", ICON_PF_KEY_OPEN_BRACKET)
KEY_ENTRY(BRACKET_RIGHT, 0x70030, 0x001b, 0x0023, 0x001b, 0x001e, "BracketRight", ICON_PF_KEY_CLOSE_BRACKET)
@ -89,24 +89,24 @@ KEY_ENTRY(ARROW_LEFT, 0x70050, 0x0069, 0x0071, 0xe04b, 0x007b, "LeftArrow", ICON
KEY_ENTRY(ARROW_DOWN, 0x70051, 0x006c, 0x0074, 0xe050, 0x007d, "DownArrow", ICON_PF_ARROW_DOWN)
KEY_ENTRY(ARROW_UP, 0x70052, 0x0067, 0x006f, 0xe048, 0x007e, "UpArrow", ICON_PF_ARROW_UP)
KEY_ENTRY(NUM_LOCK, 0x70053, 0x0045, 0x004d, 0xe045, 0x0047, "NumLock", ICON_PF_NUMLOCK)
KEY_ENTRY(NUMPAD_DIVIDE, 0x70054, 0x0062, 0x006a, 0xe035, 0x004b, "NumpadDivide", nullptr)
KEY_ENTRY(NUMPAD_MULTIPLY, 0x70055, 0x0037, 0x003f, 0x0037, 0x0043, "NumpadMultiply", nullptr)
KEY_ENTRY(NUMPAD_SUBTRACT, 0x70056, 0x004a, 0x0052, 0x004a, 0x004e, "NumpadSubtract", nullptr)
KEY_ENTRY(NUMPAD_ADD, 0x70057, 0x004e, 0x0056, 0x004e, 0x0045, "NumpadAdd", nullptr)
KEY_ENTRY(NUMPAD_ENTER, 0x70058, 0x0060, 0x0068, 0xe01c, 0x004c, "NumpadEnter", nullptr)
KEY_ENTRY(NUMPAD1, 0x70059, 0x004f, 0x0057, 0x004f, 0x0053, "Numpad1", nullptr)
KEY_ENTRY(NUMPAD2, 0x7005a, 0x0050, 0x0058, 0x0050, 0x0054, "Numpad2", nullptr)
KEY_ENTRY(NUMPAD3, 0x7005b, 0x0051, 0x0059, 0x0051, 0x0055, "Numpad3", nullptr)
KEY_ENTRY(NUMPAD4, 0x7005c, 0x004b, 0x0053, 0x004b, 0x0056, "Numpad4", nullptr)
KEY_ENTRY(NUMPAD5, 0x7005d, 0x004c, 0x0054, 0x004c, 0x0057, "Numpad5", nullptr)
KEY_ENTRY(NUMPAD6, 0x7005e, 0x004d, 0x0055, 0x004d, 0x0058, "Numpad6", nullptr)
KEY_ENTRY(NUMPAD7, 0x7005f, 0x0047, 0x004f, 0x0047, 0x0059, "Numpad7", nullptr)
KEY_ENTRY(NUMPAD8, 0x70060, 0x0048, 0x0050, 0x0048, 0x005b, "Numpad8", nullptr)
KEY_ENTRY(NUMPAD9, 0x70061, 0x0049, 0x0051, 0x0049, 0x005c, "Numpad9", nullptr)
KEY_ENTRY(NUMPAD0, 0x70062, 0x0052, 0x005a, 0x0052, 0x0052, "Numpad0", nullptr)
KEY_ENTRY(NUMPAD_DECIMAL, 0x70063, 0x0053, 0x005b, 0x0053, 0x0041, "NumpadDecimal", nullptr)
KEY_ENTRY(NUMPAD_DIVIDE, 0x70054, 0x0062, 0x006a, 0xe035, 0x004b, "NumpadDivide", ICON_PF_KEY_NUMPAD_DIVIDE)
KEY_ENTRY(NUMPAD_MULTIPLY, 0x70055, 0x0037, 0x003f, 0x0037, 0x0043, "NumpadMultiply", ICON_PF_KEY_NUMPAD_MULTIPLY)
KEY_ENTRY(NUMPAD_SUBTRACT, 0x70056, 0x004a, 0x0052, 0x004a, 0x004e, "NumpadSubtract", ICON_PF_KEY_NUMPAD_SUBTRACT)
KEY_ENTRY(NUMPAD_ADD, 0x70057, 0x004e, 0x0056, 0x004e, 0x0045, "NumpadAdd", ICON_PF_KEY_NUMPAD_ADD)
KEY_ENTRY(NUMPAD_ENTER, 0x70058, 0x0060, 0x0068, 0xe01c, 0x004c, "NumpadEnter", ICON_PF_KEY_NUMPAD_ENTER)
KEY_ENTRY(NUMPAD1, 0x70059, 0x004f, 0x0057, 0x004f, 0x0053, "Numpad1", ICON_PF_KEY_NUMPAD_1)
KEY_ENTRY(NUMPAD2, 0x7005a, 0x0050, 0x0058, 0x0050, 0x0054, "Numpad2", ICON_PF_KEY_NUMPAD_2)
KEY_ENTRY(NUMPAD3, 0x7005b, 0x0051, 0x0059, 0x0051, 0x0055, "Numpad3", ICON_PF_KEY_NUMPAD_3)
KEY_ENTRY(NUMPAD4, 0x7005c, 0x004b, 0x0053, 0x004b, 0x0056, "Numpad4", ICON_PF_KEY_NUMPAD_4)
KEY_ENTRY(NUMPAD5, 0x7005d, 0x004c, 0x0054, 0x004c, 0x0057, "Numpad5", ICON_PF_KEY_NUMPAD_5)
KEY_ENTRY(NUMPAD6, 0x7005e, 0x004d, 0x0055, 0x004d, 0x0058, "Numpad6", ICON_PF_KEY_NUMPAD_6)
KEY_ENTRY(NUMPAD7, 0x7005f, 0x0047, 0x004f, 0x0047, 0x0059, "Numpad7", ICON_PF_KEY_NUMPAD_7)
KEY_ENTRY(NUMPAD8, 0x70060, 0x0048, 0x0050, 0x0048, 0x005b, "Numpad8", ICON_PF_KEY_NUMPAD_8)
KEY_ENTRY(NUMPAD9, 0x70061, 0x0049, 0x0051, 0x0049, 0x005c, "Numpad9", ICON_PF_KEY_NUMPAD_9)
KEY_ENTRY(NUMPAD0, 0x70062, 0x0052, 0x005a, 0x0052, 0x0052, "Numpad0", ICON_PF_KEY_NUMPAD_0)
KEY_ENTRY(NUMPAD_DECIMAL, 0x70063, 0x0053, 0x005b, 0x0053, 0x0041, "NumpadDecimal", ICON_PF_KEY_NUMPAD_DECIMAL)
KEY_ENTRY(INTL_BACKSLASH, 0x70064, 0x0056, 0x005e, 0x0056, 0x000a, "IntlBackslash", nullptr)
KEY_ENTRY(CONTEXT_MENU, 0x70065, 0x007f, 0x0087, 0xe05d, 0x006e, "ContextMenu", nullptr)
KEY_ENTRY(CONTEXT_MENU, 0x70065, 0x007f, 0x0087, 0xe05d, 0x006e, "ContextMenu", ICON_PF_MENU)
KEY_ENTRY(POWER, 0x70066, 0x0074, 0x007c, 0xe05e, 0xffff, "Power", nullptr)
KEY_ENTRY(NUMPAD_EQUAL, 0x70067, 0x0075, 0x007d, 0x0059, 0x0051, "NumpadEqual", nullptr)
KEY_ENTRY(F13, 0x70068, 0x00b7, 0x00bf, 0x0064, 0x0069, "F13", nullptr)
@ -160,11 +160,11 @@ KEY_ENTRY(NUMPAD_CLEAR_ENTRY, 0x700d9, 0x0000, 0x0000, 0x0000, 0xffff, "NumpadCl
KEY_ENTRY(CONTROL_LEFT, 0x700e0, 0x001d, 0x0025, 0x001d, 0x003b, "LeftControl", ICON_PF_KEY_LEFT_CTRL)
KEY_ENTRY(SHIFT_LEFT, 0x700e1, 0x002a, 0x0032, 0x002a, 0x0038, "LeftShift", ICON_PF_KEY_LEFT_SHIFT)
KEY_ENTRY(ALT_LEFT, 0x700e2, 0x0038, 0x0040, 0x0038, 0x003a, "LeftAlt", ICON_PF_KEY_LEFT_ALT)
KEY_ENTRY(META_LEFT, 0x700e3, 0x007d, 0x0085, 0xe05b, 0x0037, "LeftMeta", ICON_PF_WINDOWS)
KEY_ENTRY(META_LEFT, 0x700e3, 0x007d, 0x0085, 0xe05b, 0x0037, "LeftMeta", ICON_PF_KEY_SUPER)
KEY_ENTRY(CONTROL_RIGHT, 0x700e4, 0x0061, 0x0069, 0xe01d, 0x003e, "RightControl", ICON_PF_KEY_RIGHT_CTRL)
KEY_ENTRY(SHIFT_RIGHT, 0x700e5, 0x0036, 0x003e, 0x0036, 0x003c, "RightShift", ICON_PF_KEY_RIGHT_SHIFT)
KEY_ENTRY(ALT_RIGHT, 0x700e6, 0x0064, 0x006c, 0xe038, 0x003d, "RightAlt", ICON_PF_KEY_RIGHT_ALT)
KEY_ENTRY(META_RIGHT, 0x700e7, 0x007e, 0x0086, 0xe05c, 0x0036, "RightMeta", ICON_PF_WINDOWS)
KEY_ENTRY(META_RIGHT, 0x700e7, 0x007e, 0x0086, 0xe05c, 0x0036, "RightMeta", ICON_PF_KEY_SUPER)
KEY_ENTRY(INFO, 0xc0060, 0x0166, 0x016e, 0x0000, 0xffff, "Info", nullptr)
KEY_ENTRY(CLOSED_CAPTION_TOGGLE, 0xc0061, 0x0172, 0x017a, 0x0000, 0xffff, "ClosedCaptionToggle", nullptr)
KEY_ENTRY(BRIGHTNESS_UP, 0xc006f, 0x00e1, 0x00e9, 0x0000, 0xffff, "BrightnessUp", nullptr)

15
src/core/analog_controller.cpp
Unescape Escape View File

@ -802,7 +802,7 @@ constinit const Controller::ControllerBindingInfo AnalogController::s_binding_in
MOTOR("LargeMotor", TRANSLATE_NOOP("AnalogController", "Large Motor"), ICON_PF_VIBRATION_L, LargeMotor, GenericInputBinding::LargeMotor),
MOTOR("SmallMotor", TRANSLATE_NOOP("AnalogController", "Small Motor"), ICON_PF_VIBRATION, SmallMotor, GenericInputBinding::SmallMotor),
MODE_LED("AnalogLED", TRANSLATE_NOOP("AnalogController", "Analog LED"), ICON_PF_ANALOG_LEFT_RIGHT, 0, GenericInputBinding::ModeLED),
MODE_LED("AnalogLED", TRANSLATE_NOOP("AnalogController", "Analog LED"), ICON_PF_LED, 0, GenericInputBinding::ModeLED),
// clang-format on
@ -822,7 +822,8 @@ static constexpr const char* s_shoulder_settings[] = {
TRANSLATE_NOOP("AnalogController", "Analog and Digital Modes"), nullptr};
static const SettingInfo s_settings[] = {
{SettingInfo::Type::Boolean, "ForceAnalogOnReset", TRANSLATE_NOOP("AnalogController", "Automatically Enable Analog Mode"),
{SettingInfo::Type::Boolean, "ForceAnalogOnReset",
TRANSLATE_NOOP("AnalogController", "Automatically Enable Analog Mode"),
TRANSLATE_NOOP("AnalogController", "Forces the controller to analog mode when the game is started/restarted."),
"true", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "AnalogDPadInDigitalMode",
@ -833,13 +834,15 @@ static const SettingInfo s_settings[] = {
"true", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::IntegerList, "AnalogShoulderButtons",
TRANSLATE_NOOP("AnalogController", "Use Right Analog for Shoulder Buttons"),
TRANSLATE_NOOP("AnalogController",
"Allows you to use the right analog stick to control the shoulder buttons (L1/R1), as well as the buttons."),
TRANSLATE_NOOP(
"AnalogController",
"Allows you to use the right analog stick to control the shoulder buttons (L1/R1), as well as the buttons."),
"0", "0", "2", nullptr, nullptr, s_shoulder_settings, 0.0f},
{SettingInfo::Type::IntegerList, "AnalogTriggerButtons",
TRANSLATE_NOOP("AnalogController", "Use Right Analog for Trigger Buttons"),
TRANSLATE_NOOP("AnalogController",
"Allows you to use the right analog stick to control the trigger buttons (L2/R2), as well as the buttons."),
TRANSLATE_NOOP(
"AnalogController",
"Allows you to use the right analog stick to control the trigger buttons (L2/R2), as well as the buttons."),
"0", "0", "2", nullptr, nullptr, s_shoulder_settings, 0.0f},
{SettingInfo::Type::Float, "AnalogDeadzone", TRANSLATE_NOOP("AnalogController", "Analog Deadzone"),
TRANSLATE_NOOP("AnalogController",

2
src/core/analog_joystick.cpp
Unescape Escape View File

@ -376,7 +376,7 @@ constinit const Controller::ControllerBindingInfo AnalogJoystick::s_binding_info
AXIS("RDown", TRANSLATE_NOOP("AnalogJoystick", "Right Stick Down"), ICON_PF_RIGHT_ANALOG_DOWN, AnalogJoystick::HalfAxis::RDown, GenericInputBinding::RightStickDown),
AXIS("RUp", TRANSLATE_NOOP("AnalogJoystick", "Right Stick Up"), ICON_PF_RIGHT_ANALOG_UP, AnalogJoystick::HalfAxis::RUp, GenericInputBinding::RightStickUp),
MODE_LED("ModeLED", TRANSLATE_NOOP("AnalogJoystick", "Mode LED"), ICON_PF_ANALOG_LEFT_RIGHT, 0, GenericInputBinding::ModeLED),
MODE_LED("ModeLED", TRANSLATE_NOOP("AnalogJoystick", "Mode LED"), ICON_PF_LED, 0, GenericInputBinding::ModeLED),
// clang-format on
#undef AXIS

4
src/core/jogcon.cpp
Unescape Escape View File

@ -636,8 +636,8 @@ constinit const Controller::ControllerBindingInfo JogCon::s_binding_info[] = {
// clang-format on
{"ModeLED", TRANSLATE_NOOP("JogCon", "Mode LED"), ICON_PF_ANALOG_LEFT_RIGHT, LED_BIND_START_INDEX,
InputBindingInfo::Type::LED, GenericInputBinding::ModeLED},
{"ModeLED", TRANSLATE_NOOP("JogCon", "Mode LED"), ICON_PF_LED, LED_BIND_START_INDEX, InputBindingInfo::Type::LED,
GenericInputBinding::ModeLED},
{"Motor", TRANSLATE_NOOP("JogCon", "Vibration Motor"), ICON_PF_VIBRATION, MOTOR_BIND_START_INDEX,
InputBindingInfo::Type::Motor, GenericInputBinding::LargeMotor},

2
src/core/negcon_rumble.cpp
Unescape Escape View File

@ -743,7 +743,7 @@ constinit const Controller::ControllerBindingInfo NeGconRumble::s_binding_info[]
MOTOR("LargeMotor", TRANSLATE_NOOP("AnalogController", "Large Motor"), ICON_PF_VIBRATION_L, LargeMotor, GenericInputBinding::LargeMotor),
MOTOR("SmallMotor", TRANSLATE_NOOP("AnalogController", "Small Motor"), ICON_PF_VIBRATION, SmallMotor, GenericInputBinding::SmallMotor),
MODE_LED("ModeLED", TRANSLATE_NOOP("AnalogController", "Mode LED"), ICON_PF_ANALOG_LEFT_RIGHT, 0, GenericInputBinding::ModeLED),
MODE_LED("ModeLED", TRANSLATE_NOOP("AnalogController", "Mode LED"), ICON_PF_LED, 0, GenericInputBinding::ModeLED),
// clang-format on
#undef MOTOR

Write Preview
Loading…
Cancel
Save