diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-03-16 16:01:26 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-03-16 16:01:26 +0000 |
| commit | c18a46cf56936a4f0b36d1e8796d85a0c59da1cc (patch) | |
| tree | 33d728500930b5ce6cb9260fc8d3b9b6ef96cbf5 | |
| parent | 62c646ac32caeaabe6f570d9d482409462db4c28 (diff) | |
| parent | 7021757c9d74eda8a5c1d7940b0d33bbad41fd29 (diff) | |
| download | rtmux-c18a46cf56936a4f0b36d1e8796d85a0c59da1cc.tar.gz rtmux-c18a46cf56936a4f0b36d1e8796d85a0c59da1cc.tar.bz2 rtmux-c18a46cf56936a4f0b36d1e8796d85a0c59da1cc.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | window-copy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/window-copy.c b/window-copy.c index 76cea4e6..6864d8f9 100644 --- a/window-copy.c +++ b/window-copy.c @@ -2877,15 +2877,15 @@ window_copy_redraw_screen(struct window_mode_entry *wme) } static void -window_copy_synchronize_cursor_end(struct window_mode_entry *wme) +window_copy_synchronize_cursor_end(struct window_mode_entry *wme, int begin) { struct window_copy_mode_data *data = wme->data; u_int xx, yy; - int begin = 0; yy = screen_hsize(data->backing) + data->cy - data->oy; switch (data->selflag) { case SEL_WORD: + begin = 0; xx = data->cx; if (data->ws == NULL) break; @@ -2911,6 +2911,7 @@ window_copy_synchronize_cursor_end(struct window_mode_entry *wme) } break; case SEL_LINE: + begin = 0; if (data->dy > yy) { /* Right to left selection. */ xx = 0; @@ -2948,11 +2949,10 @@ window_copy_synchronize_cursor(struct window_mode_entry *wme) switch (data->cursordrag) { case CURSORDRAG_ENDSEL: - window_copy_synchronize_cursor_end(wme); + window_copy_synchronize_cursor_end(wme, 0); break; case CURSORDRAG_SEL: - data->selx = data->cx; - data->sely = screen_hsize(data->backing) + data->cy - data->oy; + window_copy_synchronize_cursor_end(wme, 1); break; case CURSORDRAG_NONE: break; |