circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 02:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-11-16 12:01:11 +00:00
commit 06fd3b00ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-new-session.c
View File

@ -105,8 +105,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'A')) { if (args_has(args, 'A')) {
/* /*
* This item is now destined for * This item is now destined for
* attach-session. Because attach-session * attach-session. Because attach-session will
* will have already been prepared, copy this * have already been prepared, copy this
* session into its tflag so it can be used. * session into its tflag so it can be used.
*/ */
cmd_find_from_session(&item->state.tflag, as); cmd_find_from_session(&item->state.tflag, as);

4
server-client.c
View File

@ -326,7 +326,7 @@ server_client_check_mouse(struct client *c)
type = WHEEL; type = WHEEL;
x = m->x, y = m->y, b = m->b; x = m->x, y = m->y, b = m->b;
log_debug("wheel at %u,%u", x, y); log_debug("wheel at %u,%u", x, y);
} else if (MOUSE_BUTTONS(m->b) == 3) { } else if (MOUSE_RELEASE(m->b)) {
type = UP; type = UP;
x = m->x, y = m->y, b = m->lb; x = m->x, y = m->y, b = m->lb;
log_debug("up at %u,%u", x, y); log_debug("up at %u,%u", x, y);
@ -421,7 +421,7 @@ have_event:
m->wp = -1; m->wp = -1;
/* Stop dragging if needed. */ /* 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) if (c->tty.mouse_drag_release != NULL)
c->tty.mouse_drag_release(c, m); c->tty.mouse_drag_release(c, m);