summaryrefslogtreecommitdiffstats
path: root/cmd-send-keys.c
diff options
context:
space:
mode:
authornicm <nicm>2015-04-19 21:34:21 +0000
committernicm <nicm>2015-04-19 21:34:21 +0000
commitbf635e7741f7b881f67ec7e4a5caa02f7ff3d786 (patch)
treec2da2accbb948824e54043a1539b2e3ca9187168 /cmd-send-keys.c
parentee123c248951450100475717f5bd45f292d9bb4d (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 'cmd-send-keys.c')
-rw-r--r--cmd-send-keys.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index 7a4d97d5..27da410d 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -31,8 +31,8 @@ enum cmd_retval cmd_send_keys_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_send_keys_entry = {
"send-keys", "send",
- "lRt:", 0, -1,
- "[-lR] " CMD_TARGET_PANE_USAGE " key ...",
+ "lRMt:", 0, -1,
+ "[-lRM] " CMD_TARGET_PANE_USAGE " key ...",
0,
cmd_send_keys_exec
};
@@ -49,12 +49,23 @@ enum cmd_retval
cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
+ struct mouse_event *m = &cmdq->item->mouse;
struct window_pane *wp;
struct session *s;
struct input_ctx *ictx;
const u_char *str;
int i, key;
+ if (args_has(args, 'M')) {
+ wp = cmd_mouse_pane(m, &s, NULL);
+ if (wp == NULL) {
+ cmdq_error(cmdq, "no mouse target");
+ return (CMD_RETURN_ERROR);
+ }
+ window_pane_key(wp, NULL, s, m->key, m);
+ return (CMD_RETURN_NORMAL);
+ }
+
if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
return (CMD_RETURN_ERROR);
@@ -63,7 +74,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
key = options_get_number(&s->options, "prefix2");
else
key = options_get_number(&s->options, "prefix");
- window_pane_key(wp, s, key);
+ window_pane_key(wp, NULL, s, key, NULL);
return (CMD_RETURN_NORMAL);
}
@@ -88,10 +99,10 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
if (!args_has(args, 'l') &&
(key = key_string_lookup_string(str)) != KEYC_NONE) {
- window_pane_key(wp, s, key);
+ window_pane_key(wp, NULL, s, key, NULL);
} else {
for (; *str != '\0'; str++)
- window_pane_key(wp, s, *str);
+ window_pane_key(wp, NULL, s, *str, NULL);
}
}