From f903cc9a56e5d6ede94512be19398fde3b7054b3 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 26 Nov 2007 20:45:13 +0000 Subject: [PATCH] Rv EOL optimisation, it screws up selection. --- screen.c | 15 ++------------- window-copy.c | 7 ++++++- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/screen.c b/screen.c index 3ad9ee13..1d8144b7 100644 --- a/screen.c +++ b/screen.c @@ -1,4 +1,4 @@ -/* $Id: screen.c,v 1.47 2007-11-25 13:03:01 nicm Exp $ */ +/* $Id: screen.c,v 1.48 2007-11-26 20:45:13 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -455,18 +455,7 @@ screen_draw_column(struct screen_draw_ctx *ctx, u_int px) void screen_draw_line(struct screen_draw_ctx *ctx, u_int py) { - u_int cx, cy; - - cy = screen_y(ctx->s, py) - ctx->oy; - cx = ctx->s->grid_size[cy]; - - if (screen_size_x(ctx->s) < 3 || cx >= screen_size_x(ctx->s) - 3) - screen_draw_cells(ctx, 0, py, screen_size_x(ctx->s)); - else { - screen_draw_cells(ctx, 0, py, cx); - screen_draw_move(ctx, cx, py); - input_store_zero(ctx->b, CODE_CLEARENDOFLINE); - } + screen_draw_cells(ctx, 0, py, screen_size_x(ctx->s)); } /* Draw set of lines. */ diff --git a/window-copy.c b/window-copy.c index 2c2cd090..62bc4bbc 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.7 2007-11-26 20:36:30 nicm Exp $ */ +/* $Id: window-copy.c,v 1.8 2007-11-26 20:45:13 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -356,6 +356,9 @@ window_copy_cursor_bol(struct window *w) if (data->ox != 0) window_copy_scroll_right(w, data->ox); data->cx = 0; + + if (data->selflag) + window_copy_draw_lines(w, data->cy, 1); window_copy_move_cursor(w); } @@ -394,6 +397,8 @@ window_copy_cursor_eol(struct window *w) } } + if (data->selflag) + window_copy_draw_lines(w, data->cy, 1); window_copy_move_cursor(w); }