extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-04-25 11:58:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 185:

Browse Source 
Change previous-word behavior to move to the beginning of the word (matches
emacs and vi). From Kalle Olavi Niemitalo.
This commit is contained in:
Tiago Cunha 2009-07-28 22:39:29 +00:00
parent 361801aaaa
commit 2a146852ef
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
window-copy.c
View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.66 2009-07-23 23:37:14 tcunha Exp $ */ /* $Id: window-copy.c,v 1.67 2009-07-28 22:39:29 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -796,55 +796,40 @@ out:
window_copy_set_cursor_x(wp, px); window_copy_set_cursor_x(wp, px);
} }
/* Move to the previous place where a word begins. */
void void
window_copy_cursor_previous_word(struct window_pane *wp) window_copy_cursor_previous_word(struct window_pane *wp)
{ {
struct window_copy_mode_data *data = wp->modedata; struct window_copy_mode_data *data = wp->modedata;
u_int ox, px, py, skip; u_int px, py;
ox = px = data->ox + data->cx; px = data->ox + data->cx;
py = screen_hsize(&wp->base) + data->cy - data->oy; py = screen_hsize(&wp->base) + data->cy - data->oy;
skip = 1; /* Move back to the previous word character. */
if (px != 0) {
/* If currently on a space, skip space. */
if (window_copy_is_space(wp, px - 1, py))
skip = 0;
}
for (;;) { for (;;) {
if (px == 0) { if (px > 0) {
if (ox != 0) px--;
if (!window_copy_is_space(wp, px, py))
break; break;
} else {
while (px == 0) {
if (data->cy == 0 && if (data->cy == 0 &&
(screen_hsize(&wp->base) == 0 || (screen_hsize(&wp->base) == 0 ||
data->oy >= screen_hsize(&wp->base) - 1)) data->oy >= screen_hsize(&wp->base) - 1))
goto out; goto out;
window_copy_cursor_up(wp); window_copy_cursor_up(wp);
py = screen_hsize( py = screen_hsize(
&wp->base) + data->cy - data->oy; &wp->base) + data->cy - data->oy;
px = window_copy_find_length(wp, py); px = window_copy_find_length(wp, py);
} }
goto out;
}
if (skip) {
/* Currently skipping non-space (until space). */
if (window_copy_is_space(wp, px - 1, py))
skip = 0;
} else {
/* Currently skipping space (until non-space). */
if (!window_copy_is_space(wp, px - 1, py))
break;
} }
/* Move back to the beginning of this word. */
while (px > 0 && !window_copy_is_space(wp, px - 1, py))
px--; px--;
}
out:
out:
window_copy_set_cursor_x(wp, px); window_copy_set_cursor_x(wp, px);
} }