circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-10-31 22:58:49 +00:00
Code Issues Projects Releases Wiki Activity

We changed somewhat recently to us the pty when tmux was run inside

Browse Source 
itself to work out the current pane. This is confusing in many cases
(particularly notable is that "tmux neww\; splitw" would not split the
new window), and the few advantages do not make up for the confusion.

So drop this behaviour and return to using the current window and pane;
keep the pty check but only use it to limit the list of possible current
sessions.
This commit is contained in:
nicm 2015-12-15 00:45:02 +00:00
parent 56d097cfe0
commit 6f417ec943
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd-find.c
View File

@ -249,7 +249,11 @@ cmd_find_current_session_with_client(struct cmd_find_state *fs)
{
struct window_pane *wp;
/* If this is running in a pane, that's great. */
/*
* If this is running in a pane, we can use that to limit the list of
* sessions to those containing that pane (we still use the current
* window in the best session).
*/
if (fs->cmdq->client->tty.path != NULL) {
RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
if (strcmp(wp->tty, fs->cmdq->client->tty.path) == 0)
@ -262,11 +266,8 @@ cmd_find_current_session_with_client(struct cmd_find_state *fs)
if (wp == NULL)
goto unknown_pane;
/* We now know the window and pane. */
/* Find the best session and winlink containing this pane. */
fs->w = wp->window;
fs->wp = wp;
/* Find the best session and winlink. */
if (cmd_find_best_session_with_window(fs) != 0) {
if (wp != NULL) {
/*
@ -278,6 +279,13 @@ cmd_find_current_session_with_client(struct cmd_find_state *fs)
}
return (-1);
}
/* Use the current window and pane from this session. */
fs->wl = fs->s->curw;
fs->idx = fs->wl->idx;
fs->w = fs->wl->window;
fs->wp = fs->w->active;
return (0);
unknown_pane:
@ -290,6 +298,7 @@ unknown_pane:
fs->idx = fs->wl->idx;
fs->w = fs->wl->window;
fs->wp = fs->w->active;
return (0);
}