From 204dc5223dd053e8d1fec9db308d66546b6505aa Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 21 Mar 2024 15:50:55 -0400 Subject: [PATCH 1/7] reverted to 8-color --- README.md | 2 +- main.c | 74 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 06b9135..1ce874b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Pride! for the tty -A C utility to display flags in 256-color terminals. +A C utility to display flags in 8-color terminals. diff --git a/main.c b/main.c index a1c84db..6127588 100644 --- a/main.c +++ b/main.c @@ -7,8 +7,22 @@ #define RESET "\x1b[0m" #define COLOR(n) "\x1b[38;5;" #n "m" -#define BLACK "\x1b[38;5;0m" -#define WHITE "\x1b[38;5;255m" +#define BLACK COLOR(0) +#define RED COLOR(1) +#define GREEN COLOR(2) +#define YELLOW COLOR(3) +#define BLUE COLOR(4) +#define MAGENTA COLOR(5) +#define CYAN COLOR(6) +#define GRAY COLOR(7) +#define L_BLACK COLOR(8) +#define L_RED COLOR(9) +#define L_GREEN COLOR(10) +#define L_YELLOW COLOR(11) +#define L_BLUE COLOR(12) +#define L_MAGENTA COLOR(13) +#define L_CYAN COLOR(14) +#define WHITE COLOR(15) #define STRIPE "██████████████████\n" @@ -59,57 +73,55 @@ int main(int argc, char **argv) { } if(strcmp(flag, RAINBOW) == 0) { // - RAINBOW - - printf(COLOR(196) STRIPE); // red - printf(COLOR(208) STRIPE); // orange - printf(COLOR(220) STRIPE); // yellow - printf(COLOR(28) STRIPE); // green - printf(COLOR(21) STRIPE); // blue - printf(COLOR(90) STRIPE); // purple + printf(RED STRIPE); + printf(L_RED STRIPE); + printf(L_YELLOW STRIPE); + printf(GREEN STRIPE); + printf(BLUE STRIPE); + printf(MAGENTA STRIPE); } else if(strcmp(flag, AROACE) == 0) { // - ARO/ACE - - printf(COLOR(172) STRIPE); // orange - printf(COLOR(184) STRIPE); // yellow - printf(WHITE STRIPE); // white - printf(COLOR(38) STRIPE); // blue - printf(COLOR(17) STRIPE); // navy + printf(YELLOW STRIPE); + printf(L_YELLOW STRIPE); + printf(WHITE STRIPE); + printf(L_CYAN STRIPE); + printf(BLUE STRIPE); } else if(strcmp(flag, BISEXUAL) == 0) { // - BISEXUAL - - printf(COLOR(161) STRIPE STRIPE); // maroon - printf(COLOR(91) STRIPE); // purple - printf(COLOR(21) STRIPE STRIPE); // blue + printf(RED STRIPE STRIPE); + printf(MAGENTA STRIPE); + printf(BLUE STRIPE STRIPE); } else if(strcmp(flag, LESBIAN) == 0) { // - LESBIAN - - printf(COLOR(202) STRIPE); // orange - printf(COLOR(209) STRIPE); // tangerine + printf(RED STRIPE); // orange + printf(L_RED STRIPE); // tangerine printf(WHITE STRIPE); // white - printf(COLOR(205) STRIPE); // pink - printf(COLOR(161) STRIPE); // magenta + printf(L_MAGENTA STRIPE); // pink + printf(MAGENTA STRIPE); // magenta } else if(strcmp(flag, NONBINARY) == 0) { // - NONBINARY - - printf(COLOR(226) STRIPE); // yellow + printf(L_YELLOW STRIPE); // yellow printf(WHITE STRIPE); // white - printf(COLOR(134) STRIPE); // purple + printf(MAGENTA STRIPE); // purple printf(BLACK STRIPE); // black } else if(strcmp(flag, PANSEXUAL) == 0) { // - PANSEXUAL - - printf(COLOR(161) STRIPE STRIPE); // magenta - printf(COLOR(220) STRIPE STRIPE); // yellow - printf(COLOR(45) STRIPE STRIPE); // cyan + printf(MAGENTA STRIPE STRIPE); + printf(L_YELLOW STRIPE STRIPE); + printf(CYAN STRIPE STRIPE); } else if(strcmp(flag, TRANSGENDER) == 0) { // - TRANSGENDER - - char *blue = COLOR(45) STRIPE; - char *pink = COLOR(177) STRIPE; - printf(blue); - printf(pink); + printf(L_CYAN STRIPE); + printf(L_MAGENTA STRIPE); printf(WHITE STRIPE); - printf(pink); - printf(blue); + printf(L_MAGENTA STRIPE); + printf(L_CYAN STRIPE); } From 735d8394fd809f3e997276bb70a4f99876a5bcd5 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Mar 2024 22:25:07 -0400 Subject: [PATCH 2/7] added justfile for build recipe --- .gitignore | 1 + justfile | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 justfile diff --git a/.gitignore b/.gitignore index 7fc71cc..75fb9b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /a.out +/pride-c diff --git a/justfile b/justfile new file mode 100644 index 0000000..24dfbb1 --- /dev/null +++ b/justfile @@ -0,0 +1,4 @@ + +build: + gcc main.c basic.c full.c -o pride-c + From 5e69b344f8f74aff026783b1997e7226738d2598 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 22 Mar 2024 23:52:46 -0400 Subject: [PATCH 3/7] created draw function to reduce string section size --- basic.c | 119 ++++++++++++++++++++++++++++++------------------------ basic.h | 34 ++++++++-------- color.h | 5 --- draw.c | 10 +++++ draw.h | 10 +++++ full.c | 120 ++++++++++++++++++++++++++++++------------------------- full.h | 2 +- justfile | 2 +- main.c | 2 +- 9 files changed, 171 insertions(+), 133 deletions(-) delete mode 100644 color.h create mode 100644 draw.c create mode 100644 draw.h diff --git a/basic.c b/basic.c index 3416f69..f25db0c 100644 --- a/basic.c +++ b/basic.c @@ -2,79 +2,94 @@ #include +#include "draw.h" + void rainbow_8() { - printf( - RED STRIPE - L_RED STRIPE - L_YELLOW STRIPE - GREEN STRIPE - BLUE STRIPE - MAGENTA STRIPE - ); + color colors [] = { + RED, + L_RED, + L_YELLOW, + GREEN, + BLUE, + MAGENTA + }; + draw(6, colors); } void aroace_8() { - printf( - YELLOW STRIPE - L_YELLOW STRIPE - WHITE STRIPE - L_CYAN STRIPE - BLUE STRIPE - ); + color colors [] = { + YELLOW, + L_YELLOW, + WHITE, + L_CYAN, + BLUE + }; + draw(5, colors); } void bisexual_8() { - printf( - RED STRIPE STRIPE - MAGENTA STRIPE - BLUE STRIPE STRIPE - ); + color colors [] = { + RED, + RED, + MAGENTA, + BLUE, + BLUE + }; + draw(5, colors); } void gay_8() { - printf( - CYAN STRIPE - L_CYAN STRIPE - WHITE STRIPE - L_BLUE STRIPE - BLUE STRIPE - ); + color colors [] = { + CYAN, + L_CYAN, + WHITE, + L_BLUE, + BLUE + }; + draw(5, colors); } void lesbian_8() { - printf( - RED STRIPE - L_RED STRIPE - WHITE STRIPE - L_MAGENTA STRIPE - MAGENTA STRIPE - ); + color colors [] = { + RED, + L_RED, + WHITE, + L_MAGENTA, + MAGENTA + }; + draw(5, colors); } void nonbinary_8() { - printf( - L_YELLOW STRIPE - WHITE STRIPE - MAGENTA STRIPE - BLACK STRIPE - ); + color colors [] = { + L_YELLOW, + WHITE, + MAGENTA, + BLACK + }; + draw(4, colors); } void pansexual_8() { - printf( - MAGENTA STRIPE STRIPE - L_YELLOW STRIPE STRIPE - CYAN STRIPE STRIPE - ); + color colors [] = { + MAGENTA, + MAGENTA, + L_YELLOW, + L_YELLOW, + CYAN, + CYAN + }; + draw(6, colors); } void transgender_8() { - printf( - L_CYAN STRIPE - L_MAGENTA STRIPE - WHITE STRIPE - L_MAGENTA STRIPE - L_CYAN STRIPE - ); + color colors [] = { + L_CYAN, + L_MAGENTA, + WHITE, + L_MAGENTA, + L_CYAN + }; + draw(5, colors); } diff --git a/basic.h b/basic.h index f9579f6..13cc7fb 100644 --- a/basic.h +++ b/basic.h @@ -1,23 +1,21 @@ #pragma once -#include "color.h" - -#define BLACK COLOR(0) -#define RED COLOR(1) -#define GREEN COLOR(2) -#define YELLOW COLOR(3) -#define BLUE COLOR(4) -#define MAGENTA COLOR(5) -#define CYAN COLOR(6) -#define GRAY COLOR(7) -#define L_BLACK COLOR(8) -#define L_RED COLOR(9) -#define L_GREEN COLOR(10) -#define L_YELLOW COLOR(11) -#define L_BLUE COLOR(12) -#define L_MAGENTA COLOR(13) -#define L_CYAN COLOR(14) -#define WHITE COLOR(15) +#define BLACK 0 +#define RED 1 +#define GREEN 2 +#define YELLOW 3 +#define BLUE 4 +#define MAGENTA 5 +#define CYAN 6 +#define GRAY 7 +#define L_BLACK 8 +#define L_RED 9 +#define L_GREEN 10 +#define L_YELLOW 11 +#define L_BLUE 12 +#define L_MAGENTA 13 +#define L_CYAN 14 +#define WHITE 15 void rainbow_8(); void aroace_8(); diff --git a/color.h b/color.h deleted file mode 100644 index 92ef0a3..0000000 --- a/color.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define COLOR(n) "\x1b[38;5;" #n "m" -#define STRIPE "██████████████████\n" - diff --git a/draw.c b/draw.c new file mode 100644 index 0000000..da7f1e2 --- /dev/null +++ b/draw.c @@ -0,0 +1,10 @@ +#include "draw.h" + +#include + +void draw(unsigned short int len, color colors []) { + for(int i = 0; i < len; i++) { + printf(ANSI "%dm" STRIPE, colors[i]); + } +} + diff --git a/draw.h b/draw.h new file mode 100644 index 0000000..00cc7d4 --- /dev/null +++ b/draw.h @@ -0,0 +1,10 @@ +#pragma once + +#define ANSI "\x1b[38;5;" +#define COLOR(n) ANSI #n "m" +#define STRIPE "██████████████████\n" + +typedef unsigned short int color; + +void draw(unsigned short int len, color colors[]); + diff --git a/full.c b/full.c index 6c78ead..67f0921 100644 --- a/full.c +++ b/full.c @@ -2,83 +2,93 @@ #include -#include "color.h" +#include "draw.h" void rainbow_256() { - printf( - COLOR(196) STRIPE // red - COLOR(208) STRIPE // orange - COLOR(220) STRIPE // yellow - COLOR(28) STRIPE // green - COLOR(21) STRIPE // blue - COLOR(90) STRIPE // purple - ); + color colors [] = { + 196, // red + 208, // orange + 220, // yellow + 28, // green + 21, // blue + 90 // purple + }; + draw(6, colors); } void aroace_256() { - printf( - COLOR(172) STRIPE - COLOR(184) STRIPE - COLOR(255) STRIPE - COLOR(38) STRIPE - COLOR(17) STRIPE - ); + color colors [] = { + 172, // orange + 184, // yellow + 255, // white + 38, // blue + 17 // navy + }; + draw(5, colors); } void bisexual_256() { - printf( - COLOR(161) STRIPE STRIPE - COLOR(91) STRIPE - COLOR(21) STRIPE STRIPE - ); + color colors [] = { + 161, // magenta + 161, + 91, // purple + 21, + 21 // blue + }; + draw(5, colors); } void gay_256() { - printf( - COLOR(29) STRIPE - COLOR(49) STRIPE - COLOR(123) STRIPE - COLOR(255) STRIPE - COLOR(75) STRIPE - COLOR(63) STRIPE - COLOR(56) STRIPE - ); + color colors [] = { + 29, + 49, // greens + 123, + 255, // white + 75, + 63, // blues + 56 + }; + draw(7, colors); } void lesbian_256() { - printf( - COLOR(202) STRIPE - COLOR(209) STRIPE - COLOR(255) STRIPE - COLOR(134) STRIPE - COLOR(161) STRIPE - ); + color colors [] = { + 202, // orange + 209, // tangerine + 255, // white + 134, // pink + 161 // magenta + }; + draw(5, colors); } void nonbinary_256() { - printf( - COLOR(226) STRIPE - COLOR(255) STRIPE - COLOR(134) STRIPE - COLOR(16) STRIPE - ); + color colors [] = { + 226, // yellow + 255, // white + 134, // purple + 16 // black + }; + draw(4, colors); } void pansexual_256() { - printf( - COLOR(161) STRIPE STRIPE - COLOR(220) STRIPE STRIPE - COLOR(45) STRIPE STRIPE - ); + color colors [] = { + 161, 161, // magenta + 220, 220, // yellow + 45, 45 // cyan + }; + draw(6, colors); } void transgender_256() { - printf( - COLOR(45) STRIPE - COLOR(117) STRIPE - COLOR(255) STRIPE - COLOR(117) STRIPE - COLOR(45) STRIPE - ); + color colors [] = { + 45, // blue + 117, // pink + 255, // white + 117, // pink + 45 // blue + }; + draw(5, colors); } diff --git a/full.h b/full.h index 9a42ffb..c4e121d 100644 --- a/full.h +++ b/full.h @@ -1,6 +1,6 @@ #pragma once -#include "color.h" +#include "draw.h" void rainbow_256(); void aroace_256(); diff --git a/justfile b/justfile index 24dfbb1..ee66722 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ build: - gcc main.c basic.c full.c -o pride-c + gcc main.c draw.c basic.c full.c -o pride-c diff --git a/main.c b/main.c index a6ece88..a53f23a 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ #include #include -#include "color.h" +#include "draw.h" #include "basic.h" #include "full.h" From 9a1473a45565c78fe530ef3041d125963425f9ee Mon Sep 17 00:00:00 2001 From: Valerie Date: Sat, 23 Mar 2024 00:23:42 -0400 Subject: [PATCH 4/7] fixed trans flag colors and added rudimentary color mode check --- full.c | 4 ++-- main.c | 3 +++ pride-c | Bin 0 -> 21264 bytes 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 pride-c diff --git a/full.c b/full.c index 6c78ead..9fb8611 100644 --- a/full.c +++ b/full.c @@ -75,9 +75,9 @@ void pansexual_256() { void transgender_256() { printf( COLOR(45) STRIPE - COLOR(117) STRIPE + COLOR(213) STRIPE COLOR(255) STRIPE - COLOR(117) STRIPE + COLOR(213) STRIPE COLOR(45) STRIPE ); } diff --git a/main.c b/main.c index a6ece88..a36f61a 100644 --- a/main.c +++ b/main.c @@ -50,6 +50,9 @@ int main(int argc, char **argv) { else { flag = RAINBOW; } int color_mode = 0; + char * term = getenv("TERM"); + if(strcmp(term, "linux")) + color_mode = 1; // handle flags if(strcmp(flag, "--version") == 0) { diff --git a/pride-c b/pride-c new file mode 100755 index 0000000000000000000000000000000000000000..9c0b867d126a788cc1892ff3d15bfe80833d1345 GIT binary patch literal 21264 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 literal 0 HcmV?d00001 From 72e08f305b59a6f3f4599c383fe7b2c2d55f5213 Mon Sep 17 00:00:00 2001 From: Valerie Date: Sat, 23 Mar 2024 00:30:02 -0400 Subject: [PATCH 5/7] removed unused file --- pride-c | Bin 21264 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 pride-c diff --git a/pride-c b/pride-c deleted file mode 100755 index 9c0b867d126a788cc1892ff3d15bfe80833d1345..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21264 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 From 34c5be0b413a483ac9e79df8d8c7327d00fb31b9 Mon Sep 17 00:00:00 2001 From: Valerie Date: Sat, 23 Mar 2024 00:30:43 -0400 Subject: [PATCH 6/7] fixed missing include --- main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main.c b/main.c index 8ad0d43..726c913 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,5 @@ #include +#include #include #include "draw.h" From 67a1f48f2fd481206e43a9de4d8d6ebc88f65d48 Mon Sep 17 00:00:00 2001 From: Valerie Date: Sat, 23 Mar 2024 00:35:28 -0400 Subject: [PATCH 7/7] fixed 8-color pansexual flag invoking the wrong flag function --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index c1214bc..b5e37b8 100644 --- a/main.c +++ b/main.c @@ -114,7 +114,7 @@ int main(int argc, char **argv) { case 249901996007388822lu: // 'pansexual' case 193502276lu: // 'pan' if(color_mode) pansexual_256(); - else nonbinary_8(); + else pansexual_8(); break; // - TRANSGENDER -