diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-03-20 22:01:26 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-03-20 22:01:26 +0000 |
| commit | c6d4baa4e5d5d36990049917cb9cbb0ca4092b86 (patch) | |
| tree | 5be194618f7dc9a1885f3f15fb29d890193fc77f /window-copy.c | |
| parent | e4efd59fe074e2c776fe2fa7fb6e5871d42a391c (diff) | |
| parent | 9a55f65702b5d32e0127c78ea9762c7bb47e3477 (diff) | |
| download | rtmux-c6d4baa4e5d5d36990049917cb9cbb0ca4092b86.tar.gz rtmux-c6d4baa4e5d5d36990049917cb9cbb0ca4092b86.tar.bz2 rtmux-c6d4baa4e5d5d36990049917cb9cbb0ca4092b86.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/window-copy.c b/window-copy.c index 9fe4fcef..53faa5a8 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1590,13 +1590,12 @@ window_copy_cmd_select_word(struct window_copy_cmd_state *cs) data->dx = data->cx; data->dy = screen_hsize(data->backing) + data->cy - data->oy; - px = data->cx; - py = screen_hsize(data->backing) + data->cy - data->oy; - data->ws = options_get_string(s->options, "word-separators"); window_copy_cursor_previous_word(wme, data->ws, 0); - data->selrx = data->cx; - data->selry = screen_hsize(data->backing) + data->cy - data->oy; + px = data->cx; + py = screen_hsize(data->backing) + data->cy - data->oy; + data->selrx = px; + data->selry = py; window_copy_start_selection(wme); if (px >= window_copy_find_length(wme, py) || @@ -1609,6 +1608,8 @@ window_copy_cmd_select_word(struct window_copy_cmd_state *cs) } data->endselrx = data->cx; data->endselry = screen_hsize(data->backing) + data->cy - data->oy; + if (data->dx > data->endselrx) + data->dx = data->endselrx; return (WINDOW_COPY_CMD_REDRAW); } |