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

[v0.99][PPC] Fix compilation due to new logos in PPC

Browse Source
This commit is contained in:
Dr-Noob
2021-08-09 13:58:01 +02:00
parent 5e3be4c45f
commit 590c391380
1 changed files with 13 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/common/printer.c
View File

@@ -26,8 +26,10 @@
#include <Windows.h> #include <Windows.h>
#else #else
#ifdef __linux__ #ifdef __linux__
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 199309L
#endif #endif
#endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@@ -168,7 +170,6 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct color** cs) {
#elif ARCH_PPC #elif ARCH_PPC
COL_FANCY_1 = COLOR_BG_CYAN; COL_FANCY_1 = COLOR_BG_CYAN;
COL_FANCY_2 = COLOR_BG_WHITE; COL_FANCY_2 = COLOR_BG_WHITE;
art->ascii_chars[0] = '#';
#elif ARCH_ARM #elif ARCH_ARM
if(art->vendor == SOC_VENDOR_SNAPDRAGON) { if(art->vendor == SOC_VENDOR_SNAPDRAGON) {
COL_FANCY_1 = COLOR_BG_RED; COL_FANCY_1 = COLOR_BG_RED;
@@ -352,8 +353,8 @@ uint32_t longest_field_length(struct ascii* art, int la) {
return max; return max;
} }
#ifdef ARCH_X86 #if defined(ARCH_X86) || defined(ARCH_PPC)
void print_ascii_x86(struct ascii* art, uint32_t la) { void print_ascii_generic(struct ascii* art, uint32_t la) {
struct ascii_logo* logo = art->art; struct ascii_logo* logo = art->art;
int attr_to_print = 0; int attr_to_print = 0;
int attr_type; int attr_type;
@@ -402,7 +403,9 @@ void print_ascii_x86(struct ascii* art, uint32_t la) {
} }
printf("\n"); printf("\n");
} }
#endif
#ifdef ARCH_X86
bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct terminal* term) { bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct terminal* term) {
struct ascii* art = set_ascii(get_cpu_vendor(cpu), s, cs); struct ascii* art = set_ascii(get_cpu_vendor(cpu), s, cs);
if(art == NULL) if(art == NULL)
@@ -454,7 +457,7 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct
uint32_t longest_field = longest_field_length(art, longest_attribute); uint32_t longest_field = longest_field_length(art, longest_attribute);
choose_ascii_art(art, term, longest_field); choose_ascii_art(art, term, longest_field);
print_ascii_x86(art, longest_attribute); print_ascii_generic(art, longest_attribute);
free(manufacturing_process); free(manufacturing_process);
free(max_frequency); free(max_frequency);
@@ -483,46 +486,7 @@ bool print_cpufetch_x86(struct cpuInfo* cpu, STYLE s, struct color** cs, struct
#endif #endif
#ifdef ARCH_PPC #ifdef ARCH_PPC
void print_algorithm_ppc(struct ascii* art, int n) { bool print_cpufetch_ppc(struct cpuInfo* cpu, STYLE s, struct color** cs, struct terminal* term) {
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);
else
printf("%c",art->art[n][i]);
}
}
void print_ascii_ppc(struct ascii* art, uint32_t la) {
int attr_to_print = 0;
int attr_type;
char* attr_value;
uint32_t space_right;
uint32_t space_up = (NUMBER_OF_LINES - art->n_attributes_set)/2;
uint32_t space_down = NUMBER_OF_LINES - art->n_attributes_set - space_up;
printf("\n");
for(uint32_t n=0;n<NUMBER_OF_LINES;n++) {
print_algorithm_ppc(art, n);
if(n > space_up-1 && n < NUMBER_OF_LINES-space_down) {
attr_type = art->attributes[attr_to_print]->type;
attr_value = art->attributes[attr_to_print]->value;
attr_to_print++;
space_right = 1 + (la - strlen(ATTRIBUTE_FIELDS[attr_type]));
printf("%s%s%s%*s%s%s%s\n", art->color1_text, ATTRIBUTE_FIELDS[attr_type], art->reset, space_right, "", art->color2_text, attr_value, art->reset);
}
else printf("\n");
}
printf("\n");
}
/*void print_ascii(struct ascii* art) {
uint32_t longest_attribute = longest_attribute_length(art);
print_ascii_ppc(art, longest_attribute);
}*/
bool print_cpufetch_ppc(struct cpuInfo* cpu, STYLE s, struct color** cs) {
struct ascii* art = set_ascii(get_cpu_vendor(cpu), s, cs); struct ascii* art = set_ascii(get_cpu_vendor(cpu), s, cs);
if(art == NULL) if(art == NULL)
return false; return false;
@@ -566,12 +530,11 @@ bool print_cpufetch_ppc(struct cpuInfo* cpu, STYLE s, struct color** cs) {
} }
setAttribute(art,ATTRIBUTE_PEAK,pp); setAttribute(art,ATTRIBUTE_PEAK,pp);
if(art->n_attributes_set > NUMBER_OF_LINES) { uint32_t longest_attribute = longest_attribute_length(art);
printBug("The number of attributes set is bigger than the max that can be displayed"); uint32_t longest_field = longest_field_length(art, longest_attribute);
return false; choose_ascii_art(art, term, longest_field);
}
print_ascii(art); print_ascii_generic(art, longest_attribute);
return true; return true;
} }