diff options
| author | nicm <nicm> | 2019-05-03 18:42:40 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2019-05-03 18:42:40 +0000 |
| commit | 4097257beffc100d1eb0948d1390cea952e5fe4a (patch) | |
| tree | 841810620623c7db4054370430bafc5241dd074e | |
| parent | 84e46525136481ba5bd60e73ae2fffdf74c0417c (diff) | |
Do not store the mouse position we calculate as the start of a drag back
into the mouse event that later code uses, it has been adjusted and they
should use the original position. GitHub issue 1710.
| -rw-r--r-- | cmd-resize-pane.c | 2 | ||||
| -rw-r--r-- | cmd.c | 4 | ||||
| -rw-r--r-- | server-client.c | 4 | ||||
| -rw-r--r-- | window-copy.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index 410a6257..c978edfb 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -143,7 +143,7 @@ cmd_resize_pane_mouse_update(struct client *c, struct mouse_event *m) } w = wl->window; - y = m->y; x = m->x; + y = m->y + m->oy; x = m->x + m->ox; if (m->statusat == 0 && y > 0) y--; else if (m->statusat > 0 && y >= (u_int)m->statusat) @@ -484,8 +484,8 @@ cmd_mouse_at(struct window_pane *wp, struct mouse_event *m, u_int *xp, x = m->lx + m->ox; y = m->ly + m->oy; } else { - x = m->x; - y = m->y; + x = m->x + m->ox; + y = m->y + m->oy; } log_debug("%s: x=%u, y=%u%s", __func__, x, y, last ? " (last)" : ""); diff --git a/server-client.c b/server-client.c index f25e372e..78e12b19 100644 --- a/server-client.c +++ b/server-client.c @@ -448,6 +448,8 @@ server_client_check_mouse(struct client *c, struct key_event *event) type = DRAG; if (c->tty.mouse_drag_flag) { x = m->x, y = m->y, b = m->b; + if (x == m->lx && y == m->ly) + return (KEYC_UNKNOWN); log_debug("drag update at %u,%u", x, y); } else { x = m->lx, y = m->ly, b = m->lb; @@ -555,8 +557,6 @@ have_event: return (KEYC_UNKNOWN); px = px + m->ox; py = py + m->oy; - m->x = x + m->ox; - m->y = y + m->oy; /* Try the pane borders if not zoomed. */ if (~s->curw->window->flags & WINDOW_ZOOMED) { diff --git a/window-copy.c b/window-copy.c index f8569d79..4ff6b9dd 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3505,6 +3505,8 @@ window_copy_start_drag(struct client *c, struct mouse_event *m) window_copy_update_cursor(wme, x, y); window_copy_start_selection(wme); window_copy_redraw_screen(wme); + + window_copy_drag_update(c, m); } static void |