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

Refactoring in printer

Browse Source
This commit is contained in:
Dr-Noob
2020-06-21 12:43:51 +02:00
parent 0cba7b4348
commit 0087453eda
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/printer.c
View File

@@ -51,6 +51,7 @@ struct ascii {
char art[NUMBER_OF_LINES][LINE_SIZE]; char art[NUMBER_OF_LINES][LINE_SIZE];
char color1[10]; char color1[10];
char color2[10]; char color2[10];
char reset[10];
char* atributes[ATTRIBUTE_COUNT]; char* atributes[ATTRIBUTE_COUNT];
VENDOR vendor; VENDOR vendor;
}; };
@@ -73,48 +74,47 @@ struct ascii* set_ascii(VENDOR cpuVendor, STYLE style) {
return NULL; return NULL;
} }
char *COL_DEFAULT_1, *COL_DEFAULT_2, *COL_DARK_1, *COL_DARK_2;
struct ascii* art = malloc(sizeof(struct ascii)); struct ascii* art = malloc(sizeof(struct ascii));
art->vendor = cpuVendor; art->vendor = cpuVendor;
strcpy(art->reset,RESET);
if(cpuVendor == VENDOR_INTEL) { if(cpuVendor == VENDOR_INTEL) {
switch (style) { COL_DEFAULT_1 = COL_INTEL_DEFAULT_1;
case STYLE_EMPTY: COL_DEFAULT_2 = COL_INTEL_DEFAULT_2;
case STYLE_DEFAULT: COL_DARK_1 = COL_INTEL_DARK_1;
strcpy(art->color1,COL_INTEL_DEFAULT_1); COL_DARK_2 = COL_INTEL_DARK_2;
strcpy(art->color2,COL_INTEL_DEFAULT_2);
break;
case STYLE_DARK:
strcpy(art->color1,COL_INTEL_DARK_1);
strcpy(art->color2,COL_INTEL_DARK_2);
break;
case STYLE_NONE:
strcpy(art->color1,COL_NONE);
strcpy(art->color2,COL_NONE);
break;
default:
printBug("Found invalid style (%d)",style);
return NULL;
}
} }
else { else {
switch (style) { COL_DEFAULT_1 = COL_AMD_DEFAULT_1;
case STYLE_EMPTY: COL_DEFAULT_2 = COL_AMD_DEFAULT_2;
case STYLE_DEFAULT: COL_DARK_1 = COL_AMD_DARK_1;
strcpy(art->color1,COL_AMD_DEFAULT_1); COL_DARK_2 = COL_AMD_DARK_2;
strcpy(art->color2,COL_AMD_DEFAULT_2); }
break;
case STYLE_DARK: switch(style) {
strcpy(art->color1,COL_AMD_DARK_1); case STYLE_NONE:
strcpy(art->color2,COL_AMD_DARK_2);
break;
case STYLE_NONE:
strcpy(art->color1,COL_NONE); strcpy(art->color1,COL_NONE);
strcpy(art->color2,COL_NONE); strcpy(art->color2,COL_NONE);
break; break;
default: case STYLE_EMPTY:
printBug("Found invalid style (%d)",style); #ifdef _WIN32
return NULL; strcpy(art->color1,COL_NONE);
} strcpy(art->color2,COL_NONE);
art->reset[0] = '\0';
break;
#endif
case STYLE_DEFAULT:
strcpy(art->color1,COL_DEFAULT_1);
strcpy(art->color2,COL_DEFAULT_2);
break;
case STYLE_DARK:
strcpy(art->color1,COL_DARK_1);
strcpy(art->color2,COL_DARK_2);
break;
default:
printBug("Found invalid style (%d)",style);
return NULL;
} }
char tmp[NUMBER_OF_LINES*LINE_SIZE]; char tmp[NUMBER_OF_LINES*LINE_SIZE];
@@ -139,12 +139,12 @@ void print_ascii_intel(struct ascii* art) {
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
else else
printf("%s%c" RESET,art->color1,art->art[n][i]); printf("%s%c%s", art->color1, art->art[n][i], art->reset);
} }
else { else {
if(art->art[n][i] != ' ') { if(art->art[n][i] != ' ') {
flag = true; flag = true;
printf("%s%c" RESET,art->color2,art->art[n][i]); printf("%s%c%s", art->color2, art->art[n][i], art->reset);
} }
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
@@ -153,7 +153,7 @@ void print_ascii_intel(struct ascii* art) {
/*** PRINT ATTRIBUTE ***/ /*** PRINT ATTRIBUTE ***/
if(n>LINES_SPACE_UP-1 && n<NUMBER_OF_LINES-LINES_SPACE_DOWN) if(n>LINES_SPACE_UP-1 && n<NUMBER_OF_LINES-LINES_SPACE_DOWN)
printf("%s%s%s%s"RESET"\n",art->color1,ATTRIBUTE_FIELDS[n-LINES_SPACE_UP],art->color2,art->atributes[n-LINES_SPACE_UP]); printf("%s%s%s%s%s\n",art->color1,ATTRIBUTE_FIELDS[n-LINES_SPACE_UP],art->color2,art->atributes[n-LINES_SPACE_UP],art->reset);
else printf("\n"); else printf("\n");
} }
} }
@@ -164,16 +164,16 @@ void print_ascii_amd(struct ascii* art) {
/*** PRINT ASCII-ART ***/ /*** PRINT ASCII-ART ***/
for(int i=0;i<LINE_SIZE;i++) { for(int i=0;i<LINE_SIZE;i++) {
if(art->art[n][i] == '@') if(art->art[n][i] == '@')
printf("%s%c" RESET,art->color1,art->art[n][i]); printf("%s%c%s", art->color1, art->art[n][i], art->reset);
else if(art->art[n][i] == '#') else if(art->art[n][i] == '#')
printf("%s%c" RESET,art->color2,art->art[n][i]); printf("%s%c%s", art->color2, art->art[n][i], art->reset);
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
/*** PRINT ATTRIBUTE ***/ /*** PRINT ATTRIBUTE ***/
if(n>LINES_SPACE_UP-1 && n<NUMBER_OF_LINES-LINES_SPACE_DOWN) if(n>LINES_SPACE_UP-1 && n<NUMBER_OF_LINES-LINES_SPACE_DOWN)
printf("%s%s%s%s"RESET"\n",art->color1,ATTRIBUTE_FIELDS[n-LINES_SPACE_UP],art->color2,art->atributes[n-LINES_SPACE_UP]); printf("%s%s%s%s%s\n",art->color1,ATTRIBUTE_FIELDS[n-LINES_SPACE_UP],art->color2,art->atributes[n-LINES_SPACE_UP], art->reset);
else printf("\n"); else printf("\n");
} }