diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-04-19 21:34:22 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-04-19 21:34:22 +0000 |
commit | 68c2616c45d126c97295bff8430d37e93eef75c4 (patch) | |
tree | c7f6701e23dd1b6e06d49cca9288192bacf0021e /usr.bin/tmux/status.c | |
parent | fb36becc81957f91d6731e0138a72f45adf221cd (diff) |
Rewrite of tmux mouse support which was a mess. Instead of having
options for "mouse-this" and "mouse-that", mouse events may be bound as
keys and there is one option "mouse" that turns on mouse support
entirely (set -g mouse on).
See the new MOUSE SUPPORT section of the man page for description of the
key names and new flags (-t= to specify the pane or window under mouse
as a target, and send-keys -M to pass through a mouse event).
The default builtin bindings for the mouse are:
bind -n MouseDown1Pane select-pane -t=; send-keys -M
bind -n MouseDown1Status select-window -t=
bind -n MouseDrag1Pane copy-mode -M
bind -n MouseDrag1Border resize-pane -M
To get the effect of turning mode-mouse off, do:
unbind -n MouseDrag1Pane
unbind -temacs-copy MouseDrag1Pane
The old mouse options are now gone, set-option -q may be used to
suppress warnings if mixing configuration files.
Diffstat (limited to 'usr.bin/tmux/status.c')
-rw-r--r-- | usr.bin/tmux/status.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index fde52a88739..b39a47c0a6a 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.124 2015/02/06 23:28:52 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.125 2015/04/19 21:34:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -118,9 +118,9 @@ status_redraw_get_right(struct client *c, time_t t, int utf8flag, return (right); } -/* Set window at window list position. */ -void -status_set_window_at(struct client *c, u_int x) +/* Get window at window list position. */ +struct window * +status_get_window_at(struct client *c, u_int x) { struct session *s = c->session; struct winlink *wl; @@ -130,12 +130,13 @@ status_set_window_at(struct client *c, u_int x) x += c->wlmouse; RB_FOREACH(wl, winlinks, &s->windows) { oo = &wl->window->options; - len = strlen(options_get_string(oo, "window-status-separator")); - if (x < wl->status_width && session_select(s, wl->idx) == 0) - server_redraw_session(s); + + if (x < wl->status_width) + return (wl->window); x -= wl->status_width + len; } + return (NULL); } /* Draw status for client on the last lines of given context. */ |