Skip to content

don't color blank lines w/o --background + color whole lines w/ --background #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
obfusk wants to merge 4 commits into
base: main
Choose a base branch
from
Open

don't color blank lines w/o --background + color whole lines w/ --background #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99c50d5
don't change color on blank lines
landfillbaby Jun 21, 2020
2760649
--background: color whole line
obfusk Jun 23, 2020
f6d0b10
fix highlighting with -b and !tty
obfusk Jun 23, 2020
ed26719
fix colors in --help: don't clear line
obfusk Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ Colorize your terminal output with pride!

```
-b,--background
Change the background color instead of the text color
Change the background color instead of the text color (highlights complete line and implies -c when stdout is a tty)

-c,--change-blank
Change color on blank lines as well

-C,--no-change-blank
Don't change color on blank lines (the default without -b)

-f,--force
Force color even when stdout is not a tty
Expand Down
55 changes: 37 additions & 18 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cctype>
#include <cstdio>
#include <cstdint>
#include <cstdlib>
Expand Down Expand Up @@ -144,17 +145,20 @@ unsigned int g_currentRow = 0;
colorAdjust g_colorAdjustment = colorAdjust::none;

#if defined(_WIN32)
bool g_useColors = _isatty(_fileno(stdout));
bool g_isatty = _isatty(_fileno(stdout));
bool g_trueColor = true;
#else
bool isTrueColorTerminal() {
char const* ct = getenv("COLORTERM");
return ct ? strstr(ct, "truecolor") || strstr(ct, "24bit") : false;
}
bool g_useColors = isatty(STDOUT_FILENO);
bool g_isatty = isatty(STDOUT_FILENO);
bool g_trueColor = isTrueColorTerminal();
#endif
bool g_useColors = g_isatty;
bool g_setBackgroundColor = false;
bool g_changeBlank = false;
bool g_blankLine = true;


bool strEqual(char const* a, char const* b) {
Expand Down Expand Up @@ -230,16 +234,17 @@ void setTextColor(color_t const& color) {
}
}

void setBackgroundColor(color_t const& color) {
void setBackgroundColor(color_t const& color, bool clearLine = g_isatty) {
if (!g_useColors)
return;

color_t const readableColor = adjustForReadability(color);
const char * const clearLineCode = clearLine ? "\033[2K" : "";

if (g_trueColor) {
fprintf(stdout, "\033[48;2;%d;%d;%dm", readableColor.r, readableColor.g, readableColor.b);
fprintf(stdout, "\033[48;2;%d;%d;%dm%s", readableColor.r, readableColor.g, readableColor.b, clearLineCode);
} else {
fprintf(stdout, "\033[48;5;%dm", bestNonTruecolorMatch(readableColor));
fprintf(stdout, "\033[48;5;%dm%s", bestNonTruecolorMatch(readableColor), clearLineCode);
}
}

Expand All @@ -257,7 +262,9 @@ void resetBackgroundColor() {
fputs("\033[49m", stdout);
}

void setColor(color_t const& color) {
void nextColor() {
color_t const& color = g_colorQueue[g_currentRow];
g_currentRow = (g_currentRow + 1) % g_colorQueue.size();
if (g_setBackgroundColor) {
setBackgroundColor(color);
} else {
Expand Down Expand Up @@ -294,7 +301,7 @@ void parseCommandLine(int argc, char** argv) {
if (g_useColors) {
putc(' ', stdout);
for (const auto& color : flag.second.colors) {
setBackgroundColor(color);
setBackgroundColor(color, false);
putc(' ', stdout);
}
resetBackgroundColor();
Expand All @@ -305,7 +312,11 @@ void parseCommandLine(int argc, char** argv) {

printf("Additional options:\n");
printf(" -b,--background\n");
printf(" Change the background color instead of the text color\n\n");
printf(" Change the background color instead of the text color (highlights complete line and implies -c when stdout is a tty)\n\n");
printf(" -c,--change-blank\n");
printf(" Change color on blank lines as well\n\n");
printf(" -C,--no-change-blank\n");
printf(" Don't change color on blank lines (the default without -b)\n\n");
printf(" -f,--force\n");
printf(" Force color even when stdout is not a tty\n\n");
printf(" -t,--truecolor\n");
Expand All @@ -325,6 +336,12 @@ void parseCommandLine(int argc, char** argv) {
printf(" pridecat --trans --bi Alternate between trans and bisexual pride flags.\n");
exit(0);
}
else if (strEqual(argv[i], "-c") || strEqual(argv[i], "--change-blank")) {
g_changeBlank = true;
}
else if (strEqual(argv[i], "-C") || strEqual(argv[i], "--no-change-blank")) {
g_changeBlank = false;
}
else if (strEqual(argv[i], "-f") || strEqual(argv[i], "--force")) {
g_useColors = true;
}
Expand All @@ -336,6 +353,9 @@ void parseCommandLine(int argc, char** argv) {
}
else if (strEqual(argv[i], "-b") || strEqual(argv[i], "--background")) {
g_setBackgroundColor = true;
if (g_isatty) {
g_changeBlank = true;
}
}
else if (strEqual(argv[i], "-l") || strEqual(argv[i], "--lighten")) {
g_colorAdjustment = colorAdjust::lighten;
Expand Down Expand Up @@ -373,19 +393,20 @@ void abortHandler(int signo) {
}

void catFile(FILE* fh) {
int c;
int c, prev = '\n';
while ((c = getc(fh)) >= 0) {
if (c == '\n') {
if (prev == '\n' && g_changeBlank) {
nextColor();
}
resetColor();
g_blankLine = true;
}
putc(c, stdout);
if (c == '\n') {
g_currentRow++;
if (g_currentRow == g_colorQueue.size()) {
g_currentRow = 0;
}
setColor(g_colorQueue[g_currentRow]);
else if (g_blankLine && !isspace(c)) {
nextColor();
g_blankLine = false;
}
putc(prev = c, stdout);
}
}

Expand Down Expand Up @@ -426,8 +447,6 @@ int main(int argc, char** argv) {
pushFlag(allFlags.at("lgbt"));
}

setColor(g_colorQueue[0]);

if (g_filesToCat.empty()) {
catFile(stdin);
} else {
Expand Down