circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 10:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-07-07 18:01:15 +01:00
commit 05062e7d2d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
format.c
View File

@ -1409,6 +1409,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_id", "%%%u", wp->id); 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 == wp->window->active);
format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF)); format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
format_add(ft, "pane_pipe", "%d", wp->pipe_fd != -1);
status = wp->status; status = wp->status;
if (wp->fd == -1 && WIFEXITED(status)) if (wp->fd == -1 && WIFEXITED(status))

1
tmux.1
View File

@ -3601,6 +3601,7 @@ The following variables are available, where appropriate:
.It Li "pane_left" Ta "" Ta "Left of pane" .It Li "pane_left" Ta "" Ta "Left of pane"
.It Li "pane_mode" Ta "" Ta "Name of pane mode, if any." .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any."
.It Li "pane_pid" Ta "" Ta "PID of first process in pane" .It Li "pane_pid" Ta "" Ta "PID of first process in pane"
.It Li "pane_pipe" Ta "" Ta "1 if pane is being piped"
.It Li "pane_right" Ta "" Ta "Right of pane" .It Li "pane_right" Ta "" Ta "Right of pane"
.It Li "pane_search_string" Ta "" Ta "Last search string in copy mode" .It Li "pane_search_string" Ta "" Ta "Last search string in copy mode"
.It Li "pane_start_command" Ta "" Ta "Command pane started with" .It Li "pane_start_command" Ta "" Ta "Command pane started with"

4
window-tree.c
View File

@ -512,7 +512,7 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
else else
offset = (i * each); offset = (i * each);
if (loop == end - 1) if (loop == end - 1)
width = each - 1 + remaining; width = each + remaining;
else else
width = each - 1; width = each - 1;
@ -638,7 +638,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
else else
offset = (i * each); offset = (i * each);
if (loop == end - 1) if (loop == end - 1)
width = each - 1 + remaining; width = each + remaining;
else else
width = each - 1; width = each - 1;