diff options
| author |   nicm <nicm@openbsd.org> | 2020-03-16 06:12:42 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-03-16 06:12:42 +0000 |
| commit | 13e036e45a77e589ceff39ff7e8a1b5c5909a310 (patch) | |
| tree | 6f63acfb01b6913c339d67974c607c69e7f7f1c6 /usr.bin/tmux/server-client.c | |
| parent | spkr(4): fix compilation under SPKRDEBUG (diff) | |
| download | wireguard-openbsd-13e036e45a77e589ceff39ff7e8a1b5c5909a310.tar.xz wireguard-openbsd-13e036e45a77e589ceff39ff7e8a1b5c5909a310.zip | |
Send mouse down event immediately rather than waiting for double click
to finish which would now mean it was out of order. Reported by Mark
Kelly.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 0af65b60ac5..c33be44fa0b 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.306 2020/03/12 13:16:16 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.307 2020/03/16 06:12:42 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -419,6 +419,7 @@ server_client_check_mouse(struct client *c, struct key_event *event) struct winlink *wl; struct window_pane *wp; u_int x, y, b, sx, sy, px, py; + int ignore = 0; key_code key; struct timeval tv; struct style_range *sr; @@ -445,6 +446,7 @@ server_client_check_mouse(struct client *c, struct key_event *event) if (event->key == KEYC_DOUBLECLICK) { type = DOUBLE; x = m->x, y = m->y, b = m->b; + ignore = 1; log_debug("double-click at %u,%u", x, y); } else if ((m->sgr_type != ' ' && MOUSE_DRAG(m->sgr_b) && @@ -491,16 +493,17 @@ server_client_check_mouse(struct client *c, struct key_event *event) type = TRIPLE; x = m->x, y = m->y, b = m->b; log_debug("triple-click at %u,%u", x, y); + ignore = 1; goto have_event; } - } + } else + c->flags |= CLIENT_DOUBLECLICK; + add_timer: type = DOWN; x = m->x, y = m->y, b = m->b; log_debug("down at %u,%u", x, y); - c->flags |= CLIENT_DOUBLECLICK; - add_timer: if (KEYC_CLICK_TIMEOUT != 0) { memcpy(&c->click_event, m, sizeof c->click_event); c->click_button = m->b; @@ -519,6 +522,7 @@ have_event: /* Save the session. */ m->s = s->id; m->w = -1; + m->ignore = ignore; /* Is this on the status line? */ m->statusat = status_at_line(c); |