circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 896:

Browse Source 
When mode-mouse is on (it is off by default), automatically enter copy
mode when the mouse is dragged or the mouse wheel is used. Also exit
copy mode when the mouse wheel is scrolled off the bottom. Discussed
with and written by hsim at gmx dot li.
This commit is contained in:
Tiago Cunha
2011-04-25 20:33:42 +00:00
parent d5150484d1
commit 215ee46106
5 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
window-copy.c
View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.128 2011-04-06 22:18:56 nicm Exp $ */
/* $Id: window-copy.c,v 1.129 2011-04-25 20:33:42 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -760,11 +760,11 @@ window_copy_key_numeric_prefix(struct window_pane *wp, int key)
/* ARGSUSED */
void
window_copy_mouse(
struct window_pane *wp, unused struct session *sess, struct mouse_event *m)
struct window_pane *wp, struct session *sess, struct mouse_event *m)
{
struct window_copy_mode_data *data = wp->modedata;
struct screen *s = &data->screen;
u_int i;
u_int i, old_cy;
if (m->x >= screen_size_x(s))
return;
@ -777,8 +777,11 @@ window_copy_mouse(
for (i = 0; i < 5; i++)
window_copy_cursor_up(wp, 0);
} else if ((m->b & MOUSE_BUTTON) == MOUSE_2) {
old_cy = data->cy;
for (i = 0; i < 5; i++)
window_copy_cursor_down(wp, 0);
if (old_cy == data->cy)
goto reset_mode;
}
return;
}
@ -792,15 +795,9 @@ window_copy_mouse(
window_copy_update_cursor(wp, m->x, m->y);
if (window_copy_update_selection(wp))
window_copy_redraw_screen(wp);
} else {
s->mode &= ~MODE_MOUSE_ANY;
s->mode |= MODE_MOUSE_STANDARD;
if (sess != NULL) {
window_copy_copy_selection(wp);
window_pane_reset_mode(wp);
}
return;
}
return;
goto reset_mode;
}
/* Otherwise if other buttons pressed, start selection and motion. */
@ -812,6 +809,16 @@ window_copy_mouse(
window_copy_start_selection(wp);
window_copy_redraw_screen(wp);
}
return;
reset_mode:
s->mode &= ~MODE_MOUSE_ANY;
s->mode |= MODE_MOUSE_STANDARD;
if (sess != NULL) {
window_copy_copy_selection(wp);
window_pane_reset_mode(wp);
}
}
void