Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-10-31 15:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncneofetch: show x resolution when possible #550

Browse Source
This commit is contained in:
nick black 2020-06-18 09:45:28 -04:00
parent e45c2c9ac3
commit 9f69e4d998
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/fetch/main.c
View File

@ -23,12 +23,15 @@ typedef struct fetched_info {
char* kernver; // strdup(uname(2)->version);
char* desktop; // getenv("XDG_CURRENT_DESKTOP")
char* shell; // getenv("SHELL")
char* term; // getenv("TERM")
int dimy, dimx; // extracted from xrandr
} fetched_info;
static int
fetch_env_vars(fetched_info* fi){
fi->desktop = getenv("XDG_CURRENT_DESKTOP");
fi->shell = getenv("SHELL");
fi->term = getenv("TERM");
return 0;
}
@ -61,6 +64,7 @@ pipe_getline(const char* cmdline){
free(buf);
return NULL;
}
// FIXME read any remaining junk so as to stave off SIGPIPEs
if(fclose(p)){
fprintf(stderr, "Error closing pipe (%s)\n", strerror(errno));
free(buf);
@ -69,6 +73,25 @@ pipe_getline(const char* cmdline){
return buf;
}
static int
fetch_x_props(fetched_info* fi){
char* xrandr = pipe_getline("xrandr --current");
if(xrandr == NULL){
return -1;
}
char* randrcurrent = strstr(xrandr, " current ");
if(randrcurrent == NULL){
free(xrandr);
return -1;
}
randrcurrent += strlen(" current ");
if(sscanf(randrcurrent, "%d x %d", &fi->dimx, &fi->dimy) != 2){
free(xrandr);
return -1;
}
return 0;
}
static char*
pipe_lsbrelease(const char* cmdline){
char* buf = pipe_getline(cmdline);
@ -245,7 +268,7 @@ drawpalette(struct notcurses* nc){
ncplane_putc_yx(stdn, y, x, &c);
}
}
return 0;
return notcurses_render(nc);
}
static int
@ -278,8 +301,10 @@ infoplane(struct notcurses* nc, const fetched_info* fi){
ncplane_printf_aligned(infop, 2, NCALIGN_LEFT, " RAM: %s/%s\n", usedmet, totalmet);
ncplane_printf_aligned(infop, 2, NCALIGN_RIGHT, "Processes: %hu ", sinfo.procs);
#endif
ncplane_printf_aligned(infop, 3, NCALIGN_LEFT, " DM: %s\n", fi->desktop);
ncplane_printf_aligned(infop, 3, NCALIGN_LEFT, " DM: %s", fi->desktop);
ncplane_printf_aligned(infop, 3, NCALIGN_RIGHT, "Shell: %s ", fi->shell);
ncplane_printf_aligned(infop, 4, NCALIGN_LEFT, " TERM: %s", fi->term);
ncplane_printf_aligned(infop, 4, NCALIGN_RIGHT, "Screen0: %dx%d ", fi->dimx, fi->dimy);
cell ul = CELL_TRIVIAL_INITIALIZER; cell ur = CELL_TRIVIAL_INITIALIZER;
cell ll = CELL_TRIVIAL_INITIALIZER; cell lr = CELL_TRIVIAL_INITIALIZER;
cell hl = CELL_TRIVIAL_INITIALIZER; cell vl = CELL_TRIVIAL_INITIALIZER;
@ -329,17 +354,19 @@ ncneofetch(struct notcurses* nc){
break;
}
fetch_env_vars(&fi);
fetch_x_props(&fi);
if(fi.distro){
if(display(nc, fi.distro)){
return -1; // FIXME soldier on, perhaps?
}
}
if(infoplane(nc, &fi)){
return -1;
notcurses_render(nc);
}
if(drawpalette(nc)){
return -1;
}
if(infoplane(nc, &fi)){
return -1;
}
if(notcurses_render(nc)){
return -1;
}