circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

The stored mouse position should not include the status line offset if any.

Browse Source
This commit is contained in:
Nicholas Marriott
2018-08-21 09:07:25 +01:00
parent f36d2ecb07
commit 314ee137a9
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server-client.c
View File

@ -410,7 +410,7 @@ server_client_check_mouse(struct client *c)
struct mouse_event *m = &c->tty.mouse; struct mouse_event *m = &c->tty.mouse;
struct window *w; struct window *w;
struct window_pane *wp; struct window_pane *wp;
u_int x, y, b, sx, sy; u_int x, y, b, sx, sy, px, py;
int flag; int flag;
key_code key; key_code key;
struct timeval tv; struct timeval tv;
@ -510,40 +510,46 @@ have_event:
/* Not on status line. Adjust position and check for border or pane. */ /* Not on status line. Adjust position and check for border or pane. */
if (where == NOWHERE) { if (where == NOWHERE) {
px = x;
if (m->statusat == 0 && y > 0) if (m->statusat == 0 && y > 0)
y--; py = y - 1;
else if (m->statusat > 0 && y >= (u_int)m->statusat) else if (m->statusat > 0 && y >= (u_int)m->statusat)
y = m->statusat - 1; py = m->statusat - 1;
else
py = y;
tty_window_offset(&c->tty, &m->ox, &m->oy, &sx, &sy); tty_window_offset(&c->tty, &m->ox, &m->oy, &sx, &sy);
log_debug("mouse window @%u at %u,%u (%ux%u)", log_debug("mouse window @%u at %u,%u (%ux%u)",
s->curw->window->id, m->ox, m->oy, sx, sy); s->curw->window->id, m->ox, m->oy, sx, sy);
if (x > sx || y > sy) if (px > sx || py > sy)
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
x = m->x = x + m->ox; px = px + m->ox;
y = m->y = y + m->oy; py = py + m->oy;
m->x = x + m->ox;
m->y = y + m->oy;
TAILQ_FOREACH(wp, &s->curw->window->panes, entry) { TAILQ_FOREACH(wp, &s->curw->window->panes, entry) {
if ((wp->xoff + wp->sx == x && if ((wp->xoff + wp->sx == px &&
wp->yoff <= 1 + y && wp->yoff <= 1 + py &&
wp->yoff + wp->sy >= y) || wp->yoff + wp->sy >= py) ||
(wp->yoff + wp->sy == y && (wp->yoff + wp->sy == py &&
wp->xoff <= 1 + x && wp->xoff <= 1 + px &&
wp->xoff + wp->sx >= x)) wp->xoff + wp->sx >= px))
break; break;
} }
if (wp != NULL) if (wp != NULL)
where = BORDER; where = BORDER;
else { else {
wp = window_get_active_at(s->curw->window, x, y); wp = window_get_active_at(s->curw->window, px, py);
if (wp != NULL) { if (wp != NULL)
where = PANE; where = PANE;
log_debug("mouse at %u,%u is on pane %%%u",
x, y, wp->id);
}
} }
if (where == NOWHERE) if (where == NOWHERE)
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
if (where == PANE)
log_debug("mouse %u,%u on pane %%%u", px, py, wp->id);
else if (where == BORDER)
log_debug("mouse on pane %%%u border", wp->id);
m->wp = wp->id; m->wp = wp->id;
m->w = wp->window->id; m->w = wp->window->id;
} else } else