Re: Don't wrap the cursor in tmux in copy mode

[Michal Mazurek]

On 14:45:12, 27.01.16, Nicholas Marriott wrote:
> Hi
> 
> tmux copy mode is not meant to work like vi, it is meant to work like
> emacs, but emacs does do this so we can change it.
> 
> However, your diff is wrong. It prevents the cursor moving back when it
> is at 0,0 _on screen_.

Here is a fixed version:

Index: window-copy.c
===================================================================
RCS file: /cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.144
diff -u -p -r1.144 window-copy.c
--- window-copy.c       19 Jan 2016 15:59:12 -0000      1.144
+++ window-copy.c       30 Jan 2016 13:00:40 -0000
@@ -1775,11 +1775,13 @@ void
 window_copy_cursor_left(struct window_pane *wp)
 {
        struct window_copy_mode_data    *data = wp->modedata;
+       u_int                            py;
 
-       if (data->cx == 0) {
+       py = screen_hsize(data->backing) + data->cy - data->oy;
+       if (data->cx == 0 && py > 0) {
                window_copy_cursor_up(wp, 0);
                window_copy_cursor_end_of_line(wp);
-       } else {
+       } else if (data->cx > 0) {
                window_copy_update_cursor(wp, data->cx - 1, data->cy);
                if (window_copy_update_selection(wp, 1))
                        window_copy_redraw_lines(wp, data->cy, 1);
@@ -1790,19 +1792,20 @@ void
 window_copy_cursor_right(struct window_pane *wp)
 {
        struct window_copy_mode_data    *data = wp->modedata;
-       u_int                            px, py;
+       u_int                            px, py, yy;
 
+       py = screen_hsize(data->backing) + data->cy - data->oy;
+       yy = screen_hsize(data->backing) + screen_size_y(data->backing) - 1;
        if (data->screen.sel.flag && data->rectflag)
                px = screen_size_x(&data->screen);
        else {
-               py = screen_hsize(data->backing) + data->cy - data->oy;
                px = window_copy_find_length(wp, py);
        }
 
-       if (data->cx >= px) {
+       if (data->cx >= px && py < yy) {
                window_copy_cursor_start_of_line(wp);
                window_copy_cursor_down(wp, 0);
-       } else {
+       } else if (data->cx < px) {
                window_copy_update_cursor(wp, data->cx + 1, data->cy);
                if (window_copy_update_selection(wp, 1))
                        window_copy_redraw_lines(wp, data->cy, 1);

-- 
Michal Mazurek