circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server-fn.c
This commit is contained in:
Thomas Adam
2017-10-20 12:36:29 +01:00
parent a34de2e378 2f6935a630
commit 31901e3c07
10 changed files with 158 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
format.c
View File

@ -1392,8 +1392,8 @@ void
format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
{
struct grid *gd = wp->base.grid;
int status = wp->status;
u_int idx;
int status;
if (ft->w == NULL)
ft->w = wp->window;
@ -1415,8 +1415,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
format_add(ft, "pane_pipe", "%d", wp->pipe_fd != -1);
status = wp->status;
if (wp->fd == -1 && WIFEXITED(status))
if ((wp->flags & PANE_STATUSREADY) && WIFEXITED(status))
format_add(ft, "pane_dead_status", "%d", WEXITSTATUS(status));
format_add(ft, "pane_dead", "%d", wp->fd == -1);
@ -1427,8 +1426,10 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_bottom", "%u", wp->yoff + wp->sy - 1);
format_add(ft, "pane_at_left", "%d", wp->xoff == 0);
format_add(ft, "pane_at_top", "%d", wp->yoff == 0);
format_add(ft, "pane_at_right", "%d", wp->xoff + wp->sx == wp->window->sx);
format_add(ft, "pane_at_bottom", "%d", wp->yoff + wp->sy == wp->window->sy);
format_add(ft, "pane_at_right", "%d",
wp->xoff + wp->sx == wp->window->sx);
format_add(ft, "pane_at_bottom", "%d",
wp->yoff + wp->sy == wp->window->sy);
}
format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);