From 52bf3cdd21789ca88172a09352e439ee678d3fa9 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Sun, 8 Nov 2020 23:45:59 +0100 Subject: [PATCH] YAFFWH - Yet another fix for win32 history --- src/Console.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Console.cpp b/src/Console.cpp index 8d9881b..c623b9f 100644 --- a/src/Console.cpp +++ b/src/Console.cpp @@ -132,7 +132,7 @@ static bool CompositeInputExpected { false }; static void ProcessCompositeInput() { #ifdef WIN32 - } else if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array { 'H' }.data(), 1) == 0) { + if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array { 72 }.data(), 1) == 0) { #else // unix if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array { 91, 65 }.data(), 2) == 0) { #endif // WIN32 @@ -145,7 +145,7 @@ static void ProcessCompositeInput() { CInputBuff = ConsoleHistory.at(ConsoleHistoryReadIndex); } #ifdef WIN32 - } else if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array { 'P' }.data(), 1) == 0) { + } else if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array { 80 }.data(), 1) == 0) { #else // unix } else if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array { 91, 66 }.data(), 2) == 0) { #endif // WIN32 @@ -201,7 +201,11 @@ static void ProcessCompositeInput() { CInputBuff = "exit"; HandleInput(CInputBuff); CInputBuff.clear(); +#ifdef WIN32 + } else if (In == 224) { +#else // unix } else if (In == 27) { +#endif // WIN32 // escape char, assume stuff follows CompositeInputExpected = true; CompositeInput.clear();