Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-11-27 12:01:08 +00:00
commit f0c68533c4
2 changed files with 15 additions and 18 deletions

View File

@ -264,16 +264,9 @@ skip:
} }
static int static int
default_window_size_skip_client(struct client *loop, int type, default_window_size_skip_client(struct client *loop, __unused int type,
__unused int current, struct session *s, struct window *w) __unused int current, struct session *s, struct window *w)
{ {
/*
* Latest checks separately, so do not check here. Otherwise only
* include clients where the session contains the window or where the
* session is the given session.
*/
if (type == WINDOW_SIZE_LATEST)
return (0);
if (w != NULL && !session_has(loop->session, w)) if (w != NULL && !session_has(loop->session, w))
return (1); return (1);
if (w == NULL && loop->session != s) if (w == NULL && loop->session != s)

View File

@ -880,7 +880,11 @@ have_event:
m->wp = -1; m->wp = -1;
/* Stop dragging if needed. */ /* Stop dragging if needed. */
if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag != 0) { if (type != DRAG &&
type != WHEEL &&
type != DOUBLE &&
type != TRIPLE &&
c->tty.mouse_drag_flag != 0) {
if (c->tty.mouse_drag_release != NULL) if (c->tty.mouse_drag_release != NULL)
c->tty.mouse_drag_release(c, m); c->tty.mouse_drag_release(c, m);