Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code-style: simplify window title related code

Browse Source 
instead of dancing around with some `init` parameter, directly give
`win_set_title()` what it needs. `get_win_title()` now also does *just*
what the name says.

this simplifies things quite a bit and the functions now do what their
name implies more closely instead of doing some `init` dance internally.
This commit is contained in:
NRK
2022-06-01 16:47:17 +06:00
committed by N-R-K
parent 810a9651a3
commit e9a0096d6d
3 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
main.c
View File

@ -233,35 +233,30 @@ static bool check_timeouts(int *t)
return tmin > 0;
}
size_t get_win_title(unsigned char *buf, int len, bool init)
static size_t get_win_title(char *buf, size_t len)
{
char *argv[8];
spawn_t pfd;
char w[12] = "", h[12] = "", z[12] = "", fidx[12], fcnt[12];
ssize_t n = -1;
if (buf == NULL || len <= 0)
if (wintitle.f.err || buf == NULL || len == 0)
return 0;
if (init) {
n = snprintf((char *)buf, len, "%s", options->res_name != NULL ?
options->res_name : "nsxiv");
} else if (!wintitle.f.err) {
if (mode == MODE_IMAGE) {
snprintf(w, ARRLEN(w), "%d", img.w);
snprintf(h, ARRLEN(h), "%d", img.h);
snprintf(z, ARRLEN(z), "%d", (int)(img.zoom * 100));
}
snprintf(fidx, ARRLEN(fidx), "%d", fileidx+1);
snprintf(fcnt, ARRLEN(fcnt), "%d", filecnt);
construct_argv(argv, ARRLEN(argv), wintitle.f.cmd, files[fileidx].path,
fidx, fcnt, w, h, z, NULL);
pfd = spawn(wintitle.f.cmd, argv, X_READ);
if (pfd.readfd >= 0) {
if ((n = read(pfd.readfd, buf, len-1)) > 0)
buf[n] = '\0';
close(pfd.readfd);
}
if (mode == MODE_IMAGE) {
snprintf(w, ARRLEN(w), "%d", img.w);
snprintf(h, ARRLEN(h), "%d", img.h);
snprintf(z, ARRLEN(z), "%d", (int)(img.zoom * 100));
}
snprintf(fidx, ARRLEN(fidx), "%d", fileidx+1);
snprintf(fcnt, ARRLEN(fcnt), "%d", filecnt);
construct_argv(argv, ARRLEN(argv), wintitle.f.cmd, files[fileidx].path,
fidx, fcnt, w, h, z, NULL);
pfd = spawn(wintitle.f.cmd, argv, X_READ);
if (pfd.readfd >= 0) {
if ((n = read(pfd.readfd, buf, len-1)) > 0)
buf[n] = '\0';
close(pfd.readfd);
}
return MAX(0, n);
@ -455,7 +450,11 @@ void redraw(void)
}
update_info();
if (title_dirty) {
win_set_title(&win, false);
size_t n;
char buf[512];
if ((n = get_win_title(buf, sizeof(buf))) > 0)
win_set_title(&win, buf, n);
title_dirty = false;
}
win_draw(&win);