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] Recover original Intel and AMD logos by adding shadows and new replace_blocks protocol; # replaces by 1st color, @ by 2nd

Browse Source
This commit is contained in:
Dr-Noob
2021-08-09 12:45:29 +02:00
parent 7c5e638c2f
commit 42149b8dff
2 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/common/ascii.h
View File

@@ -30,10 +30,18 @@ struct ascii_logo {
};
/*
* Brief explanation:
* ASCII logos brief documentation
* ----------------------------------------------------
* 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
* CR: Color reset, gets replaced by the reset
* color by printer.c
* Logos with replace_blocks are replaced by character
* blocks (actually, spaces with background color), so
* the color in the structure must be COLOR_BG_XXX. When
* replace_blocks is true, the characters '#' are replaced
* by spaces printed with color_ascii[0], and '@' are
* printed with color_ascii[1]
*/
// SHORT LOGOS //
@@ -191,52 +199,38 @@ $C1 ###### ## ### ### ## ### "
"
#define ASCII_INTEL_L \
" ################ \
####### ####### \
#### #### \
### #### \
### ### \
### ### \
# ### ### ### \
## ### ######### ###### ###### ### ### \
## ### ### ### ### #### #### ### ### \
## ### ### ### ### ### ### ### ### \
## ### ### ### ### ########## ### #### \
## ### ### ### ### ### ### ##### \
## ## ### ### ##### ######### ## ### \
### \
### \
#### #### \
##### ########## \
########## ################ \
############################### "
" ###############@ \
######@ ######@ \
###@ ###@ \
##@ ###@ \
##@ ##@ \
##@ ##@ \
@ ##@ ##@ ##@ \
#@ ##@ ########@ #####@ #####@ ##@ ##@ \
#@ ##@ ##@ ##@ ##@ ###@ ###@ ##@ ##@ \
#@ ##@ ##@ ##@ ##@ ##@ ##@ ##@ ##@ \
#@ ##@ ##@ ##@ ##@ #########@ ##@ ###@ \
#@ ##@ ##@ ##@ ##@ ##@ ##@ ####@ \
#@ #@ ##@ ##@ ####@ ########@ #@ ##@ \
##@ \
##@ \
###@ ###@ \
####@ #########@ \
#########@ ###############@ \
##############################@ "
#define ASCII_ARM_L \
" \
\
\
\
\
\
############ ########## #### ###### ######## \
" ############ ########## #### ###### ######## \
############### ######### ####################### \
#### #### #### ##### ####### ##### \
#### #### #### #### ##### #### \
#### #### #### #### #### #### \
#### ##### #### #### #### #### \
############### #### #### #### #### \
######## #### #### #### #### #### \
\
\
\
\
"
######## #### #### #### #### #### "
#define ASCII_IBM_L \
" \
\
\
############ ################ ########## ########## \
" ############ ################ ########## ########## \
\
############ ################## ############ ############ \
\
@@ -248,10 +242,7 @@ $C1 ###### ## ### ### ## ### "
\
############ ################## ######### #### ######### \
\
############ ################ ######### ## ######### \
\
\
"
############ ################ ######### ## ######### "
typedef struct ascii_logo asciiL;
@@ -268,10 +259,10 @@ asciiL logo_broadcom = { ASCII_BROADCOM, 44, 19, false, {COLOR_FG_WHITE, COLOR_F
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} };
// Long variants | ----------------------------------------------------------------------------------------------------|
asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, false, {COLOR_FG_WHITE, COLOR_FG_GREEN}, {COLOR_FG_WHITE, COLOR_FG_GREEN} };
asciiL logo_intel_l = { ASCII_INTEL_L, 62, 19, false, {COLOR_FG_CYAN}, {COLOR_FG_CYAN, COLOR_FG_WHITE} };
asciiL logo_arm_l = { ASCII_ARM_L, 62, 19, true, {COLOR_FG_CYAN}, {COLOR_FG_WHITE, COLOR_FG_CYAN} };
asciiL logo_ibm_l = { ASCII_IBM_L, 62, 19, true, {COLOR_BG_CYAN, COLOR_FG_WHITE}, {COLOR_FG_CYAN, COLOR_FG_WHITE} };
asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, true, {COLOR_BG_WHITE, COLOR_BG_GREEN}, {COLOR_FG_WHITE, COLOR_FG_GREEN} };
asciiL logo_intel_l = { ASCII_INTEL_L, 62, 19, true, {COLOR_BG_CYAN, COLOR_BG_WHITE}, {COLOR_FG_CYAN, COLOR_FG_WHITE} };
asciiL logo_arm_l = { ASCII_ARM_L, 60, 8, true, {COLOR_BG_CYAN}, {COLOR_FG_WHITE, COLOR_FG_CYAN} };
asciiL logo_ibm_l = { ASCII_IBM_L, 62, 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

9
src/common/printer.c
View File

@@ -305,6 +305,8 @@ void choose_ascii_art(struct ascii* art, struct terminal* term, int lf) {
art->art = &logo_arm;
}
#endif
// change
art->art = &logo_ibm_l;
}
uint32_t longest_attribute_length(struct ascii* art) {
@@ -372,8 +374,11 @@ void print_ascii_x86(struct ascii* art, uint32_t la) {
if(logo->art[logo_pos] == '$' && logo->art[logo_pos+1] == 'C') {
parse_print_color(art, &logo_pos);
}
if(logo->replace_blocks && logo->art[logo_pos] == '#')
printf("%s%c%s", logo->color_ascii[0], ' ', art->reset);
if(logo->replace_blocks && logo->art[logo_pos] != ' ') {
if(logo->art[logo_pos] == '#') printf("%s%c%s", logo->color_ascii[0], ' ', art->reset);
else if(logo->art[logo_pos] == '@') printf("%s%c%s", logo->color_ascii[1], ' ', art->reset);
else printBug("ASCII art with replace_blocks has invalid character: '%c'", logo->art[logo_pos]);
}
else
printf("%c", logo->art[logo_pos]);