diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-08-09 20:31:36 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-08-09 20:31:36 +0100 |
| commit | a131b82e95df990528371b1d9ca40ee2be264fc8 (patch) | |
| tree | 156ef097c276e22b60581e3058e2661327240869 /input-keys.c | |
| parent | fd3b7f357200b85a6f3d6e39bae676c7c70ba082 (diff) | |
| parent | 1ac96200a7462597b137719b376f40ad0cd85216 (diff) | |
Merge branch 'obsd-master'
Conflicts:
client.c
Diffstat (limited to 'input-keys.c')
| -rw-r--r-- | input-keys.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/input-keys.c b/input-keys.c index 7531f22d..3b72c07e 100644 --- a/input-keys.c +++ b/input-keys.c @@ -56,14 +56,14 @@ const struct input_key_ent input_keys[] = { { KEYC_F10, "\033[21~", 0 }, { KEYC_F11, "\033[23~", 0 }, { KEYC_F12, "\033[24~", 0 }, - { KEYC_F13, "\033[25~", 0 }, - { KEYC_F14, "\033[26~", 0 }, - { KEYC_F15, "\033[28~", 0 }, - { KEYC_F16, "\033[29~", 0 }, - { KEYC_F17, "\033[31~", 0 }, - { KEYC_F18, "\033[32~", 0 }, - { KEYC_F19, "\033[33~", 0 }, - { KEYC_F20, "\033[34~", 0 }, + { KEYC_F1|KEYC_SHIFT, "\033[25~", 0 }, + { KEYC_F2|KEYC_SHIFT, "\033[26~", 0 }, + { KEYC_F3|KEYC_SHIFT, "\033[28~", 0 }, + { KEYC_F4|KEYC_SHIFT, "\033[29~", 0 }, + { KEYC_F5|KEYC_SHIFT, "\033[31~", 0 }, + { KEYC_F6|KEYC_SHIFT, "\033[32~", 0 }, + { KEYC_F7|KEYC_SHIFT, "\033[33~", 0 }, + { KEYC_F8|KEYC_SHIFT, "\033[34~", 0 }, { KEYC_IC, "\033[2~", 0 }, { KEYC_DC, "\033[3~", 0 }, { KEYC_HOME, "\033[1~", 0 }, @@ -204,21 +204,6 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m) char buf[40]; size_t len; struct paste_buffer *pb; - u_int i; - - /* - * If the alternate screen is active and hasn't enabled the mouse, send - * up and down key presses for the mouse wheel. - */ - if (wp->saved_grid != NULL && !(wp->screen->mode & ALL_MOUSE_MODES)) { - for (i = 0; i < m->scroll; i++) { - if (m->wheel == MOUSE_WHEEL_UP) - input_key(wp, KEYC_UP); - else - input_key(wp, KEYC_DOWN); - } - return; - } if (wp->screen->mode & ALL_MOUSE_MODES) { /* |