I think the problem is we are redrawing the first two lines before
fixing up the selection, so they get written as not selected. I think
it's better to update the selection before redrawing rather than
redrawing them again separately.
But window_copy_update_selection can also redraw for rectangle
selections (this is stupid but I don't have time to figure out how to
remove it), so we need to stop that for scrolling up and down by adding
an argument.
Anyway, can you try this instead please?
Index: window-copy.c
===================================================================
RCS file: /cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.95
diff -u -p -r1.95 window-copy.c
--- window-copy.c 23 Oct 2013 11:31:03 -0000 1.95
+++ window-copy.c 31 Oct 2013 18:05:08 -0000
@@ -51,7 +51,7 @@ void window_copy_search_down(struct wind
void window_copy_goto_line(struct window_pane *, const char *);
void window_copy_update_cursor(struct window_pane *, u_int, u_int);
void window_copy_start_selection(struct window_pane *);
-int window_copy_update_selection(struct window_pane *);
+int window_copy_update_selection(struct window_pane *, int);
void *window_copy_get_selection(struct window_pane *, size_t *);
void window_copy_copy_buffer(struct window_pane *, int, void *, size_t);
void window_copy_copy_pipe(
@@ -329,7 +329,7 @@ window_copy_pageup(struct window_pane *w
data->oy = screen_hsize(data->backing);
else
data->oy += n;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
}
@@ -458,7 +458,7 @@ window_copy_key(struct window_pane *wp,
else
data->oy -= n;
}
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_HALFPAGEUP:
@@ -469,7 +469,7 @@ window_copy_key(struct window_pane *wp,
else
data->oy += n;
}
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_HALFPAGEDOWN:
@@ -480,39 +480,39 @@ window_copy_key(struct window_pane *wp,
else
data->oy -= n;
}
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_TOPLINE:
data->cx = 0;
data->cy = 0;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_MIDDLELINE:
data->cx = 0;
data->cy = (screen_size_y(s) - 1) / 2;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_BOTTOMLINE:
data->cx = 0;
data->cy = screen_size_y(s) - 1;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_HISTORYTOP:
data->cx = 0;
data->cy = 0;
data->oy = screen_hsize(data->backing);
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_HISTORYBOTTOM:
data->cx = 0;
data->cy = screen_size_y(s) - 1;
data->oy = 0;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_STARTSELECTION:
@@ -865,7 +865,7 @@ window_copy_mouse(
if (s->mode & MODE_MOUSE_BUTTON) {
if (~m->event & MOUSE_EVENT_UP) {
window_copy_update_cursor(wp, m->x, m->y);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_screen(wp);
return;
}
@@ -915,7 +915,7 @@ window_copy_scroll_to(struct window_pane
}
data->oy = gd->hsize - offset;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
}
@@ -1108,7 +1108,7 @@ window_copy_goto_line(struct window_pane
return;
data->oy = lineno;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
}
@@ -1221,11 +1221,11 @@ window_copy_start_selection(struct windo
data->sely = screen_hsize(data->backing) + data->cy - data->oy;
s->sel.flag = 1;
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
}
int
-window_copy_update_selection(struct window_pane *wp)
+window_copy_update_selection(struct window_pane *wp, int may_redraw)
{
struct window_copy_mode_data *data = wp->modedata;
struct screen *s = &data->screen;
@@ -1260,7 +1260,7 @@ window_copy_update_selection(struct wind
screen_set_selection(s,
sx, sy, data->cx, screen_hsize(s) + data->cy, data->rectflag, &gc);
- if (data->rectflag) {
+ if (data->rectflag && may_redraw) {
/*
* Can't rely on the caller to redraw the right lines for
* rectangle selection - find the highest line and the number
@@ -1564,7 +1564,7 @@ window_copy_cursor_start_of_line(struct
}
}
window_copy_update_cursor(wp, 0, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -1589,7 +1589,7 @@ window_copy_cursor_back_to_indentation(s
}
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -1619,7 +1619,7 @@ window_copy_cursor_end_of_line(struct wi
}
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -1666,7 +1666,7 @@ window_copy_cursor_left(struct window_pa
window_copy_cursor_end_of_line(wp);
} else {
window_copy_update_cursor(wp, data->cx - 1, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
}
@@ -1689,7 +1689,7 @@ window_copy_cursor_right(struct window_p
window_copy_cursor_down(wp, 0);
} else {
window_copy_update_cursor(wp, data->cx + 1, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
}
@@ -1719,7 +1719,7 @@ window_copy_cursor_up(struct window_pane
}
} else {
window_copy_update_cursor(wp, data->cx, data->cy - 1);
- if (window_copy_update_selection(wp)) {
+ if (window_copy_update_selection(wp, 1)) {
if (data->cy == screen_size_y(s) - 1)
window_copy_redraw_lines(wp, data->cy, 1);
else
@@ -1757,7 +1757,7 @@ window_copy_cursor_down(struct window_pa
window_copy_redraw_lines(wp, data->cy - 1, 2);
} else {
window_copy_update_cursor(wp, data->cx, data->cy + 1);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy - 1, 2);
}
@@ -1789,7 +1789,7 @@ window_copy_cursor_jump(struct window_pa
if (!(gc->flags & GRID_FLAG_PADDING) &&
ud.size == 1 && *ud.data == data->jumpchar) {
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
return;
}
@@ -1818,7 +1818,7 @@ window_copy_cursor_jump_back(struct wind
if (!(gc->flags & GRID_FLAG_PADDING) &&
ud.size == 1 && *ud.data == data->jumpchar) {
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
return;
}
@@ -1847,7 +1847,7 @@ window_copy_cursor_jump_to(struct window
if (!(gc->flags & GRID_FLAG_PADDING) &&
ud.size == 1 && *ud.data == data->jumpchar) {
window_copy_update_cursor(wp, px - 1, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
return;
}
@@ -1876,7 +1876,7 @@ window_copy_cursor_jump_to_back(struct w
if (!(gc->flags & GRID_FLAG_PADDING) &&
ud.size == 1 && *ud.data == data->jumpchar) {
window_copy_update_cursor(wp, px + 1, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
return;
}
@@ -1924,7 +1924,7 @@ window_copy_cursor_next_word(struct wind
} while (expected == 1);
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -1974,7 +1974,7 @@ window_copy_cursor_next_word_end(struct
px--;
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -2012,7 +2012,7 @@ window_copy_cursor_previous_word(struct
out:
window_copy_update_cursor(wp, px, data->cy);
- if (window_copy_update_selection(wp))
+ if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1);
}
@@ -2029,6 +2029,8 @@ window_copy_scroll_up(struct window_pane
return;
data->oy -= ny;
+ window_copy_update_selection(wp, 0);
+
screen_write_start(&ctx, wp, NULL);
screen_write_cursormove(&ctx, 0, 0);
screen_write_deleteline(&ctx, ny);
@@ -2038,12 +2040,9 @@ window_copy_scroll_up(struct window_pane
window_copy_write_line(wp, &ctx, 1);
if (screen_size_y(s) > 3)
window_copy_write_line(wp, &ctx, screen_size_y(s) - 2);
- if (s->sel.flag && screen_size_y(s) > ny) {
- window_copy_update_selection(wp);
+ if (s->sel.flag && screen_size_y(s) > ny)
window_copy_write_line(wp, &ctx, screen_size_y(s) - ny - 1);
- }
screen_write_cursormove(&ctx, data->cx, data->cy);
- window_copy_update_selection(wp);
screen_write_stop(&ctx);
}
@@ -2063,17 +2062,17 @@ window_copy_scroll_down(struct window_pa
return;
data->oy += ny;
+ window_copy_update_selection(wp, 0);
+
screen_write_start(&ctx, wp, NULL);
screen_write_cursormove(&ctx, 0, 0);
screen_write_insertline(&ctx, ny);
window_copy_write_lines(wp, &ctx, 0, ny);
- if (s->sel.flag && screen_size_y(s) > ny) {
- window_copy_update_selection(wp);
+ if (s->sel.flag && screen_size_y(s) > ny)
window_copy_write_line(wp, &ctx, ny);
- } else if (ny == 1) /* nuke position */
+ else if (ny == 1) /* nuke position */
window_copy_write_line(wp, &ctx, 1);
screen_write_cursormove(&ctx, data->cx, data->cy);
- window_copy_update_selection(wp);
screen_write_stop(&ctx);
}
@@ -2090,6 +2089,6 @@ window_copy_rectangle_toggle(struct wind
if (data->cx > px)
window_copy_update_cursor(wp, px, data->cy);
- window_copy_update_selection(wp);
+ window_copy_update_selection(wp, 1);
window_copy_redraw_screen(wp);
}
On Fri, Oct 25, 2013 at 09:50:41PM -0500, J Raynor wrote:
> It looks like there's a bug in the window_copy_scroll_up and down
> functions where they don't correctly highlight what's been selected
> for copying.
>
> To see the problem with window_copy_scroll_up, do the following:
>
> 1. Generate more than a screenful of text.
> 2. Enter copy mode.
> 3. Scroll up some so that you'll be able to scroll down later.
> 4. Move your cursor to the 3rd line from the top of the screen.
> 5. Begin your selection.
> 6. Move your cursor to the bottom of the screen.
> 7. Note that the first line of your selection is on line 3, and it is
> highlighted.
> 8. Scroll down 1 line.
>
> Notice that the first line of your selection is now on line 2, but it
> is no longer highlighted. It's still part of the selection, as a
> copy&paste will demonstrate. The problem with the highlighting
> appears to be that window_copy_scroll_up calls window_copy_write_line
> on the first 2 lines of the screen, and this removes the highlighting.
>
> A similar problem happens with window_copy_scroll_down. Continuing
> from the steps above:
>
> 9. Scroll down 2 lines. The first line of your selection is now 1
> line above the top of the screen.
> 10. Scroll the window content down 2 lines (ctrl-y in vi mode).
>
>
> The first line of your selection is now back on the 2nd line and is
> highlighted, but so is the line above it, which is not part of the
> selection.
>
> I've attached a patch which corrects the behavior of both functions.
> ------------------------------------------------------------------------------
> October Webinars: Code for Performance
> Free Intel webinars can help you accelerate application performance.
> Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
> the latest Intel processors and coprocessors. See abstracts and register >
> http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
