diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-01-28 22:45:57 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-01-28 22:45:57 +0000 |
| commit | 735cfaf09af70df60b90f0b3d64b7d4eb6e34612 (patch) | |
| tree | 2eeb4a0f29413fb53e1d9fd661fc6ab8ca6f5091 /window-copy.c | |
| parent | 0e320881d50efea3e4036c4a769cf2224dcc315e (diff) | |
| download | rtmux-735cfaf09af70df60b90f0b3d64b7d4eb6e34612.tar.gz rtmux-735cfaf09af70df60b90f0b3d64b7d4eb6e34612.tar.bz2 rtmux-735cfaf09af70df60b90f0b3d64b7d4eb6e34612.zip | |
Sync OpenBSD patchset 621:
Alter next-word to have vi-like movement behaviour, and add next-word-end with
the existing emacs behaviour. From Micah Cowan.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c index 92fb5e4b..c3b07ce6 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.98 2010-01-28 22:43:24 tcunha Exp $ */ +/* $Id: window-copy.c,v 1.99 2010-01-28 22:45:57 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -64,6 +64,7 @@ void window_copy_cursor_right(struct window_pane *); void window_copy_cursor_up(struct window_pane *, int); void window_copy_cursor_down(struct window_pane *, int); void window_copy_cursor_next_word(struct window_pane *); +void window_copy_cursor_next_word_end(struct window_pane *); void window_copy_cursor_previous_word(struct window_pane *); void window_copy_scroll_up(struct window_pane *, u_int); void window_copy_scroll_down(struct window_pane *, u_int); @@ -336,6 +337,9 @@ window_copy_key(struct window_pane *wp, struct client *c, int key) case MODEKEYCOPY_NEXTWORD: window_copy_cursor_next_word(wp); break; + case MODEKEYCOPY_NEXTWORDEND: + window_copy_cursor_next_word_end(wp); + break; case MODEKEYCOPY_PREVIOUSWORD: window_copy_cursor_previous_word(wp); break; @@ -1169,6 +1173,42 @@ window_copy_cursor_next_word(struct window_pane *wp) xx = window_copy_find_length(wp, py); yy = screen_hsize(base_s) + screen_size_y(base_s) - 1; + /* Are we in a word? Skip it! */ + while (!window_copy_is_space(wp, px, py)) + px++; + + /* Find the start of a word. */ + while (px > xx || window_copy_is_space(wp, px, py)) { + /* Past the end of the line? Nothing but spaces. */ + if (px > xx) { + if (py == yy) + return; + window_copy_cursor_down(wp, 0); + px = 0; + + py = screen_hsize(base_s) + data->cy - data->oy; + xx = window_copy_find_length(wp, py); + } + px++; + } + + window_copy_update_cursor(wp, px, data->cy); + if (window_copy_update_selection(wp)) + window_copy_redraw_lines(wp, data->cy, 1); +} + +void +window_copy_cursor_next_word_end(struct window_pane *wp) +{ + struct window_copy_mode_data *data = wp->modedata; + struct screen *base_s = &wp->base; + u_int px, py, xx, yy; + + px = data->cx; + py = screen_hsize(base_s) + data->cy - data->oy; + xx = window_copy_find_length(wp, py); + yy = screen_hsize(base_s) + screen_size_y(base_s) - 1; + /* Are we on spaces? Skip 'em! */ while (px > xx || window_copy_is_space(wp, px, py)) { /* Nothing but spaces past the end of the line, so move down. */ |