Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-link-window.c
	cmd-unlink-window.c
This commit is contained in:
Thomas Adam
2014-10-29 12:50:05 +00:00
21 changed files with 134 additions and 213 deletions

View File

@ -555,6 +555,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_id", "%%%u", wp->id);
format_add(ft, "pane_active", "%d", wp == wp->window->active);
format_add(ft, "pane_dead", "%d", wp->fd == -1);
format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
if (window_pane_visible(wp)) {
format_add(ft, "pane_left", "%u", wp->xoff);