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

Close image-info explicitly

This commit is contained in:
Bert Münnich 2018-02-18 13:16:00 +01:00
parent 4124857137
commit 762420cdf1
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands.c
View File

@ -27,6 +27,7 @@
void remove_file(int, bool); void remove_file(int, bool);
void load_image(int); void load_image(int);
void close_info(void);
void open_info(void); void open_info(void);
int ptr_third_x(void); int ptr_third_x(void);
void redraw(void); void redraw(void);
@ -98,9 +99,11 @@ bool cg_toggle_bar(arg_t _)
{ {
win_toggle_bar(&win); win_toggle_bar(&win);
if (mode == MODE_IMAGE) { if (mode == MODE_IMAGE) {
img.checkpan = img.dirty = true;
if (win.bar.h > 0) if (win.bar.h > 0)
open_info(); open_info();
else
close_info();
img.checkpan = img.dirty = true;
} else { } else {
tns.dirty = true; tns.dirty = true;
} }

36
main.c
View File

@ -72,7 +72,7 @@ struct {
extcmd_t f; extcmd_t f;
int fd; int fd;
unsigned int i, lastsep; unsigned int i, lastsep;
bool open; pid_t pid;
} info; } info;
struct { struct {
@ -213,24 +213,27 @@ bool check_timeouts(struct timeval *t)
return tmin > 0; return tmin > 0;
} }
void close_info(void)
{
if (info.fd != -1) {
kill(info.pid, SIGTERM);
close(info.fd);
info.fd = -1;
waitpid(info.pid, NULL, WNOHANG);
}
}
void open_info(void) void open_info(void)
{ {
static pid_t pid;
int pfd[2]; int pfd[2];
char w[12], h[12]; char w[12], h[12];
if (info.f.err != 0 || info.open || win.bar.h == 0) if (info.f.err != 0 || info.fd >= 0 || win.bar.h == 0)
return; return;
if (info.fd != -1) {
close(info.fd);
kill(pid, SIGTERM);
info.fd = -1;
}
win.bar.l.buf[0] = '\0'; win.bar.l.buf[0] = '\0';
if (pipe(pfd) < 0) if (pipe(pfd) < 0)
return; return;
if ((pid = fork()) == 0) { if ((info.pid = fork()) == 0) {
close(pfd[0]); close(pfd[0]);
dup2(pfd[1], 1); dup2(pfd[1], 1);
snprintf(w, sizeof(w), "%d", img.w); snprintf(w, sizeof(w), "%d", img.w);
@ -239,13 +242,12 @@ void open_info(void)
error(EXIT_FAILURE, errno, "exec: %s", info.f.cmd); error(EXIT_FAILURE, errno, "exec: %s", info.f.cmd);
} }
close(pfd[1]); close(pfd[1]);
if (pid < 0) { if (info.pid < 0) {
close(pfd[0]); close(pfd[0]);
} else { } else {
fcntl(pfd[0], F_SETFL, O_NONBLOCK); fcntl(pfd[0], F_SETFL, O_NONBLOCK);
info.fd = pfd[0]; info.fd = pfd[0];
info.i = info.lastsep = 0; info.i = info.lastsep = 0;
info.open = true;
} }
} }
@ -278,9 +280,7 @@ end:
info.i -= info.lastsep; info.i -= info.lastsep;
win.bar.l.buf[info.i] = '\0'; win.bar.l.buf[info.i] = '\0';
win_draw(&win); win_draw(&win);
close(info.fd); close_info();
info.fd = -1;
while (waitpid(-1, NULL, WNOHANG) > 0);
} }
void load_image(int new) void load_image(int new)
@ -309,7 +309,7 @@ void load_image(int new)
files[new].flags &= ~FF_WARN; files[new].flags &= ~FF_WARN;
fileidx = current = new; fileidx = current = new;
info.open = false; close_info();
open_info(); open_info();
arl_setup(&arl, files[fileidx].path); arl_setup(&arl, files[fileidx].path);
@ -495,6 +495,7 @@ void run_key_handler(const char *key, unsigned int mask)
} }
oldst = emalloc(fcnt * sizeof(*oldst)); oldst = emalloc(fcnt * sizeof(*oldst));
close_info();
strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size); strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size);
win_draw(&win); win_draw(&win);
win_set_cursor(&win, CURSOR_WATCH); win_set_cursor(&win, CURSOR_WATCH);
@ -551,8 +552,7 @@ end:
if (changed) { if (changed) {
img_close(&img, true); img_close(&img, true);
load_image(fileidx); load_image(fileidx);
} else if (info.f.err == 0) { } else {
info.open = false;
open_info(); open_info();
} }
} }