gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some static variables into the only functions that use them

Browse Source
This commit is contained in:
Rangi42
2025-08-13 09:34:49 -04:00
parent 9c3ce69180
commit 92826a726a
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/style.cpp
View File

@@ -20,10 +20,10 @@
enum Tribool { TRI_NO, TRI_YES, TRI_MAYBE }; enum Tribool { TRI_NO, TRI_YES, TRI_MAYBE };
#if !STYLE_ANSI #if !STYLE_ANSI
static const HANDLE outHandle = GetStdHandle(STD_OUTPUT_HANDLE); static HANDLE const outHandle = GetStdHandle(STD_OUTPUT_HANDLE);
static const HANDLE errHandle = GetStdHandle(STD_ERROR_HANDLE); static HANDLE const errHandle = GetStdHandle(STD_ERROR_HANDLE);
static const WORD defaultAttrib = []() { static WORD const defaultAttrib = []() {
if (CONSOLE_SCREEN_BUFFER_INFO info; GetConsoleScreenBufferInfo(outHandle, &info) if (CONSOLE_SCREEN_BUFFER_INFO info; GetConsoleScreenBufferInfo(outHandle, &info)
|| GetConsoleScreenBufferInfo(errHandle, &info)) { || GetConsoleScreenBufferInfo(errHandle, &info)) {
return info.wAttributes; return info.wAttributes;
@@ -36,7 +36,17 @@ static HANDLE getHandle(FILE *file) {
} }
#endif // !STYLE_ANSI #endif // !STYLE_ANSI
static Tribool const envStyle = []() { static Tribool argStyle = TRI_MAYBE;
static bool isTerminal(FILE *file) {
static bool const isOutTerminal = isatty(STDOUT_FILENO);
static bool const isErrTerminal = isatty(STDERR_FILENO);
return (file == stdout && isOutTerminal) || (file == stderr && isErrTerminal);
}
static bool allowStyle(FILE *file) {
static Tribool const envStyle = []() {
if (char const *forceColor = getenv("FORCE_COLOR"); if (char const *forceColor = getenv("FORCE_COLOR");
forceColor && strcmp(forceColor, "") && strcmp(forceColor, "0")) { forceColor && strcmp(forceColor, "") && strcmp(forceColor, "0")) {
return TRI_YES; return TRI_YES;
@@ -46,18 +56,8 @@ static Tribool const envStyle = []() {
return TRI_NO; return TRI_NO;
} }
return TRI_MAYBE; return TRI_MAYBE;
}(); }();
static Tribool argStyle = TRI_MAYBE;
static bool isTerminal(FILE *file) {
static bool isOutTerminal = isatty(STDOUT_FILENO);
static bool isErrTerminal = isatty(STDERR_FILENO);
return (file == stdout && isOutTerminal) || (file == stderr && isErrTerminal);
}
static bool allowStyle(FILE *file) {
if (argStyle == TRI_YES) { if (argStyle == TRI_YES) {
return true; return true;
} else if (argStyle == TRI_NO) { } else if (argStyle == TRI_NO) {