circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Show exit status and time in the remain-on-exit pane text, mostly from

Browse Source 
Timo Boettcher in GitHub issue 1103.
This commit is contained in:
nicm
2017-10-12 11:32:27 +00:00
parent eb9839fd32
commit a5fd5782f8
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server-fn.c
View File

@ -18,6 +18,7 @@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/wait.h>
#include <sys/uio.h>
#include <imsg.h>
@ -278,11 +279,11 @@ void
server_destroy_pane(struct window_pane *wp, int notify)
{
struct window *w = wp->window;
int old_fd;
struct screen_write_ctx ctx;
struct grid_cell gc;
time_t t;
char tim[26];
old_fd = wp->fd;
if (wp->fd != -1) {
bufferevent_free(wp->event);
close(wp->fd);
@ -290,9 +291,13 @@ server_destroy_pane(struct window_pane *wp, int notify)
}
if (options_get_number(w->options, "remain-on-exit")) {
if (old_fd == -1)
if (~wp->flags & PANE_STATUSREADY)
return;
if (wp->flags & PANE_STATUSDRAWN)
return;
wp->flags |= PANE_STATUSDRAWN;
if (notify)
notify_pane("pane-died", wp);
@ -301,11 +306,24 @@ server_destroy_pane(struct window_pane *wp, int notify)
screen_write_cursormove(&ctx, 0, screen_size_y(ctx.s) - 1);
screen_write_linefeed(&ctx, 1, 8);
memcpy(&gc, &grid_default_cell, sizeof gc);
gc.attr |= GRID_ATTR_BRIGHT;
screen_write_puts(&ctx, &gc, "Pane is dead");
time(&t);
ctime_r(&t, tim);
if (WIFEXITED(wp->status)) {
screen_write_nputs(&ctx, -1, &gc,
"Pane is dead (status %d, %s)",
WEXITSTATUS(wp->status),
tim);
} else if (WIFSIGNALED(wp->status)) {
screen_write_nputs(&ctx, -1, &gc,
"Pane is dead (signal %d, %s)",
WTERMSIG(wp->status),
tim);
}
screen_write_stop(&ctx);
wp->flags |= PANE_REDRAW;
return;
}