src/usr.bin/tmux/window-copy.c - diff

Return to window-copy.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window-copy.c between version 1.273 and 1.274

version 1.273, 2020/04/14 19:07:10

version 1.274, 2020/04/15 17:50:02

Line 298

}

static struct screen *

window_copy_clone_screen(struct screen *src, struct screen *hint)

window_copy_clone_screen(struct screen *src, struct screen *hint, u_int *cx,

u_int *cy)

{

struct screen *dst;

struct screen_write_ctx ctx;

u_int sy;

u_int dy, sy;

const struct grid_line *gl;

dst = xcalloc(1, sizeof *dst);

sy = screen_hsize(src) + screen_size_y(src);

if (screen_size_y(hint) > sy)

while (sy > screen_hsize(src)) {

dy = screen_size_y(hint);

gl = grid_peek_line(src->grid, sy - 1);

else

if (gl->cellused != 0)

dy = sy;

break;

screen_init(dst, screen_size_x(src), dy, src->grid->hlimit);

sy--;

grid_duplicate_lines(dst->grid, 0, src->grid, 0, sy);

if (screen_size_y(hint) < sy) {

dst->grid->sy = screen_size_y(hint);

dst->grid->hsize = sy - screen_size_y(hint);

}

screen_init(dst, screen_size_x(src), sy, screen_hlimit(src));

grid_duplicate_lines(dst->grid, 0, src->grid, 0, sy);

screen_write_start(&ctx, NULL, dst);

dst->grid->sy = sy - screen_hsize(src);

screen_write_cursormove(&ctx, 0, dst->grid->sy + sy - dy - 1, 0);

dst->grid->hsize = screen_hsize(src);

screen_write_stop(&ctx);

dst->grid->hscrolled = src->grid->hscrolled;

dst->cx = src->cx;

dst->cy = src->cy;

screen_resize_cursor(dst, screen_size_x(hint), screen_size_y(hint), 1,

0, cx, cy);

return (dst);

}

Line 370

Line 373

{

struct window_pane *wp = wme->swp;

struct window_copy_mode_data *data;

struct screen *base = &wp->base;

struct screen_write_ctx ctx;

u_int i;

u_int i, cx, cy;

data = window_copy_common_init(wme);

data->backing = window_copy_clone_screen(&wp->base, &data->screen);

data->backing = window_copy_clone_screen(base, &data->screen, &cx, &cy);

data->cx = wp->base.cx;

if (cy < screen_hsize(data->backing)) {

if (data->cx > screen_size_x(&data->screen) - 1)

data->cx = cx;

data->cx = screen_size_x(&data->screen) - 1;

data->cy = screen_hsize(&wp->base) + wp->base.cy;

if (data->cy < screen_hsize(data->backing)) {

data->oy = screen_hsize(data->backing) - data->cy;

data->cy = 0;

} else

data->oy = screen_hsize(data->backing) - cy;

data->cy -= screen_hsize(data->backing);

} else {

data->cx = data->backing->cx;

data->cy = data->backing->cy;

data->oy = 0;

}

data->scroll_exit = args_has(args, 'e');

data->hide_position = args_has(args, 'H');

Line 697

Line 700

struct screen_write_ctx ctx;

int search;

screen_resize(s, sx, sy, 1);

screen_resize(s, sx, sy, 0);

screen_resize(data->backing, sx, sy, 1);

screen_resize_cursor(data->backing, sx, sy, 1, 0, NULL, NULL);

if (data->cy > sy - 1)

data->cy = sy - 1;

Line 2024

Line 2027

screen_free(data->backing);

free(data->backing);

data->backing = window_copy_clone_screen(&wp->base, &data->screen);

data->backing = window_copy_clone_screen(&wp->base, &data->screen, NULL,

NULL);

return (WINDOW_COPY_CMD_REDRAW);

}