diff options
| -rw-r--r-- | usr.bin/tmux/cmd-find.c | 10 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd.c | 19 |
2 files changed, 19 insertions, 10 deletions
diff --git a/usr.bin/tmux/cmd-find.c b/usr.bin/tmux/cmd-find.c index f2ee855c07a..bdf14540efd 100644 --- a/usr.bin/tmux/cmd-find.c +++ b/usr.bin/tmux/cmd-find.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-find.c,v 1.71 2019/03/15 15:20:00 nicm Exp $ */ +/* $OpenBSD: cmd-find.c,v 1.72 2019/05/08 18:05:03 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1040,12 +1040,16 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item, switch (type) { case CMD_FIND_PANE: fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl); - if (fs->wp != NULL) + if (fs->wp != NULL) { fs->w = fs->wl->window; - break; + break; + } + /* FALLTHROUGH */ case CMD_FIND_WINDOW: case CMD_FIND_SESSION: fs->wl = cmd_mouse_window(m, &fs->s); + if (fs->wl == NULL && fs->s != NULL) + fs->wl = fs->s->curw; if (fs->wl != NULL) { fs->w = fs->wl->window; fs->wp = fs->w->active; diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c index 54f1c86a87a..abb2e9a2917 100644 --- a/usr.bin/tmux/cmd.c +++ b/usr.bin/tmux/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.146 2019/05/03 18:42:40 nicm Exp $ */ +/* $OpenBSD: cmd.c,v 1.147 2019/05/08 18:05:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -510,17 +510,22 @@ cmd_mouse_window(struct mouse_event *m, struct session **sp) { struct session *s; struct window *w; + struct winlink *wl; - if (!m->valid || m->s == -1 || m->w == -1) + if (!m->valid) return (NULL); - if ((s = session_find_by_id(m->s)) == NULL) + if (m->s == -1 || (s = session_find_by_id(m->s)) == NULL) return (NULL); - if ((w = window_find_by_id(m->w)) == NULL) - return (NULL); - + if (m->w == -1) + wl = s->curw; + else { + if ((w = window_find_by_id(m->w)) == NULL) + return (NULL); + wl = winlink_find_by_window(&s->windows, w); + } if (sp != NULL) *sp = s; - return (winlink_find_by_window(&s->windows, w)); + return (wl); } /* Get current mouse pane if any. */ |