diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-12-11 17:56:01 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-12-11 17:56:01 +0000 |
| commit | 20ed20ea1eb996cbfc530688dac7646f58a43fe6 (patch) | |
| tree | a771290c7f6affb123b236adce41939b6eecb143 | |
| parent | 9802fea6152197c7887937c0d1e8637ae317443b (diff) | |
| download | rtmux-20ed20ea1eb996cbfc530688dac7646f58a43fe6.tar.gz rtmux-20ed20ea1eb996cbfc530688dac7646f58a43fe6.tar.bz2 rtmux-20ed20ea1eb996cbfc530688dac7646f58a43fe6.zip | |
Fix rectangle copy to behave like emacs - the cursor is not part of the
selection on the right edge but on the left it is.
| -rw-r--r-- | screen.c | 4 | ||||
| -rw-r--r-- | window-copy.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -287,7 +287,7 @@ screen_check_selection(struct screen *s, u_int px, u_int py) */ if (sel->ex < sel->sx) { /* Cursor (ex) is on the left. */ - if (px <= sel->ex) + if (px < sel->ex) return (0); if (px > sel->sx) @@ -297,7 +297,7 @@ screen_check_selection(struct screen *s, u_int px, u_int py) if (px < sel->sx) return (0); - if (px >= sel->ex) + if (px > sel->ex) return (0); } } else { diff --git a/window-copy.c b/window-copy.c index b66eb74f..9f92464b 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1267,8 +1267,8 @@ window_copy_copy_selection(struct window_pane *wp, struct session *sess) /* Cursor is on the left. */ lastex = data->selx + 1; restex = data->selx + 1; - firstsx = data->cx + 1; - restsx = data->cx + 1; + firstsx = data->cx; + restsx = data->cx; } } else { /* |