diff --git a/src/common/args.cpp b/src/common/args.cpp index e72f291..14bd6a6 100644 --- a/src/common/args.cpp +++ b/src/common/args.cpp @@ -13,8 +13,13 @@ #define NUM_COLORS 4 #define COLOR_STR_NVIDIA "nvidia" +#define COLOR_STR_INTEL "intel" -#define COLOR_DEFAULT_NVIDIA "118,185,0:255,255,255:255,255,255:118,185,0" +// +-----------------------+-----------------------+ +// | Color logo | Color text | +// | Color 1 | Color 2 | Color 1 | Color 2 | +#define COLOR_DEFAULT_NVIDIA "118,185,000:255,255,255:255,255,255:118,185,000" +#define COLOR_DEFAULT_INTEL "015,125,194:230,230,230:040,150,220:230,230,230" struct args_struct { bool help_flag; @@ -145,6 +150,7 @@ bool parse_color(char* optarg_str, struct color*** cs) { bool free_ptr = true; if(strcmp(optarg_str, COLOR_STR_NVIDIA) == 0) color_to_copy = COLOR_DEFAULT_NVIDIA; + else if(strcmp(optarg_str, COLOR_STR_INTEL) == 0) color_to_copy = COLOR_DEFAULT_INTEL; else { str_to_parse = optarg_str; free_ptr = false; diff --git a/src/common/ascii.hpp b/src/common/ascii.hpp index dbae762..ee6a470 100644 --- a/src/common/ascii.hpp +++ b/src/common/ascii.hpp @@ -1,32 +1,32 @@ #ifndef __ASCII__ #define __ASCII__ -#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_FG_B_BLACK "\x1b[90;1m" -#define COLOR_FG_B_RED "\x1b[91;1m" -#define COLOR_FG_B_GREEN "\x1b[92;1m" -#define COLOR_FG_B_YELLOW "\x1b[93;1m" -#define COLOR_FG_B_BLUE "\x1b[94;1m" -#define COLOR_FG_B_MAGENTA "\x1b[95;1m" -#define COLOR_FG_B_CYAN "\x1b[96;1m" -#define COLOR_FG_B_WHITE "\x1b[97;1m" -#define COLOR_RESET "\x1b[m" +#define C_NONE "" +#define C_FG_BLACK "\x1b[30;1m" +#define C_FG_RED "\x1b[31;1m" +#define C_FG_GREEN "\x1b[32;1m" +#define C_FG_YELLOW "\x1b[33;1m" +#define C_FG_BLUE "\x1b[34;1m" +#define C_FG_MAGENTA "\x1b[35;1m" +#define C_FG_CYAN "\x1b[36;1m" +#define C_FG_WHITE "\x1b[37;1m" +#define C_BG_BLACK "\x1b[40;1m" +#define C_BG_RED "\x1b[41;1m" +#define C_BG_GREEN "\x1b[42;1m" +#define C_BG_YELLOW "\x1b[43;1m" +#define C_BG_BLUE "\x1b[44;1m" +#define C_BG_MAGENTA "\x1b[45;1m" +#define C_BG_CYAN "\x1b[46;1m" +#define C_BG_WHITE "\x1b[47;1m" +#define C_FG_B_BLACK "\x1b[90;1m" +#define C_FG_B_RED "\x1b[91;1m" +#define C_FG_B_GREEN "\x1b[92;1m" +#define C_FG_B_YELLOW "\x1b[93;1m" +#define C_FG_B_BLUE "\x1b[94;1m" +#define C_FG_B_MAGENTA "\x1b[95;1m" +#define C_FG_B_CYAN "\x1b[96;1m" +#define C_FG_B_WHITE "\x1b[97;1m" +#define C_RESET "\x1b[m" struct ascii_logo { const char* art; @@ -59,6 +59,23 @@ $C2## ## ## ## ## ## ## ## #: :# \ $C2## ## ## ## ## ## ## ## ####### \ $C2## ## ### ## ###### ## ## ## " +#define ASCII_INTEL \ +"$C1 .#################. \ +$C1 .#### ####. \ +$C1 .## ### \ +$C1 ## :## ### \ +$C1 # ## :## ## \ +$C1 ## ## ######. #### ###### :## ## \ +$C1 ## ## ##: ##: ## ## ### :## ### \ +$C1## ## ##: ##: ## :######## :## ## \ +$C1## ## ##: ##: ## ##. . :## #### \ +$C1## # ##: ##: #### #####: ## \ +$C1 ## \ +$C1 ###. ..o####. \ +$C1 ######oo... ..oo####### \ +$C1 o###############o " + +// LONG LOGOS #define ASCII_NVIDIA_L \ "$C1 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM \ $C1 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM \ @@ -76,14 +93,37 @@ $C1 olcc::; ,:ccloMMMMMMMMM \ $C1 :......oMMMMMMMMMMMMMMMMMMMMMM \ $C1 :lllMMMMMMMMMMMMMMMMMMMMMMMMMM " +#define ASCII_INTEL_L \ +"$C1 ###############@ \ +$C1 ######@ ######@ \ +$C1 ###@ ###@ \ +$C1 ##@ ###@ \ +$C1 ##@ ##@ \ +$C1 ##@ ##@ \ +$C1 @ ##@ ##@ ##@ \ +$C1 #@ ##@ ########@ #####@ #####@ ##@ ##@ \ +$C1 #@ ##@ ##@ ##@ ##@ ###@ ###@ ##@ ##@ \ +$C1 #@ ##@ ##@ ##@ ##@ ##@ ##@ ##@ ##@ \ +$C1 #@ ##@ ##@ ##@ ##@ #########@ ##@ ###@ \ +$C1 #@ ##@ ##@ ##@ ##@ ##@ ##@ ####@ \ +$C1 #@ #@ ##@ ##@ ####@ ########@ #@ ##@ \ +$C1 ##@ \ +$C1 ##@ \ +$C1 ###@ ###@ \ +$C1 ####@ #########@ \ +$C1 #########@ ###############@ \ +$C1 ##############################@ " + typedef struct ascii_logo asciiL; -// ------------------------------------------------------------------------------------------------------ -// | LOGO | W | H | REPLACE | COLORS LOGO (>0 && <10) | COLORS TEXT (=2) | -// ------------------------------------------------------------------------------------------------------ -asciiL logo_nvidia = { ASCII_NVIDIA, 45, 19, false, {COLOR_FG_GREEN, COLOR_FG_WHITE}, {COLOR_FG_WHITE, COLOR_FG_GREEN} }; -// Long variants | ---------------------------------------------------------------------------------------------------| -asciiL logo_nvidia_l = { ASCII_NVIDIA_L, 50, 15, false, {COLOR_FG_GREEN, COLOR_FG_WHITE}, {COLOR_FG_WHITE, COLOR_FG_GREEN} }; -asciiL logo_unknown = { NULL, 0, 0, false, {COLOR_NONE}, {COLOR_NONE, COLOR_NONE} }; +// ------------------------------------------------------------------------------------------ +// | LOGO | W | H | REPLACE | COLORS LOGO | COLORS TEXT | +// ------------------------------------------------------------------------------------------ +asciiL logo_nvidia = { ASCII_NVIDIA, 45, 19, false, {C_FG_GREEN, C_FG_WHITE}, {C_FG_WHITE, C_FG_GREEN} }; +asciiL logo_intel = { ASCII_INTEL, 48, 14, false, {C_FG_CYAN}, {C_FG_CYAN, C_FG_WHITE} }; +// Long variants | ---------------------------------------------------------------------------------------| +asciiL logo_nvidia_l = { ASCII_NVIDIA_L, 50, 15, false, {C_FG_GREEN, C_FG_WHITE}, {C_FG_WHITE, C_FG_GREEN} }; +asciiL logo_intel_l = { ASCII_INTEL_L, 62, 19, true, {C_BG_CYAN, C_BG_WHITE}, {C_FG_CYAN, C_FG_WHITE} }; +asciiL logo_unknown = { NULL, 0, 0, false, {C_NONE}, {C_NONE, C_NONE} }; #endif diff --git a/src/common/master.cpp b/src/common/master.cpp index 8dbc9ba..219b36a 100644 --- a/src/common/master.cpp +++ b/src/common/master.cpp @@ -15,7 +15,6 @@ struct gpu_list { struct gpu_list* get_gpu_list() { int idx = 0; - bool valid = true; struct gpu_list* list = (struct gpu_list*) malloc(sizeof(struct gpu_list)); list->num_gpus = 0; list->gpus = (struct gpu_info**) malloc(sizeof(struct info*) * MAX_GPUS); diff --git a/src/common/printer.cpp b/src/common/printer.cpp index 23b14db..a58181b 100644 --- a/src/common/printer.cpp +++ b/src/common/printer.cpp @@ -200,23 +200,32 @@ void replace_bgbyfg_color(struct ascii_logo* logo) { for(int i=0; i < 2; i++) { if(logo->color_ascii[i] == NULL) break; - if(strcmp(logo->color_ascii[i], COLOR_BG_BLACK) == 0) strcpy(logo->color_ascii[i], COLOR_FG_BLACK); - else if(strcmp(logo->color_ascii[i], COLOR_BG_RED) == 0) strcpy(logo->color_ascii[i], COLOR_FG_RED); - else if(strcmp(logo->color_ascii[i], COLOR_BG_GREEN) == 0) strcpy(logo->color_ascii[i], COLOR_FG_GREEN); - else if(strcmp(logo->color_ascii[i], COLOR_BG_YELLOW) == 0) strcpy(logo->color_ascii[i], COLOR_FG_YELLOW); - else if(strcmp(logo->color_ascii[i], COLOR_BG_BLUE) == 0) strcpy(logo->color_ascii[i], COLOR_FG_BLUE); - else if(strcmp(logo->color_ascii[i], COLOR_BG_MAGENTA) == 0) strcpy(logo->color_ascii[i], COLOR_FG_MAGENTA); - else if(strcmp(logo->color_ascii[i], COLOR_BG_CYAN) == 0) strcpy(logo->color_ascii[i], COLOR_FG_CYAN); - else if(strcmp(logo->color_ascii[i], COLOR_BG_WHITE) == 0) strcpy(logo->color_ascii[i], COLOR_FG_WHITE); + if(strcmp(logo->color_ascii[i], C_BG_BLACK) == 0) strcpy(logo->color_ascii[i], C_FG_BLACK); + else if(strcmp(logo->color_ascii[i], C_BG_RED) == 0) strcpy(logo->color_ascii[i], C_FG_RED); + else if(strcmp(logo->color_ascii[i], C_BG_GREEN) == 0) strcpy(logo->color_ascii[i], C_FG_GREEN); + else if(strcmp(logo->color_ascii[i], C_BG_YELLOW) == 0) strcpy(logo->color_ascii[i], C_FG_YELLOW); + else if(strcmp(logo->color_ascii[i], C_BG_BLUE) == 0) strcpy(logo->color_ascii[i], C_FG_BLUE); + else if(strcmp(logo->color_ascii[i], C_BG_MAGENTA) == 0) strcpy(logo->color_ascii[i], C_FG_MAGENTA); + else if(strcmp(logo->color_ascii[i], C_BG_CYAN) == 0) strcpy(logo->color_ascii[i], C_FG_CYAN); + else if(strcmp(logo->color_ascii[i], C_BG_WHITE) == 0) strcpy(logo->color_ascii[i], C_FG_WHITE); + } +} + +struct ascii_logo* choose_ascii_art_aux(struct ascii_logo* logo_long, struct ascii_logo* logo_short, struct terminal* term, int lf) { + if(ascii_fits_screen(term->w, *logo_long, lf)) { + return logo_long; + } + else { + return logo_short; } } void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* term, int lf) { if(art->vendor == GPU_VENDOR_NVIDIA) { - if(term != NULL && ascii_fits_screen(term->w, logo_nvidia_l, lf)) - art->art = &logo_nvidia_l; - else - art->art = &logo_nvidia; + art->art = choose_ascii_art_aux(&logo_nvidia_l, &logo_nvidia, term, lf); + } + else if(art->vendor == GPU_VENDOR_INTEL) { + art->art = choose_ascii_art_aux(&logo_intel_l, &logo_intel, term, lf); } else { art->art = &logo_unknown; @@ -228,10 +237,10 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter switch(art->style) { case STYLE_LEGACY: logo->replace_blocks = false; - strcpy(logo->color_text[0], COLOR_NONE); - strcpy(logo->color_text[1], COLOR_NONE); - strcpy(logo->color_ascii[0], COLOR_NONE); - strcpy(logo->color_ascii[1], COLOR_NONE); + strcpy(logo->color_text[0], C_NONE); + strcpy(logo->color_text[1], C_NONE); + strcpy(logo->color_ascii[0], C_NONE); + strcpy(logo->color_ascii[1], C_NONE); art->reset[0] = '\0'; break; case STYLE_RETRO: @@ -245,7 +254,7 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter strcpy(logo->color_ascii[0], rgb_to_ansi(cs[0], logo->replace_blocks, true)); strcpy(logo->color_ascii[1], rgb_to_ansi(cs[1], logo->replace_blocks, true)); } - strcpy(art->reset, COLOR_RESET); + strcpy(art->reset, C_RESET); break; case STYLE_INVALID: default: @@ -344,7 +353,29 @@ void print_ascii_generic(struct ascii* art, uint32_t la, int32_t text_space, con #ifdef BACKEND_INTEL bool print_gpufetch_intel(struct gpu_info* gpu, STYLE s, struct color** cs, struct terminal* term) { - return false; + struct ascii* art = set_ascii(get_gpu_vendor(gpu), s); + + if(art == NULL) + return false; + + char* gpu_name = get_str_gpu_name(gpu); + setAttribute(art, ATTRIBUTE_NAME, gpu_name); + + const char** attribute_fields = ATTRIBUTE_FIELDS; + uint32_t longest_attribute = longest_attribute_length(art, attribute_fields); + uint32_t longest_field = longest_field_length(art, longest_attribute); + choose_ascii_art(art, cs, term, longest_field); + + if(!ascii_fits_screen(term->w, *art->art, longest_field)) { + // Despite of choosing the smallest logo, the output does not fit + // Choose the shorter field names and recalculate the longest attr + attribute_fields = ATTRIBUTE_FIELDS_SHORT; + longest_attribute = longest_attribute_length(art, attribute_fields); + } + + print_ascii_generic(art, longest_attribute, term->w - art->art->width, attribute_fields); + + return true; } #endif diff --git a/src/intel/intel.cpp b/src/intel/intel.cpp index 44680a4..ecc0712 100644 --- a/src/intel/intel.cpp +++ b/src/intel/intel.cpp @@ -1,4 +1,5 @@ #include +#include #include "intel.hpp" #include "uarch.hpp" @@ -7,7 +8,11 @@ struct gpu_info* get_gpu_info_intel() { struct gpu_info* gpu = (struct gpu_info*) emalloc(sizeof(struct gpu_info)); + const char* name = "UHD Graphics XXX"; + gpu->vendor = GPU_VENDOR_INTEL; + gpu->name = (char *) emalloc(sizeof(char) * (strlen(name) + 1)); + strcpy(gpu->name, name); return gpu; } @@ -15,7 +20,7 @@ struct gpu_info* get_gpu_info_intel() { bool print_gpu_intel(struct gpu_info* gpu) { if(gpu->vendor != GPU_VENDOR_INTEL) return false; - printf("Intel ???\n"); + printf("Intel %s\n", gpu->name); return true; }