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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-08-18 19:02:39 +01:00
parent af679326b2 3bc08b0dc0
commit 522d751eee
5 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
format.c
View File

@@ -1463,12 +1463,13 @@ format_defaults_winlink(struct format_tree *ft, struct winlink *wl)
void
format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
{
struct window *w = wp->window;
struct grid *gd = wp->base.grid;
int status = wp->status;
u_int idx;
if (ft->w == NULL)
ft->w = wp->window;
ft->w = w;
ft->wp = wp;
format_add(ft, "history_size", "%u", gd->hsize);
@@ -1483,7 +1484,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_height", "%u", wp->sy);
format_add(ft, "pane_title", "%s", wp->base.title);
format_add(ft, "pane_id", "%%%u", wp->id);
format_add(ft, "pane_active", "%d", wp == wp->window->active);
format_add(ft, "pane_active", "%d", wp == w->active);
format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
format_add(ft, "pane_pipe", "%d", wp->pipe_fd != -1);
@@ -1499,9 +1500,9 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
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);
wp->xoff + wp->sx == w->sx);
format_add(ft, "pane_at_bottom", "%d",
wp->yoff + wp->sy == wp->window->sy);
wp->yoff + wp->sy == w->sy);
}
format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);
@@ -1509,7 +1510,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_mode", "%s", wp->mode->name);
format_add(ft, "pane_synchronized", "%d",
!!options_get_number(wp->window->options, "synchronize-panes"));
!!options_get_number(w->options, "synchronize-panes"));
if (wp->searchstr != NULL)
format_add(ft, "pane_search_string", "%s", wp->searchstr);