diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-11-16 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-11-16 12:01:11 +0000 |
| commit | 06fd3b00ff23566dd683abe4f3d7d1581a4fe8b8 (patch) | |
| tree | dd6e4b84e8c691434b87030e4a7218c208dea698 | |
| parent | 0f5b7814b549a2c3159e9b23b0e1e0e9cbb99103 (diff) | |
| parent | 81f1d625af785b83028ecfcc68cda47c7529c8a8 (diff) | |
| download | rtmux-06fd3b00ff23566dd683abe4f3d7d1581a4fe8b8.tar.gz rtmux-06fd3b00ff23566dd683abe4f3d7d1581a4fe8b8.tar.bz2 rtmux-06fd3b00ff23566dd683abe4f3d7d1581a4fe8b8.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-new-session.c | 4 | ||||
| -rw-r--r-- | server-client.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 1de2eb69..8e5520c6 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -105,8 +105,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) if (args_has(args, 'A')) { /* * This item is now destined for - * attach-session. Because attach-session - * will have already been prepared, copy this + * attach-session. Because attach-session will + * have already been prepared, copy this * session into its tflag so it can be used. */ cmd_find_from_session(&item->state.tflag, as); diff --git a/server-client.c b/server-client.c index 471cec2c..ea63a979 100644 --- a/server-client.c +++ b/server-client.c @@ -326,7 +326,7 @@ server_client_check_mouse(struct client *c) type = WHEEL; x = m->x, y = m->y, b = m->b; log_debug("wheel at %u,%u", x, y); - } else if (MOUSE_BUTTONS(m->b) == 3) { + } else if (MOUSE_RELEASE(m->b)) { type = UP; x = m->x, y = m->y, b = m->lb; log_debug("up at %u,%u", x, y); @@ -421,7 +421,7 @@ have_event: m->wp = -1; /* Stop dragging if needed. */ - if (type != DRAG && c->tty.mouse_drag_flag) { + if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag) { if (c->tty.mouse_drag_release != NULL) c->tty.mouse_drag_release(c, m); |