summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemy Noulin <loader2x@gmail.com>2020-12-12 10:07:21 -0500
committerjaseg <git@jaseg.net>2020-12-25 14:46:43 +0100
commit36cce5225b1e703155641e288a31d13b4fc3cb74 (patch)
treeaadd812a7abb73cdc1df99420fc0bbf61993cbf4
parent9efc71de4f4be9c43c0521dd5f627bbdcc82b78a (diff)
downloadlolcat-36cce5225b1e703155641e288a31d13b4fc3cb74.tar.gz
lolcat-36cce5225b1e703155641e288a31d13b4fc3cb74.tar.bz2
lolcat-36cce5225b1e703155641e288a31d13b4fc3cb74.zip
add RGB 24bits color support (default)
Option -8bits is for 256 colors lolcat.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
-rw-r--r--Makefile2
-rwxr-xr-x[-rw-r--r--]lolcat.c19
2 files changed, 17 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9f6b3ad..2c0277f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
CC ?= gcc
LOLCAT_SRC ?= lolcat.c
CENSOR_SRC ?= censor.c
-CFLAGS ?= -std=c11 -Wall -Wextra -O3 -Wno-sign-compare
+CFLAGS ?= -std=c11 -Wall -Wextra -O3 -Wno-sign-compare -lm
DESTDIR ?= /usr/local/bin
diff --git a/lolcat.c b/lolcat.c
index 5512f17..15a01f5 100644..100755
--- a/lolcat.c
+++ b/lolcat.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <wchar.h>
#include <time.h>
+#include "math.h"
static char helpstr[] = "\n"
"Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"
@@ -97,6 +98,7 @@ int main(int argc, char** argv)
int colors = isatty(STDOUT_FILENO);
int force_locale = 1;
int random = 0;
+ int rgb = 1;
double freq_h = 0.23, freq_v = 0.1;
struct timeval tv;
@@ -127,6 +129,8 @@ int main(int argc, char** argv)
force_locale = 0;
} else if (!strcmp(argv[i], "-r")) {
random = 1;
+ } else if (!strcmp(argv[i], "-8bits")) {
+ rgb = 0;
} else if (!strcmp(argv[i], "--version")) {
version();
} else {
@@ -136,6 +140,8 @@ int main(int argc, char** argv)
}
}
+ if (rgb)
+ freq_h /= 10;
int rand_offset = 0;
if (random) {
srand(time(NULL));
@@ -186,9 +192,16 @@ int main(int argc, char** argv)
l++;
i = 0;
} else {
- int ncc = offx * ARRAY_SIZE(codes) + (int)((i += wcwidth(c)) * freq_h + l * freq_v);
- if (cc != ncc)
- wprintf(L"\033[38;5;%hhum", codes[(rand_offset + (cc = ncc)) % ARRAY_SIZE(codes)]);
+ if (rgb) {
+ uint8_t red = sin(((i += wcwidth(c)) * freq_h + l * freq_v) + 0 ) * 127 + 128;
+ uint8_t green = sin(((i += wcwidth(c)) * freq_h + l * freq_v) + 2 * M_PI / 3 ) * 127 + 128;
+ uint8_t blue = sin(((i += wcwidth(c)) * freq_h + l * freq_v) + 4 * M_PI / 3 ) * 127 + 128;
+ wprintf(L"\033[38;2;%d;%d;%dm", red, green, blue);
+ } else {
+ int ncc = offx * ARRAY_SIZE(codes) + (int)((i += wcwidth(c)) * freq_h + l * freq_v);
+ if (cc != ncc)
+ wprintf(L"\033[38;5;%hhum", codes[(rand_offset + (cc = ncc)) % ARRAY_SIZE(codes)]);
+ }
}
}
}