thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 16:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v0.99] Easy way to print logos with blocks instead of chars. Remove dead code

Browse Source
This commit is contained in:
Dr-Noob
2021-08-08 22:25:46 +02:00
parent 1717a96b27
commit 0aff23f962
2 changed files with 79 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/common/ascii.h
View File

@@ -1,25 +1,41 @@
#ifndef __ASCII__ #ifndef __ASCII__
#define __ASCII__ #define __ASCII__
#define COLOR_BLACK "\x1b[30;1m" #define COLOR_NONE ""
#define COLOR_RED "\x1b[31;1m" #define COLOR_FG_BLACK "\x1b[30;1m"
#define COLOR_GREEN "\x1b[32;1m" #define COLOR_FG_RED "\x1b[31;1m"
#define COLOR_YELLOW "\x1b[33;1m" #define COLOR_FG_GREEN "\x1b[32;1m"
#define COLOR_BLUE "\x1b[34;1m" #define COLOR_FG_YELLOW "\x1b[33;1m"
#define COLOR_MAGENTA "\x1b[35;1m" #define COLOR_FG_BLUE "\x1b[34;1m"
#define COLOR_CYAN "\x1b[36;1m" #define COLOR_FG_MAGENTA "\x1b[35;1m"
#define COLOR_WHITE "\x1b[37;1m" #define COLOR_FG_CYAN "\x1b[36;1m"
#define COLOR_FG_WHITE "\x1b[37;1m"
#define COLOR_BG_BLACK "\x1b[40;1m"
#define COLOR_BG_RED "\x1b[41;1m"
#define COLOR_BG_GREEN "\x1b[42;1m"
#define COLOR_BG_YELLOW "\x1b[43;1m"
#define COLOR_BG_BLUE "\x1b[44;1m"
#define COLOR_BG_MAGENTA "\x1b[45;1m"
#define COLOR_BG_CYAN "\x1b[46;1m"
#define COLOR_BG_WHITE "\x1b[47;1m"
#define COLOR_RESET "\x1b[m"
struct ascii_logo { struct ascii_logo {
char* art; char* art;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
bool replace_blocks;
char* color_ascii[8]; char* color_ascii[8];
char* color_text[2]; char* color_text[2];
}; };
// 1 2 3 4 5 6 /*
//0123456789012345678901234567890123456789012345678901234567890 * Brief explanation:
* C1, C2, ...: ColorN, gets replaced by printer.c with
* the color in ascii_logo->color_ascii[N]
* CR: Color reset, gets replaced by the reset color by printer.c
*/
#define ASCII_AMD \ #define ASCII_AMD \
"$C2 '############### \ "$C2 '############### \
$C2 ,############# \ $C2 ,############# \
@@ -37,8 +53,6 @@ $C1 ######### ### ## ### ## ## \
$C1## ## ### ### ## ## \ $C1## ## ### ### ## ## \
$C1## ## ### ### ####### " $C1## ## ### ### ####### "
// 1 2 3 4 5 6
// 123456789012345678901234567890123456789012345678901234567890
#define ASCII_INTEL \ #define ASCII_INTEL \
"$C1 ################ \ "$C1 ################ \
$C1 ####### ####### \ $C1 ####### ####### \
@@ -86,19 +100,19 @@ $C1 ## ### ## # # # # ## ## $C2@@ @ @@ @@ \
$C1## ## ## ###### ##### # ## ## $C2@@ @@@@@@ @@ @@ " $C1## ## ## ###### ##### # ## ## $C2@@ @@@@@@ @@ @@ "
#define ASCII_EXYNOS \ #define ASCII_EXYNOS \
"$C1 \ "$C2 \
$C1 \ $C2 \
$C1 \ $C2 \
$C1 ## ## ## \ $C1##$CR $C1##$CR $C1##$CR \
$C1 ## ## \ $C1##$CR $C1##$CR \
$C1 ## \ $C1##$CR \
$C1 ## ## \ $C1##$CR $C1##$CR \
$C1 ## ## ## \ $C1##$CR $C1##$CR $C1##$CR \
$C1 \ $C2 \
$C2 SAMSUNG \ $C2 SAMSUNG \
$C2 Exynos \ $C2 Exynos \
$C1 \ $C2 \
$C1 " $C2 "
#define ASCII_KIRIN \ #define ASCII_KIRIN \
"$C1 ####### \ "$C1 ####### \
@@ -144,44 +158,34 @@ $C1 ###### ## ### ### ## ### "
// jp2a --height=17 ibm.jpg // jp2a --height=17 ibm.jpg
#define ASCII_IBM \ #define ASCII_IBM \
"$C1######### ################ ######### ######### \ "######### ################ ######### ######### \
$C1 \ \
$C1######### ################## ########## ########## \ ######### ################## ########## ########## \
$C1 \ \
$C1 ##### ###### ###### #################### \ ##### ###### ###### #################### \
$C1 \ \
$C1 ##### ############## #################### \ ##### ############## #################### \
$C1 \ \
$C1 ##### ###### ###### ##### ###### ##### \ ##### ###### ###### ##### ###### ##### \
$C1 \ \
$C1######### ################## ######## #### ######## \ ######### ################## ######## #### ######## \
$C1 \ \
$C1######### ################ ######## ## ######## " ######### ################ ######## ## ######## "
// LOGO W H COLORS LOGO (>0 && <10) COLORS TEXT (=2) typedef struct ascii_logo asciiL;
// --------------------------------------------------------------------------------
static struct ascii_logo logo_amd = { ASCII_AMD, 39, 15, {COLOR_WHITE, COLOR_GREEN}, {COLOR_WHITE, COLOR_GREEN} };
static struct ascii_logo logo_intel = { ASCII_INTEL, 62, 19, {COLOR_CYAN}, {COLOR_CYAN, COLOR_WHITE} };
static struct ascii_logo logo_snapd = { ASCII_SNAPD, 39, 16, {COLOR_RED, COLOR_WHITE}, {COLOR_RED, COLOR_WHITE} };
static struct ascii_logo logo_mtk = { ASCII_MTK, 59, 5, {COLOR_BLUE, COLOR_YELLOW}, {COLOR_BLUE, COLOR_YELLOW} };
static struct ascii_logo logo_exynos = { ASCII_EXYNOS, 22, 13, {COLOR_BLUE, COLOR_WHITE}, {COLOR_BLUE, COLOR_WHITE} };
static struct ascii_logo logo_kirin = { ASCII_KIRIN, 53, 12, {COLOR_RED}, {COLOR_WHITE, COLOR_RED} };
static struct ascii_logo logo_broadcom = { ASCII_BROADCOM, 44, 19, {COLOR_WHITE, COLOR_RED}, {COLOR_WHITE, COLOR_RED} };
static struct ascii_logo logo_arm = { ASCII_ARM, 42, 5, {COLOR_CYAN}, {COLOR_WHITE, COLOR_CYAN} };
static struct ascii_logo logo_ibm = { ASCII_IBM, 57, 13, {COLOR_CYAN, COLOR_WHITE}, {COLOR_CYAN, COLOR_WHITE} };
static struct ascii_logo logo_unknown = { NULL, 0, 0, {"" }, {"", ""} };
static struct ascii_logo* ASCII_ARRAY [] = { // ------------------------------------------------------------------------------------------------------
&logo_amd, // | LOGO | W | H | REPLACE | COLORS LOGO (>0 && <10) | COLORS TEXT (=2) |
&logo_intel, // ------------------------------------------------------------------------------------------------------
&logo_snapd, asciiL logo_amd = { ASCII_AMD, 39, 15, false, {COLOR_FG_WHITE, COLOR_FG_GREEN}, {COLOR_FG_WHITE, COLOR_FG_GREEN} };
&logo_mtk, asciiL logo_intel = { ASCII_INTEL, 62, 19, false, {COLOR_FG_CYAN}, {COLOR_FG_CYAN, COLOR_FG_WHITE} };
&logo_exynos, asciiL logo_snapd = { ASCII_SNAPD, 39, 16, false, {COLOR_FG_RED, COLOR_FG_WHITE}, {COLOR_FG_RED, COLOR_FG_WHITE} };
&logo_kirin, asciiL logo_mtk = { ASCII_MTK, 59, 5, false, {COLOR_FG_BLUE, COLOR_FG_YELLOW}, {COLOR_FG_BLUE, COLOR_FG_YELLOW} };
&logo_broadcom, asciiL logo_exynos = { ASCII_EXYNOS, 22, 13, true, {COLOR_BG_BLUE, COLOR_FG_WHITE}, {COLOR_FG_BLUE, COLOR_FG_WHITE} };
&logo_arm, asciiL logo_kirin = { ASCII_KIRIN, 53, 12, false, {COLOR_FG_RED}, {COLOR_FG_WHITE, COLOR_FG_RED} };
&logo_ibm, asciiL logo_broadcom = { ASCII_BROADCOM, 44, 19, false, {COLOR_FG_WHITE, COLOR_FG_RED}, {COLOR_FG_WHITE, COLOR_FG_RED} };
&logo_unknown asciiL logo_arm = { ASCII_ARM, 42, 5, false, {COLOR_FG_CYAN}, {COLOR_FG_WHITE, COLOR_FG_CYAN} };
}; asciiL logo_ibm = { ASCII_IBM, 57, 13, true, {COLOR_BG_CYAN, COLOR_FG_WHITE}, {COLOR_FG_CYAN, COLOR_FG_WHITE} };
asciiL logo_unknown = { NULL, 0, 0, false, {COLOR_NONE }, {COLOR_NONE, COLOR_NONE} };
#endif #endif

50
src/common/printer.c
View File

@@ -28,25 +28,6 @@
#define max(a,b) (((a)>(b))?(a):(b)) #define max(a,b) (((a)>(b))?(a):(b))
#define MAX_ATTRIBUTES 100 #define MAX_ATTRIBUTES 100
#define COLOR_NONE ""
#define COLOR_FG_BLACK "\x1b[30;1m"
#define COLOR_FG_RED "\x1b[31;1m"
#define COLOR_FG_GREEN "\x1b[32;1m"
#define COLOR_FG_YELLOW "\x1b[33;1m"
#define COLOR_FG_BLUE "\x1b[34;1m"
#define COLOR_FG_MAGENTA "\x1b[35;1m"
#define COLOR_FG_CYAN "\x1b[36;1m"
#define COLOR_FG_WHITE "\x1b[37;1m"
#define COLOR_BG_BLACK "\x1b[40;1m"
#define COLOR_BG_RED "\x1b[41;1m"
#define COLOR_BG_GREEN "\x1b[42;1m"
#define COLOR_BG_YELLOW "\x1b[43;1m"
#define COLOR_BG_BLUE "\x1b[44;1m"
#define COLOR_BG_MAGENTA "\x1b[45;1m"
#define COLOR_BG_CYAN "\x1b[46;1m"
#define COLOR_BG_WHITE "\x1b[47;1m"
#define COLOR_RESET "\x1b[m"
enum { enum {
#if defined(ARCH_X86) || defined(ARCH_PPC) #if defined(ARCH_X86) || defined(ARCH_PPC)
ATTRIBUTE_NAME, ATTRIBUTE_NAME,
@@ -307,11 +288,17 @@ uint32_t longest_attribute_length(struct ascii* art) {
} }
#ifdef ARCH_X86 #ifdef ARCH_X86
void parse_print_color(struct ascii_logo* logo, uint32_t* logo_pos) { void parse_print_color(struct ascii* art, uint32_t* logo_pos) {
struct ascii_logo* logo = art->art;
char color_id_str = logo->art[*logo_pos + 2]; char color_id_str = logo->art[*logo_pos + 2];
int color_id = (color_id_str - '0') - 1;
printf("%s", logo->color_ascii[color_id]); if(color_id_str == 'R') {
printf("%s", art->reset);
}
else {
int color_id = (color_id_str - '0') - 1;
printf("%s", logo->color_ascii[color_id]);
}
*logo_pos+=3; *logo_pos+=3;
} }
@@ -333,9 +320,13 @@ void print_ascii_x86(struct ascii* art, uint32_t la) {
if(space_up > 0 || (space_up + n >= 0 && space_up + n < (int)logo->height)) { if(space_up > 0 || (space_up + n >= 0 && space_up + n < (int)logo->height)) {
for(uint32_t i=0; i < logo->width; i++) { for(uint32_t i=0; i < logo->width; i++) {
if(logo->art[logo_pos] == '$' && logo->art[logo_pos+1] == 'C') { if(logo->art[logo_pos] == '$' && logo->art[logo_pos+1] == 'C') {
parse_print_color(logo, &logo_pos); parse_print_color(art, &logo_pos);
} }
printf("%c", logo->art[logo_pos]); if(logo->replace_blocks && logo->art[logo_pos] == '#')
printf("%s%c%s", logo->color_ascii[0], ' ', art->reset);
else
printf("%c", logo->art[logo_pos]);
logo_pos++; logo_pos++;
} }
printf("%s", art->reset); printf("%s", art->reset);
@@ -727,17 +718,6 @@ bool print_cpufetch_arm(struct cpuInfo* cpu, STYLE s, struct color** cs) {
#endif #endif
bool print_cpufetch(struct cpuInfo* cpu, STYLE s, struct color** cs) { bool print_cpufetch(struct cpuInfo* cpu, STYLE s, struct color** cs) {
// Sanity check of ASCII arts
/*int len = sizeof(ASCII_ARRAY) / sizeof(ASCII_ARRAY[0]);
for(int i=0; i < len; i++) {
const struct ascii_logo* logo = ASCII_ARRAY[i];
if(strlen(logo->art) != (logo->width * logo->height)) {
printBug("ASCII art %d is wrong! ASCII length: %d, expected length: %d",
i, strlen(logo->art), logo->height * logo->width);
return false;
}
}*/
#ifdef ARCH_X86 #ifdef ARCH_X86
return print_cpufetch_x86(cpu, s, cs); return print_cpufetch_x86(cpu, s, cs);
#elif ARCH_PPC #elif ARCH_PPC