blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

[ncneofetch] use nl_langinfo for fallback (windows has no LANG)

Browse Source
This commit is contained in:
nick black 2021-11-12 02:28:58 -05:00
parent ef2c18810e
commit 423ff7898e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fetch/main.c
View File

@ -59,10 +59,17 @@ free_fetched_info(fetched_info* fi){
static int static int
fetch_env_vars(struct notcurses* nc, fetched_info* fi){ fetch_env_vars(struct notcurses* nc, fetched_info* fi){
#ifndef __MINGW64__
fi->desktop = getenv("XDG_CURRENT_DESKTOP"); fi->desktop = getenv("XDG_CURRENT_DESKTOP");
#else
fi->desktop = "Metro";
#endif
fi->shell = getenv("SHELL"); fi->shell = getenv("SHELL");
fi->term = notcurses_detected_terminal(nc); fi->term = notcurses_detected_terminal(nc);
fi->lang = getenv("LANG"); fi->lang = getenv("LANG");
if(fi->lang == NULL){
fi->lang = nl_langinfo(CODESET);
}
return 0; return 0;
} }
@ -348,11 +355,11 @@ get_kernel(fetched_info* fi){
OSVERSIONINFOEX osvi; OSVERSIONINFOEX osvi;
ZeroMemory(&osvi, sizeof(osvi)); ZeroMemory(&osvi, sizeof(osvi));
osvi.dwOSVersionInfoSize = sizeof(osvi); osvi.dwOSVersionInfoSize = sizeof(osvi);
GetVersionExA(&osvi); GetVersionExA((LPOSVERSIONINFOA)&osvi);
char ver[20]; // sure why not char ver[20]; // sure why not
snprintf(ver, sizeof(ver), "%lu.%lu", osvi.dwMajorVersion, osvi.dwMinorVersion); snprintf(ver, sizeof(ver), "%lu.%lu", osvi.dwMajorVersion, osvi.dwMinorVersion);
fi->kernver = strdup(ver); fi->kernver = strdup(ver);
fi->kernel = strdup("Windows NT"); fi->kernel = strdup("WNT");
DWORD ptype; DWORD ptype;
if(GetProductInfo(osvi.dwMajorVersion, if(GetProductInfo(osvi.dwMajorVersion,
osvi.dwMinorVersion, osvi.dwMinorVersion,
@ -403,6 +410,7 @@ get_kernel(fetched_info* fi){
return NCNEO_UNKNOWN; return NCNEO_UNKNOWN;
} }
// windows distro_pretty gets handled in get_kernel() above
static const distro_info* static const distro_info*
windows_ncneofetch(fetched_info* fi){ windows_ncneofetch(fetched_info* fi){
static const distro_info mswin = { static const distro_info mswin = {
@ -410,7 +418,6 @@ windows_ncneofetch(fetched_info* fi){
.logofile = NULL, // FIXME .logofile = NULL, // FIXME
}; };
fi->neologo = get_neofetch_art("Windows"); fi->neologo = get_neofetch_art("Windows");
fi->distro_pretty = NULL;
return &mswin; return &mswin;
} }