mysterybirb/cli-flag-collection
Watch
1
0
Fork
You've already forked cli-flag-collection
 0
mirror of synced 2026-11-04 15:27:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Little variable length fix

Browse source
This commit is contained in:
MysteryBirb 2026-10-05 11:13:18 +02:00
commit 6c1322c63d
4 changed files with 170 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,8 +1,8 @@
CC=g++ CC=g++
SRC=cli-flag-collection.cpp SRC=cli-flag-collection.cpp
dynamic-dev: debug-dev:
${CC} ${SRC} -Wall -march=native -std=c++23 -o cfc-cli-dynamic ${CC} ${SRC} -Wall -march=native -DDEBUG -std=c++23 -o cfc-cli-debug
static: static:
${CC} ${SRC} -Wall -Werror -march=native -O3 -flto -fomit-frame-pointer -static -std=c++23 -o cfc-cli-static ${CC} ${SRC} -Wall -Werror -march=native -O3 -flto -fomit-frame-pointer -DNDEBUG -static -std=c++23 -o cfc-cli-static
release: release:
${CC} ${SRC} -Wall -Werror -march=native -O3 -flto -fomit-frame-pointer -std=c++23 -o cfc-cli-release ${CC} ${SRC} -Wall -Werror -march=native -O3 -flto -fomit-frame-pointer -DNDEBUG -std=c++23 -o cfc-cli-release

10
README.md
View file

@ -24,26 +24,26 @@ For now my program is not in any repo so you have to build it from source.
Firstly you pull this repo with: Firstly you pull this repo with:
``` ```bash
git clone https://codeberg.org/MysteryBirb/cli-flag-collection.git git clone https://codeberg.org/MysteryBirb/cli-flag-collection.git
``` ```
then cd into it: then cd into it:
``` ```bash
cd cli-flag-collection cd cli-flag-collection
``` ```
To compile the dynamic version without any optimizations you just run `make`. To compile the dynamic version without any optimizations you just run `make`.
For the release and release static build you can run: For the release and release static build you can run:
``` ```bash
make static make static
``` ```
or or (recommended)
``` ```bash
make release make release
``` ```

BIN
cfc-cli-debug Executable file
View file

Binary file not shown.

315
cli-flag-collection.cpp
View file

@ -1,174 +1,183 @@
#include <cstdlib> #include <cstdlib>
#include <iostream>
#include <string>
#include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <sys/ioctl.h> #include <iostream>
#include <print> #include <print>
#include <pthread.h>
#include <string>
#include <sys/ioctl.h>
#include <unistd.h>
#ifdef DEBUG
#define DEBUG_PRINT(x) std::print x
#else
#define DEBUG_PRINT(x)
#endif
#define HELP 1000 #define HELP 1000
#define LIST 1001 #define LIST 1001
int flagWidth; int flagWidth = 0;
int flagHeight; int flagHeight = 0;
std::string flagStr(" "); std::string flagStr(" ");
void drawFlag(const unsigned char flagArray[][3], unsigned char flagStripes) { void drawFlag(const unsigned char flagArray[][3], unsigned char flagStripes) {
short i, y, j, uni = 0; short i, y, j, uni = 0;
short divLen = flagStr.size(); short rest = 0;
short divLen = flagStr.size();
// Hopefully will handle all unicode things in a string
for (int k : flagStr) {
if (k < 0 && uni != 2) {
uni++;
}
if (uni == 2) {
divLen -= 1;
uni = 0;
}
}
//std::println("Divided length: {0} ({1} / {2})", (flagWidth / divLen), flagWidth, divLen);
for (i = 0; i < flagStripes; i++) { // Hopefully will handle all unicode things in a string
if (flagHeight / flagStripes <= 0) { for (int k : flagStr) {
std::cerr << "Integer too small!" << std::endl; if (k < 0 && uni != 2) {
break; uni += 1;
} }
for (y = 0; y < flagHeight / flagStripes; y++) { if (uni == 2) {
if (flagStr != " ") { divLen -= 1;
flagStr.shrink_to_fit(); uni = 0;
std::print("\x1b[38;2;{0};{1};{2}m", flagArray[i][0], flagArray[i][1], flagArray[i][2]); }
} }
else { rest = (flagWidth % divLen);
std::print("\x1b[48;2;{0};{1};{2}m", flagArray[i][0], flagArray[i][1], flagArray[i][2]); DEBUG_PRINT(("Pre: {0}, After {1}\n", flagWidth, (flagWidth % divLen)));
}
for (j = 0; j < flagWidth / divLen; j++) { for (i = 0; i < flagStripes; i++) {
std::print("{0}", flagStr); if (flagHeight / flagStripes <= 0) {
} std::cerr << "Integer too small!" << std::endl;
} break;
std::println("\x1b[0m"); }
} for (y = 0; y < flagHeight / flagStripes; y++) {
if (flagStr != " ") {
flagStr.shrink_to_fit();
std::print("\x1b[38;2;{0};{1};{2}m", flagArray[i][0], flagArray[i][1], flagArray[i][2]);
}
else {
std::print("\x1b[48;2;{0};{1};{2}m", flagArray[i][0], flagArray[i][1], flagArray[i][2]);
}
for (j = 0; j < (flagWidth / divLen); j++) {
std::print("{0}", flagStr);
}
for (short l = 0; l < rest; l++) {
std::print("{0}", flagStr.at(l));
}
}
std::println("\x1b[0m");
}
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
/* /*
* TODO: * TODO:
* - Bi flag handle * - Bi flag handle
* - add more flags for inclusivity * - add more flags for inclusivity
*/ */
//std::setlocale(LC_CTYPE, "de_DE.utf8"); static struct option long_options[]{
//std::locale::global(std::locale("de_DE.utf8")); {"help", no_argument, nullptr, HELP},
{"list", no_argument, nullptr, LIST},
{"flag", required_argument, nullptr, 'f'},
{"height", required_argument, nullptr, 'h'},
{"string", required_argument, nullptr, 's'},
{nullptr, 0, nullptr, 0},
};
static struct option long_options[] { struct winsize size;
{"help", no_argument, nullptr, HELP}, ioctl(STDOUT_FILENO, TIOCGWINSZ, &size);
{"list", no_argument, nullptr, LIST}, flagWidth = size.ws_col;
{"flag", required_argument, nullptr, 'f'}, flagHeight = size.ws_row;
{"height", required_argument, nullptr, 'h'},
{"string", required_argument, nullptr, 's'},
{nullptr, 0, nullptr, 0},
};
struct winsize size; // All available flags
ioctl(STDOUT_FILENO, TIOCGWINSZ, &size); const unsigned char prideFlag[6][3] = {{255, 30, 38}, {255, 141, 0}, {255, 238, 0}, {2, 129, 33}, {0, 76, 255}, {119, 0, 136}};
flagWidth = size.ws_col; const unsigned char transFlag[5][3] = {{91, 206, 250}, {245, 169, 184}, {255, 255, 255}, {245, 169, 184}, {91, 206, 250}};
flagHeight = size.ws_row; const unsigned char lesbianFlag[5][3] = {{212, 44, 0}, {253, 152, 85}, {255, 255, 255}, {209, 97, 162}, {162, 1, 97}};
const unsigned char dutchFlag[3][3] = {{220, 16, 46}, {255, 255, 255}, {0, 61, 165}};
// All available flags const unsigned char biFlag[3][3] = {{214, 2, 112}, {155, 79, 150}, {0, 56, 168}};
const unsigned char prideFlag[6][3] = {{255, 30, 38}, {255, 141, 0}, {255, 238, 0}, {2, 129, 33}, {0, 76, 255}, {119, 0, 136}}; const unsigned char nonBinaryFlag[4][3] = {{252, 244, 52}, {255, 255, 255}, {156, 89, 209}, {44, 44, 44}};
const unsigned char transFlag[5][3] = {{91, 206, 250}, {245, 169, 184}, {255, 255, 255}, {245, 169, 184}, {91, 206, 250}}; unsigned char flagStripes;
const unsigned char lesbianFlag[5][3] = {{212, 44, 0}, {253, 152, 85}, {255, 255, 255}, {209, 97, 162}, {162, 1, 97}};
const unsigned char dutchFlag[3][3] = {{220, 16, 46}, {255, 255, 255}, {0, 61, 165}};
const unsigned char biFlag[3][3] = {{214, 2, 112}, {155, 79, 150}, {0, 56, 168}};
unsigned char flagStripes;
// Array of all available flags // Array of all available flags
const std::string allFlags[] = {"pride", "trans", "lesbian", "dutch", "bi"}; const std::string allFlags[] = {"pride", "trans", "lesbian", "dutch", "bi", "non-binary"};
short allFlagsSize = sizeof(allFlags) / sizeof(allFlags[0]); short allFlagsSize = sizeof(allFlags) / sizeof(allFlags[0]);
int opt; int opt;
while ((opt = getopt_long(argc, argv, "h:s:f:", long_options, nullptr)) != -1) { while ((opt = getopt_long(argc, argv, "h:s:f:", long_options, nullptr)) != -1) {
switch (opt) { switch (opt) {
case '0': case '0':
std::print("{}", opt); std::print("{}", opt);
return 1; return 1;
case 'h': case 'h':
if (argc <= 3) { if (argc <= 3) {
std::cerr << "You can't run '" << argv[1] << "' alone!\n"; std::cerr << "You can't run '" << argv[1] << "' alone!\n";
return 1; return 1;
} }
else { else {
flagHeight = atoi(argv[optind - 1]); flagHeight = atoi(argv[optind - 1]);
} }
break; break;
case 's': case 's':
if (argc == 3 || argc == 2) { if (argc == 3 || argc == 2) {
std::cerr << "You can't run '" << argv[1] << "' alone!\n"; std::cerr << "You can't run '" << argv[1] << "' alone!\n";
return 1; return 1;
} }
else { else {
flagStr = argv[optind - 1]; // I will keep this at index 0 so it can't even break it for now flagStr = argv[optind - 1];
} }
break; break;
case 'f': case 'f':
if (optind > argc) { if (optind > argc) {
std::cerr << "Missing [flag] argument!\nusage: " << argv[0] << " [-f] [flag]\n"; std::cerr << "Missing [flag] argument!\nusage: " << argv[0] << " [-f] [flag]\n";
return 1; return 1;
} }
else { else {
std::string strArgv(argv[(optind - 1)]); std::string strArgv(argv[(optind - 1)]);
std::transform(strArgv.begin(), strArgv.end(), strArgv.begin(), ::tolower); std::transform(strArgv.begin(), strArgv.end(), strArgv.begin(), ::tolower);
if (strArgv.compare(allFlags[0]) == 0) { if (strArgv.compare(allFlags[0]) == 0) {
flagStripes = 6; flagStripes = 6;
drawFlag(prideFlag, flagStripes); drawFlag(prideFlag, flagStripes);
} } else if (strArgv.compare(allFlags[1]) == 0) {
else if (strArgv.compare(allFlags[1]) == 0) { flagStripes = 5;
flagStripes = 5; drawFlag(transFlag, flagStripes);
drawFlag(transFlag, flagStripes); } else if (strArgv.compare(allFlags[2]) == 0) {
} flagStripes = 5;
else if (strArgv.compare(allFlags[2]) == 0) { drawFlag(lesbianFlag, flagStripes);
flagStripes = 5; } else if (strArgv.compare(allFlags[3]) == 0) {
drawFlag(lesbianFlag, flagStripes); flagStripes = 3;
} drawFlag(dutchFlag, flagStripes);
else if (strArgv.compare(allFlags[3]) == 0) { } else if (strArgv.compare(allFlags[4]) == 0) {
flagStripes = 3; flagStripes = 3;
drawFlag(dutchFlag, flagStripes); drawFlag(biFlag, flagStripes);
} } else if (strArgv.compare(allFlags[5]) == 0) {
else if (strArgv.compare(allFlags[4]) == 0) { flagStripes = 4;
flagStripes = 3; drawFlag(nonBinaryFlag, flagStripes);
drawFlag(biFlag, flagStripes); } else {
} std::cerr << argv[0] << ": invalid option '" << strArgv << "'\n";
else { std::cerr << "Usage: " << argv[0] << " [OPTION] [VALUE] -f [FLAG]\n";
std::cerr << argv[0] << ": invalid option '" << strArgv << "'\n"; return 1;
std::cerr << "Usage: " << argv[0] << " [OPTION] [VALUE] -f [FLAG]\n"; }
return 1; }
} break;
} case LIST:
break; std::print("All available [FLAGS]:\n");
case LIST: for (short k = 0; k < allFlagsSize; k++) {
std::print("All available [FLAGS]:\n"); std::print("{0}\n", allFlags[k]);
for (short k = 0; k < allFlagsSize; k++) { }
std::print("{0}\n", allFlags[k]); return 0;
} case HELP:
return 0; std::cout
case HELP: << "Usage: " << argv[0] << " [OPTION] [ARGUMENT] -f [FLAG]\n"
std::cout << "Usage: " << argv[0] << " [OPTION] [ARGUMENT] -f [FLAG]\n" << "All options:\n"
<< "All options:\n" << "\t-f, --flag [FLAG]\t\tPrints the chosen flag\n"
<< "\t-f, --flag [FLAG]\t\tPrints the chosen flag\n" << "\t-h, --height [Integer]\t\tPrints the flag with the chosen positive integer\n"
<< "\t-h, --height [Integer]\t\tPrints the flag with the chosen positive integer\n" << "\t-s, --string \'[String]\'\t\tPrint the chosen flag with the given string (Flag width is not yet perfectly variable)\n"
<< "\t-s, --string \'[String]\'\t\tPrint the chosen flag with the given string (Flag width is not yet perfectly variable)\n" << "\t--list\t\t\t\tList all available flags\n"
<< "\t--list\t\t\t\tList all available flags\n" << "\t--help\t\t\t\tPrints out the help screen\n";
<< "\t--help\t\t\t\tPrints out the help screen\n"; return 0;
return 0; case '?':
case '?': std::cerr << "No matching [OPTION]!\n";
std::cerr << "No matching [OPTION]!\n"; return 1;
return 1; default:
default: std::cerr << "Usage: " << argv[0] << " [OPTION] [VALUE] -f [FLAG]" << std::endl;
std::cerr << "Usage: " << argv[0] << " [OPTION] [VALUE] -f [FLAG]" << std::endl; return 1;
return 1; }
} }
} return 0;
return 0;
} }