mirror of https://github.com/tmux/tmux.git
Change how double and triple clicks works so that one or the other is
fired - a double click is no longer triggered on the way to a triple click.
This commit is contained in:
parent
b8b48e2e37
commit
f7bc753442
|
@ -419,7 +419,6 @@ server_client_check_mouse(struct client *c, struct key_event *event)
|
||||||
struct winlink *wl;
|
struct winlink *wl;
|
||||||
struct window_pane *wp;
|
struct window_pane *wp;
|
||||||
u_int x, y, b, sx, sy, px, py;
|
u_int x, y, b, sx, sy, px, py;
|
||||||
int flag;
|
|
||||||
key_code key;
|
key_code key;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
struct style_range *sr;
|
struct style_range *sr;
|
||||||
|
@ -443,7 +442,11 @@ server_client_check_mouse(struct client *c, struct key_event *event)
|
||||||
m->x, m->y, m->lx, m->ly, c->tty.mouse_drag_flag);
|
m->x, m->y, m->lx, m->ly, c->tty.mouse_drag_flag);
|
||||||
|
|
||||||
/* What type of event is this? */
|
/* What type of event is this? */
|
||||||
if ((m->sgr_type != ' ' &&
|
if (event->key == KEYC_DOUBLECLICK) {
|
||||||
|
type = DOUBLE;
|
||||||
|
x = m->x, y = m->y, b = m->b;
|
||||||
|
log_debug("double-click at %u,%u", x, y);
|
||||||
|
} else if ((m->sgr_type != ' ' &&
|
||||||
MOUSE_DRAG(m->sgr_b) &&
|
MOUSE_DRAG(m->sgr_b) &&
|
||||||
MOUSE_BUTTONS(m->sgr_b) == 3) ||
|
MOUSE_BUTTONS(m->sgr_b) == 3) ||
|
||||||
(m->sgr_type == ' ' &&
|
(m->sgr_type == ' ' &&
|
||||||
|
@ -477,10 +480,8 @@ server_client_check_mouse(struct client *c, struct key_event *event)
|
||||||
evtimer_del(&c->click_timer);
|
evtimer_del(&c->click_timer);
|
||||||
c->flags &= ~CLIENT_DOUBLECLICK;
|
c->flags &= ~CLIENT_DOUBLECLICK;
|
||||||
if (m->b == c->click_button) {
|
if (m->b == c->click_button) {
|
||||||
type = DOUBLE;
|
type = NOTYPE;
|
||||||
x = m->x, y = m->y, b = m->b;
|
c->flags |= CLIENT_TRIPLECLICK;
|
||||||
log_debug("double-click at %u,%u", x, y);
|
|
||||||
flag = CLIENT_TRIPLECLICK;
|
|
||||||
goto add_timer;
|
goto add_timer;
|
||||||
}
|
}
|
||||||
} else if (c->flags & CLIENT_TRIPLECLICK) {
|
} else if (c->flags & CLIENT_TRIPLECLICK) {
|
||||||
|
@ -497,11 +498,11 @@ server_client_check_mouse(struct client *c, struct key_event *event)
|
||||||
type = DOWN;
|
type = DOWN;
|
||||||
x = m->x, y = m->y, b = m->b;
|
x = m->x, y = m->y, b = m->b;
|
||||||
log_debug("down at %u,%u", x, y);
|
log_debug("down at %u,%u", x, y);
|
||||||
flag = CLIENT_DOUBLECLICK;
|
c->flags |= CLIENT_DOUBLECLICK;
|
||||||
|
|
||||||
add_timer:
|
add_timer:
|
||||||
if (KEYC_CLICK_TIMEOUT != 0) {
|
if (KEYC_CLICK_TIMEOUT != 0) {
|
||||||
c->flags |= flag;
|
memcpy(&c->click_event, m, sizeof c->click_event);
|
||||||
c->click_button = m->b;
|
c->click_button = m->b;
|
||||||
|
|
||||||
tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000;
|
tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000;
|
||||||
|
@ -1047,7 +1048,7 @@ server_client_key_callback(struct cmdq_item *item, void *data)
|
||||||
|
|
||||||
/* Check for mouse keys. */
|
/* Check for mouse keys. */
|
||||||
m->valid = 0;
|
m->valid = 0;
|
||||||
if (key == KEYC_MOUSE) {
|
if (key == KEYC_MOUSE || key == KEYC_DOUBLECLICK) {
|
||||||
if (c->flags & CLIENT_READONLY)
|
if (c->flags & CLIENT_READONLY)
|
||||||
goto out;
|
goto out;
|
||||||
key = server_client_check_mouse(c, event);
|
key = server_client_check_mouse(c, event);
|
||||||
|
@ -1549,8 +1550,22 @@ server_client_repeat_timer(__unused int fd, __unused short events, void *data)
|
||||||
static void
|
static void
|
||||||
server_client_click_timer(__unused int fd, __unused short events, void *data)
|
server_client_click_timer(__unused int fd, __unused short events, void *data)
|
||||||
{
|
{
|
||||||
struct client *c = data;
|
struct client *c = data;
|
||||||
|
struct key_event *event;
|
||||||
|
|
||||||
|
log_debug("click timer expired");
|
||||||
|
|
||||||
|
if (c->flags & CLIENT_TRIPLECLICK) {
|
||||||
|
/*
|
||||||
|
* Waiting for a third click that hasn't happened, so this must
|
||||||
|
* have been a double click.
|
||||||
|
*/
|
||||||
|
event = xmalloc(sizeof *event);
|
||||||
|
event->key = KEYC_DOUBLECLICK;
|
||||||
|
memcpy(&event->m, &c->click_event, sizeof event->m);
|
||||||
|
if (!server_client_handle_key(c, event))
|
||||||
|
free(event);
|
||||||
|
}
|
||||||
c->flags &= ~(CLIENT_DOUBLECLICK|CLIENT_TRIPLECLICK);
|
c->flags &= ~(CLIENT_DOUBLECLICK|CLIENT_TRIPLECLICK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
tmux.h
2
tmux.h
|
@ -166,6 +166,7 @@ enum {
|
||||||
/* Mouse keys. */
|
/* Mouse keys. */
|
||||||
KEYC_MOUSE, /* unclassified mouse event */
|
KEYC_MOUSE, /* unclassified mouse event */
|
||||||
KEYC_DRAGGING, /* dragging in progress */
|
KEYC_DRAGGING, /* dragging in progress */
|
||||||
|
KEYC_DOUBLECLICK, /* double click complete */
|
||||||
KEYC_MOUSE_KEY(MOUSEMOVE),
|
KEYC_MOUSE_KEY(MOUSEMOVE),
|
||||||
KEYC_MOUSE_KEY(MOUSEDOWN1),
|
KEYC_MOUSE_KEY(MOUSEDOWN1),
|
||||||
KEYC_MOUSE_KEY(MOUSEDOWN2),
|
KEYC_MOUSE_KEY(MOUSEDOWN2),
|
||||||
|
@ -1547,6 +1548,7 @@ struct client {
|
||||||
|
|
||||||
struct event click_timer;
|
struct event click_timer;
|
||||||
u_int click_button;
|
u_int click_button;
|
||||||
|
struct mouse_event click_event;
|
||||||
|
|
||||||
struct status_line status;
|
struct status_line status;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue