github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fix colors

Browse source
This commit is contained in:
Philippe Teuwen 2020-06-12 18:21:03 +02:00
commit 30c0345c31
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/proxmark3.c
View file

@ -629,7 +629,6 @@ finish2:
return ret; return ret;
} }
/*
// Check if windows AnsiColor Support is enabled in the registery // Check if windows AnsiColor Support is enabled in the registery
// [HKEY_CURRENT_USER\Console] // [HKEY_CURRENT_USER\Console]
// "VirtualTerminalLevel"=dword:00000001 // "VirtualTerminalLevel"=dword:00000001
@ -637,9 +636,9 @@ finish2:
// [HKEY_CURRENT_USER\Console] // [HKEY_CURRENT_USER\Console]
// "ForceV2"=dword:00000001 // "ForceV2"=dword:00000001
#if defined(_WIN32)
static bool DetectWindowsAnsiSupport(void) { static bool DetectWindowsAnsiSupport(void) {
bool ret = false; bool ret = false;
#if defined(_WIN32)
HKEY hKey = NULL; HKEY hKey = NULL;
bool virtualTerminalLevelSet = false; bool virtualTerminalLevelSet = false;
bool forceV2Set = false; bool forceV2Set = false;
@ -681,10 +680,9 @@ static bool DetectWindowsAnsiSupport(void) {
} }
// If both VirtualTerminalLevel and ForceV2 is set, AnsiColor should work // If both VirtualTerminalLevel and ForceV2 is set, AnsiColor should work
ret = virtualTerminalLevelSet && forceV2Set; ret = virtualTerminalLevelSet && forceV2Set;
#endif
return ret; return ret;
} }
*/ #endif
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
srand(time(0)); srand(time(0));
@ -929,9 +927,12 @@ int main(int argc, char *argv[]) {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
session.supports_colors = true; session.supports_colors = true;
session.emoji_mode = EMOJI; session.emoji_mode = EMOJI;
#else #elif defined(_WIN32)
session.supports_colors = DetectWindowsAnsiSupport(); session.supports_colors = DetectWindowsAnsiSupport();
session.emoji_mode = ALTTEXT; session.emoji_mode = ALTTEXT;
#else
session.supports_colors = false;
session.emoji_mode = ALTTEXT;
#endif #endif
} }
} else { } else {