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.93][ARM] Refactoring in ARM printer

Browse Source
This commit is contained in:
Dr-Noob
2020-11-28 12:31:08 +01:00
parent 1d58b1808d
commit 532a65e35d
1 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/printer.c
View File

@@ -320,7 +320,8 @@ uint32_t longest_attribute_length(struct ascii* art) {
} }
#ifdef ARCH_X86 #ifdef ARCH_X86
void print_algorithm_intel(struct ascii* art, int i, int n, bool* flag) { void print_algorithm_intel(struct ascii* art, int n, bool* flag) {
for(int i=0; i < LINE_SIZE; i++) {
if(*flag) { if(*flag) {
if(art->art[n][i] == ' ') { if(art->art[n][i] == ' ') {
*flag = false; *flag = false;
@@ -340,9 +341,12 @@ void print_algorithm_intel(struct ascii* art, int i, int n, bool* flag) {
} }
} }
} }
}
void print_algorithm_amd(struct ascii* art, int i, int n, bool* flag) { void print_algorithm_amd(struct ascii* art, int n, bool* flag) {
*flag = false; // dummy, just silence compiler error *flag = false; // dummy, just silence compiler error
for(int i=0; i < LINE_SIZE; i++) {
if(art->art[n][i] == '@') if(art->art[n][i] == '@')
printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset); printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
else if(art->art[n][i] == '#') else if(art->art[n][i] == '#')
@@ -350,8 +354,9 @@ void print_algorithm_amd(struct ascii* art, int i, int n, bool* flag) {
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
}
void print_ascii_x86(struct ascii* art, uint32_t la, void (*callback_print_algorithm)(struct ascii* art, int i, int n, bool* flag)) { void print_ascii_x86(struct ascii* art, uint32_t la, void (*callback_print_algorithm)(struct ascii* art, int i, bool* flag)) {
int attr_to_print = 0; int attr_to_print = 0;
int attr_type; int attr_type;
char* attr_value; char* attr_value;
@@ -362,8 +367,7 @@ void print_ascii_x86(struct ascii* art, uint32_t la, void (*callback_print_algor
printf("\n"); printf("\n");
for(uint32_t n=0;n<NUMBER_OF_LINES;n++) { for(uint32_t n=0;n<NUMBER_OF_LINES;n++) {
for(int i=0;i<LINE_SIZE;i++) callback_print_algorithm(art, n, &flag);
callback_print_algorithm(art, i, n, &flag);
if(n > space_up-1 && n < NUMBER_OF_LINES-space_down) { if(n > space_up-1 && n < NUMBER_OF_LINES-space_down) {
attr_type = art->attributes[attr_to_print]->type; attr_type = art->attributes[attr_to_print]->type;
@@ -473,7 +477,8 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct colors* cs) {
#endif #endif
#ifdef ARCH_ARM #ifdef ARCH_ARM
void print_algorithm_snapd_mtk(struct ascii* art, int i, int n) { void print_algorithm_snapd_mtk(struct ascii* art, int n) {
for(int i=0; i < LINE_SIZE; i++) {
if(art->art[n][i] == '@') if(art->art[n][i] == '@')
printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset); printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
else if(art->art[n][i] == '#') else if(art->art[n][i] == '#')
@@ -481,12 +486,15 @@ void print_algorithm_snapd_mtk(struct ascii* art, int i, int n) {
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
}
void print_algorithm_samsung(struct ascii* art, int i, int n) { void print_algorithm_samsung(struct ascii* art, int n) {
int margin = 8; int margin = 8;
if(art->art[n][i] == '#') for(int i=0; i < LINE_SIZE; i++) {
if(art->art[n][i] == '#') {
printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset); printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
}
else if(i > margin && i < LINE_SIZE-margin) { else if(i > margin && i < LINE_SIZE-margin) {
if(art->art[n][i] == '#') if(art->art[n][i] == '#')
printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset); printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
@@ -496,15 +504,18 @@ void print_algorithm_samsung(struct ascii* art, int i, int n) {
else else
printf("%c", art->art[n][i]); printf("%c", art->art[n][i]);
} }
}
void print_algorithm_arm(struct ascii* art, int i, int n) { void print_algorithm_arm(struct ascii* art, int n) {
for(int i=0; i < LINE_SIZE; i++) {
if(art->art[n][i] == '#') if(art->art[n][i] == '#')
printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset); printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
}
void print_ascii_arm(struct ascii* art, uint32_t la, void (*callback_print_algorithm)(struct ascii* art, int i, int n)) { void print_ascii_arm(struct ascii* art, uint32_t la, void (*callback_print_algorithm)(struct ascii* art, int n)) {
int attr_to_print = 0; int attr_to_print = 0;
int attr_type; int attr_type;
char* attr_value; char* attr_value;
@@ -526,13 +537,10 @@ void print_ascii_arm(struct ascii* art, uint32_t la, void (*callback_print_algor
uint32_t len = max(art->n_attributes_set, NUMBER_OF_LINES); uint32_t len = max(art->n_attributes_set, NUMBER_OF_LINES);
for(uint32_t n=0; n < len; n++) { for(uint32_t n=0; n < len; n++) {
if(n >= art->additional_spaces && n < NUMBER_OF_LINES + art->additional_spaces) { if(n >= art->additional_spaces && n < NUMBER_OF_LINES + art->additional_spaces)
for(int i=0;i<LINE_SIZE;i++) callback_print_algorithm(art, n - art->additional_spaces);
callback_print_algorithm(art, i, n-art->additional_spaces); else
} printf("%*s", LINE_SIZE, "");
else {
for(int i=0;i<LINE_SIZE;i++) printf(" ");
}
if(n >= limit_up && n < limit_down) { if(n >= limit_up && n < limit_down) {
attr_type = art->attributes[attr_to_print]->type; attr_type = art->attributes[attr_to_print]->type;