mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-25 11:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLang fix

Browse Source
This commit is contained in:
w1naenator 2025-03-28 17:48:27 +02:00
parent 5a874b18ba
commit 57a997ecff
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/libraries/ime/ime_keyboard_layouts.cpp
View File

@ -67,11 +67,10 @@ const std::vector<Key> kUppercaseLayout = {
// Row 6 // Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, //{5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, //{5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "", {5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1", {5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},
@ -145,11 +144,10 @@ const std::vector<Key> kLowercaseLayout = {
// Row 6 // Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "", {5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1", {5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},
@ -223,11 +221,10 @@ const std::vector<Key> kSymbols1Layout = {
// Row 6 // Row 6
{5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp}, {5, 0, 1, 1, "UP", "", KeyType::CursorUp}, // {5, 0, 1, 1, "▲", "", KeyType::CursorUp},
{5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown}, {5, 1, 1, 1, "DN", "", KeyType::CursorDown}, //{5, 1, 1, 1, "▼", "", KeyType::CursorDown},
{5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft}, {5, 2, 1, 1, "LT", "L1", KeyType::CursorLeft}, //{5, 2, 1, 1, "◀", "L1", KeyType::CursorLeft},
{5, 3, 1, 1, "RT", "R1", {5, 3, 1, 1, "RT", "R1", KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
KeyType::CursorRight}, //{5, 3, 1, 1, "▶", "R1", KeyType::CursorRight},
{5, 4, 1, 1, "KB", "", {5, 4, 1, 1, "KB", "",
KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard}, KeyType::ToggleKeyboard}, //{5, 4, 1, 1, "⌨", "", KeyType::ToggleKeyboard},
{5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions}, {5, 5, 1, 1, "...", "", KeyType::MoreOptions}, //{5, 5, 1, 1, "…", "", KeyType::MoreOptions},
{5, 6, 1, 1, "CR", "R1", {5, 6, 1, 1, "CR", "R1",
KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction}, KeyType::ControllerAction}, //{5, 6, 1, 1, "🎮⊕", "R1", KeyType::ControllerAction},

16
src/core/libraries/ime/ime_keyboard_layouts.h
View File

@ -7,14 +7,14 @@
#include <vector> #include <vector>
enum class KeyType { enum class KeyType {
Text, // Inserts character(s) into input buffer Text, // Inserts character(s) into input buffer
Backspace, // Deletes last character Backspace, // Deletes last character
Space, // Adds space Space, // Adds space
Enter, // Submits input Enter, // Submits input
Shift, // Toggle uppercase/lowercase Shift, // Toggle uppercase/lowercase
SymbolsLayout, // Switch to symbols layout SymbolsLayout, // Switch to symbols layout
TextLayout, // Switch to text layout TextLayout, // Switch to text layout
Done, // Finish and close keyboard Done, // Finish and close keyboard
CursorLeft, CursorLeft,
CursorRight, CursorRight,
CursorUp, CursorUp,