exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the last bugs on windows (I hope)

Browse source
This commit is contained in:
TheDarkBug 2021-11-01 17:12:19 +01:00
parent 3bd9b95dd0
commit b1f96e1f3d
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
uwufetch.c
View file

@ -947,12 +947,14 @@ void get_info()
setenv("LANG", "en_US", 1); // force language to english setenv("LANG", "en_US", 1); // force language to english
#endif // __WINDOWS__ #endif // __WINDOWS__
FILE *gpu; FILE *gpu;
#ifndef __WINDOWS__
gpu = popen("lshw -class display 2> /dev/null", "r"); gpu = popen("lshw -class display 2> /dev/null", "r");
// add all gpus to the array gpu_model // add all gpus to the array gpu_model
while (fgets(line, sizeof(line), gpu)) while (fgets(line, sizeof(line), gpu))
if (sscanf(line, " product: %[^\n]", gpu_model[gpun])) if (sscanf(line, " product: %[^\n]", gpu_model[gpun]))
gpun++; gpun++;
#endif // __WINDOWS__
if (strlen(gpu_model[0]) < 2) if (strlen(gpu_model[0]) < 2)
{ {
@ -961,7 +963,7 @@ void get_info()
{ {
#ifndef __APPLE__ #ifndef __APPLE__
#ifdef __WINDOWS__ #ifdef __WINDOWS__
gpu = popen("wmic PATH Win32_VideoController GET Name | sed -n 2p", "r"); gpu = popen("wmic PATH Win32_VideoController GET Name", "r");
#else #else
gpu = popen("lspci -mm 2> /dev/null | grep \"VGA\" | awk -F '\"' '{print $4 $5 $6}'", "r"); gpu = popen("lspci -mm 2> /dev/null | grep \"VGA\" | awk -F '\"' '{print $4 $5 $6}'", "r");
#endif #endif
@ -976,7 +978,12 @@ void get_info()
// get all the gpus // get all the gpus
while (fgets(line, sizeof(line), gpu)) while (fgets(line, sizeof(line), gpu))
{ {
if (sscanf(line, "%[^\n]", gpu_model[gpun])) if (strstr(line, "Name"))
continue;
else if (strlen(line) == 2)
continue;
// ^^^ for windows
else if (sscanf(line, "%[^\n]", gpu_model[gpun]))
gpun++; gpun++;
} }
fclose(gpu); fclose(gpu);
@ -988,13 +995,15 @@ void get_info()
truncate_name(gpu_model[i]); truncate_name(gpu_model[i]);
} }
// Resolution // Resolution
#ifndef __WINDOWS__
FILE *resolution = popen("xwininfo -root 2> /dev/null | grep -E 'Width|Height'", "r"); FILE *resolution = popen("xwininfo -root 2> /dev/null | grep -E 'Width|Height'", "r");
while (fgets(line, sizeof(line), resolution)) while (fgets(line, sizeof(line), resolution))
{ {
sscanf(line, " Width: %d", &screen_width); sscanf(line, " Width: %d", &screen_width);
sscanf(line, " Height: %d", &screen_height); sscanf(line, " Height: %d", &screen_height);
} }
#endif // __WINDOWS__
// package count // package count
pkgs = pkgman(); pkgs = pkgman();
@ -1002,9 +1011,7 @@ void get_info()
uwu_kernel(); uwu_kernel();
for (int i = 0; gpu_model[i][0]; i++) for (int i = 0; gpu_model[i][0]; i++)
{
uwu_hw(gpu_model[i]); uwu_hw(gpu_model[i]);
}
uwu_hw(cpu_model); uwu_hw(cpu_model);
uwu_hw(host_model); uwu_hw(host_model);
} }