From 5769ae3e78f19adfdd73248622b4e49198822378 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sun, 13 Dec 2020 07:30:23 +0100 Subject: [PATCH] PAD: formatting fixes --- pcsx2/CMakeLists.txt | 2 +- pcsx2/PAD/Linux/wx_dialog/dialog.cpp | 362 +++++++++------------------ pcsx2/PAD/Windows/resource_pad.h | 2 + 3 files changed, 125 insertions(+), 241 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index dd0071445a..017c899987 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1008,7 +1008,7 @@ if(Linux) set(Platform_Libs ${LIBUDEV_LIBRARIES} - ${X11_LIBRARIES} + ${X11_LIBRARIES} ) endif() diff --git a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp b/pcsx2/PAD/Linux/wx_dialog/dialog.cpp index d211e707aa..8b8c43af31 100644 --- a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp +++ b/pcsx2/PAD/Linux/wx_dialog/dialog.cpp @@ -38,246 +38,128 @@ static std::string KeyName(int pad, int key, int keysym) switch (keysym) { - case kVK_ANSI_A: - return "A"; - case kVK_ANSI_B: - return "B"; - case kVK_ANSI_C: - return "C"; - case kVK_ANSI_D: - return "D"; - case kVK_ANSI_E: - return "E"; - case kVK_ANSI_F: - return "F"; - case kVK_ANSI_G: - return "G"; - case kVK_ANSI_H: - return "H"; - case kVK_ANSI_I: - return "I"; - case kVK_ANSI_J: - return "J"; - case kVK_ANSI_K: - return "K"; - case kVK_ANSI_L: - return "L"; - case kVK_ANSI_M: - return "M"; - case kVK_ANSI_N: - return "N"; - case kVK_ANSI_O: - return "O"; - case kVK_ANSI_P: - return "P"; - case kVK_ANSI_Q: - return "Q"; - case kVK_ANSI_R: - return "R"; - case kVK_ANSI_S: - return "S"; - case kVK_ANSI_T: - return "T"; - case kVK_ANSI_U: - return "U"; - case kVK_ANSI_V: - return "V"; - case kVK_ANSI_W: - return "W"; - case kVK_ANSI_X: - return "X"; - case kVK_ANSI_Y: - return "Y"; - case kVK_ANSI_Z: - return "Z"; - case kVK_ANSI_0: - return "0"; - case kVK_ANSI_1: - return "1"; - case kVK_ANSI_2: - return "2"; - case kVK_ANSI_3: - return "3"; - case kVK_ANSI_4: - return "4"; - case kVK_ANSI_5: - return "5"; - case kVK_ANSI_6: - return "6"; - case kVK_ANSI_7: - return "7"; - case kVK_ANSI_8: - return "8"; - case kVK_ANSI_9: - return "9"; - case kVK_ANSI_Grave: - return "`"; - case kVK_ANSI_Minus: - return "-"; - case kVK_ANSI_Equal: - return "="; - case kVK_ANSI_LeftBracket: - return "["; - case kVK_ANSI_RightBracket: - return "]"; - case kVK_ANSI_Backslash: - return "\\"; - case kVK_ANSI_Semicolon: - return ";"; - case kVK_ANSI_Quote: - return "'"; - case kVK_ANSI_Comma: - return ","; - case kVK_ANSI_Period: - return "."; - case kVK_ANSI_Slash: - return "/"; - case kVK_Escape: - return "⎋"; - case kVK_Tab: - return "⇥"; - case kVK_Delete: - return "⌫"; - case kVK_ForwardDelete: - return "⌦"; - case kVK_Return: - return "↩"; - case kVK_Space: - return "␣"; - case kVK_ANSI_KeypadDecimal: - return "Keypad ."; - case kVK_ANSI_KeypadMultiply: - return "Keypad *"; - case kVK_ANSI_KeypadPlus: - return "Keypad +"; - case kVK_ANSI_KeypadClear: - return "⌧"; - case kVK_ANSI_KeypadDivide: - return "Keypad /"; - case kVK_ANSI_KeypadEnter: - return "⌤"; - case kVK_ANSI_KeypadMinus: - return "Keypad -"; - case kVK_ANSI_KeypadEquals: - return "Keypad ="; - case kVK_ANSI_Keypad0: - return "Keypad 0"; - case kVK_ANSI_Keypad1: - return "Keypad 1"; - case kVK_ANSI_Keypad2: - return "Keypad 2"; - case kVK_ANSI_Keypad3: - return "Keypad 3"; - case kVK_ANSI_Keypad4: - return "Keypad 4"; - case kVK_ANSI_Keypad5: - return "Keypad 5"; - case kVK_ANSI_Keypad6: - return "Keypad 6"; - case kVK_ANSI_Keypad7: - return "Keypad 7"; - case kVK_ANSI_Keypad8: - return "Keypad 8"; - case kVK_ANSI_Keypad9: - return "Keypad 9"; - case kVK_Command: - return "Left ⌘"; - case kVK_Shift: - return "Left ⇧"; - case kVK_CapsLock: - return "⇪"; - case kVK_Option: - return "Left ⌥"; - case kVK_Control: - return "Left ⌃"; - case kVK_RightCommand: - return "Right ⌘"; - case kVK_RightShift: - return "Right ⇧"; - case kVK_RightOption: - return "Right ⌥"; - case kVK_RightControl: - return "Right ⌃"; - case kVK_Function: - return "fn"; - case kVK_VolumeUp: - return "Volume Up"; - case kVK_VolumeDown: - return "Volume Down"; - case kVK_Mute: - return "Mute"; - case kVK_F1: - return "F1"; - case kVK_F2: - return "F2"; - case kVK_F3: - return "F3"; - case kVK_F4: - return "F4"; - case kVK_F5: - return "F5"; - case kVK_F6: - return "F6"; - case kVK_F7: - return "F7"; - case kVK_F8: - return "F8"; - case kVK_F9: - return "F9"; - case kVK_F10: - return "F10"; - case kVK_F11: - return "F11"; - case kVK_F12: - return "F12"; - case kVK_F13: - return "F13"; - case kVK_F14: - return "F14"; - case kVK_F15: - return "F15"; - case kVK_F16: - return "F16"; - case kVK_F17: - return "F17"; - case kVK_F18: - return "F18"; - case kVK_F19: - return "F19"; - case kVK_F20: - return "F20"; - case kVK_Help: - return "Help"; - case kVK_Home: - return "↖"; - case kVK_PageUp: - return "⇞"; - case kVK_End: - return "↘"; - case kVK_PageDown: - return "⇟"; - case kVK_LeftArrow: - return "←"; - case kVK_RightArrow: - return "→"; - case kVK_DownArrow: - return "↓"; - case kVK_UpArrow: - return "↑"; - case kVK_ISO_Section: - return "Section"; - case kVK_JIS_Yen: - return "¥"; - case kVK_JIS_Underscore: - return "_"; - case kVK_JIS_KeypadComma: - return "Keypad ,"; - case kVK_JIS_Eisu: - return "英数"; - case kVK_JIS_Kana: - return "かな"; - default: - return "Key " + std::to_string(keysym); + // clang-format off + case kVK_ANSI_A: return "A"; + case kVK_ANSI_B: return "B"; + case kVK_ANSI_C: return "C"; + case kVK_ANSI_D: return "D"; + case kVK_ANSI_E: return "E"; + case kVK_ANSI_F: return "F"; + case kVK_ANSI_G: return "G"; + case kVK_ANSI_H: return "H"; + case kVK_ANSI_I: return "I"; + case kVK_ANSI_J: return "J"; + case kVK_ANSI_K: return "K"; + case kVK_ANSI_L: return "L"; + case kVK_ANSI_M: return "M"; + case kVK_ANSI_N: return "N"; + case kVK_ANSI_O: return "O"; + case kVK_ANSI_P: return "P"; + case kVK_ANSI_Q: return "Q"; + case kVK_ANSI_R: return "R"; + case kVK_ANSI_S: return "S"; + case kVK_ANSI_T: return "T"; + case kVK_ANSI_U: return "U"; + case kVK_ANSI_V: return "V"; + case kVK_ANSI_W: return "W"; + case kVK_ANSI_X: return "X"; + case kVK_ANSI_Y: return "Y"; + case kVK_ANSI_Z: return "Z"; + case kVK_ANSI_0: return "0"; + case kVK_ANSI_1: return "1"; + case kVK_ANSI_2: return "2"; + case kVK_ANSI_3: return "3"; + case kVK_ANSI_4: return "4"; + case kVK_ANSI_5: return "5"; + case kVK_ANSI_6: return "6"; + case kVK_ANSI_7: return "7"; + case kVK_ANSI_8: return "8"; + case kVK_ANSI_9: return "9"; + case kVK_ANSI_Grave: return "`"; + case kVK_ANSI_Minus: return "-"; + case kVK_ANSI_Equal: return "="; + case kVK_ANSI_LeftBracket: return "["; + case kVK_ANSI_RightBracket: return "]"; + case kVK_ANSI_Backslash: return "\\"; + case kVK_ANSI_Semicolon: return ";"; + case kVK_ANSI_Quote: return "'"; + case kVK_ANSI_Comma: return ","; + case kVK_ANSI_Period: return "."; + case kVK_ANSI_Slash: return "/"; + case kVK_Escape: return "⎋"; + case kVK_Tab: return "⇥"; + case kVK_Delete: return "⌫"; + case kVK_ForwardDelete: return "⌦"; + case kVK_Return: return "↩"; + case kVK_Space: return "␣"; + case kVK_ANSI_KeypadDecimal: return "Keypad ."; + case kVK_ANSI_KeypadMultiply: return "Keypad *"; + case kVK_ANSI_KeypadPlus: return "Keypad +"; + case kVK_ANSI_KeypadClear: return "⌧"; + case kVK_ANSI_KeypadDivide: return "Keypad /"; + case kVK_ANSI_KeypadEnter: return "⌤"; + case kVK_ANSI_KeypadMinus: return "Keypad -"; + case kVK_ANSI_KeypadEquals: return "Keypad ="; + case kVK_ANSI_Keypad0: return "Keypad 0"; + case kVK_ANSI_Keypad1: return "Keypad 1"; + case kVK_ANSI_Keypad2: return "Keypad 2"; + case kVK_ANSI_Keypad3: return "Keypad 3"; + case kVK_ANSI_Keypad4: return "Keypad 4"; + case kVK_ANSI_Keypad5: return "Keypad 5"; + case kVK_ANSI_Keypad6: return "Keypad 6"; + case kVK_ANSI_Keypad7: return "Keypad 7"; + case kVK_ANSI_Keypad8: return "Keypad 8"; + case kVK_ANSI_Keypad9: return "Keypad 9"; + case kVK_Command: return "Left ⌘"; + case kVK_Shift: return "Left ⇧"; + case kVK_CapsLock: return "⇪"; + case kVK_Option: return "Left ⌥"; + case kVK_Control: return "Left ⌃"; + case kVK_RightCommand: return "Right ⌘"; + case kVK_RightShift: return "Right ⇧"; + case kVK_RightOption: return "Right ⌥"; + case kVK_RightControl: return "Right ⌃"; + case kVK_Function: return "fn"; + case kVK_VolumeUp: return "Volume Up"; + case kVK_VolumeDown: return "Volume Down"; + case kVK_Mute: return "Mute"; + case kVK_F1: return "F1"; + case kVK_F2: return "F2"; + case kVK_F3: return "F3"; + case kVK_F4: return "F4"; + case kVK_F5: return "F5"; + case kVK_F6: return "F6"; + case kVK_F7: return "F7"; + case kVK_F8: return "F8"; + case kVK_F9: return "F9"; + case kVK_F10: return "F10"; + case kVK_F11: return "F11"; + case kVK_F12: return "F12"; + case kVK_F13: return "F13"; + case kVK_F14: return "F14"; + case kVK_F15: return "F15"; + case kVK_F16: return "F16"; + case kVK_F17: return "F17"; + case kVK_F18: return "F18"; + case kVK_F19: return "F19"; + case kVK_F20: return "F20"; + case kVK_Help: return "Help"; + case kVK_Home: return "↖"; + case kVK_PageUp: return "⇞"; + case kVK_End: return "↘"; + case kVK_PageDown: return "⇟"; + case kVK_LeftArrow: return "←"; + case kVK_RightArrow: return "→"; + case kVK_DownArrow: return "↓"; + case kVK_UpArrow: return "↑"; + case kVK_ISO_Section: return "Section"; + case kVK_JIS_Yen: return "¥"; + case kVK_JIS_Underscore: return "_"; + case kVK_JIS_KeypadComma: return "Keypad ,"; + case kVK_JIS_Eisu: return "英数"; + case kVK_JIS_Kana: return "かな"; + default: return "Key " + std::to_string(keysym); + // clang-format on } } #else diff --git a/pcsx2/PAD/Windows/resource_pad.h b/pcsx2/PAD/Windows/resource_pad.h index 836c6a7af1..e42b91c0d8 100644 --- a/pcsx2/PAD/Windows/resource_pad.h +++ b/pcsx2/PAD/Windows/resource_pad.h @@ -2,6 +2,7 @@ // fichier Include Microsoft Visual C++. // Utilis� par PAD.rc // +// clang-format off #define IDD_GENERAL 0x366 #define IDD_CONFIG 0x369 #define IDD_CONFIG_GUITAR 0x36A @@ -154,3 +155,4 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif +// clang-format on