diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2019-05-08 18:05:04 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2019-05-08 18:05:04 +0000 |
| commit | bae7cc96081431691d54e0b15a540ffb4cae5d29 (patch) | |
| tree | 294cb8856601c53f819be4df6f5d2add7f12d5d2 /usr.bin/tmux/cmd.c | |
| parent | c9f9e059ab026b9dc5a123923ac387486e5c17cd (diff) | |
Adjust how mouse targets are found so they always have a session, window
and pane.
Diffstat (limited to 'usr.bin/tmux/cmd.c')
| -rw-r--r-- | usr.bin/tmux/cmd.c | 19 |
1 files changed, 12 insertions, 7 deletions
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. */ |