Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

* refs/remotes/tmux-openbsd/master:
  Change cellused/size to 16 bits and time to 32 bits in grid_line and add the OSC 133 positions (size stays the same).
This commit is contained in:
Thomas Adam
2026-07-20 18:17:19 +01:00
6 changed files with 168 additions and 49 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-write.c,v 1.283 2026/07/09 07:35:05 nicm Exp $ */
/* $OpenBSD: screen-write.c,v 1.284 2026/07/20 11:16:33 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1606,6 +1606,7 @@ screen_write_clearline(struct screen_write_ctx *ctx, u_int bg)
struct grid_line *gl;
u_int sx = screen_size_x(s);
struct screen_write_citem *ci = ctx->item;
struct osc133_data od;
u_int flags;
gl = grid_get_line(s->grid, s->grid->hsize + s->cy);
@@ -1617,10 +1618,14 @@ screen_write_clearline(struct screen_write_ctx *ctx, u_int bg)
ctx->wp->flags |= PANE_REDRAW;
#endif
flags = gl->flags & (GRID_LINE_START_PROMPT|GRID_LINE_START_OUTPUT);
flags = gl->flags &
(GRID_LINE_START_PROMPT|GRID_LINE_START_OUTPUT|
GRID_LINE_OSC133_FLAGS);
memcpy(&od, &gl->osc133_data, sizeof od);
grid_view_clear(s->grid, 0, s->cy, sx, 1, bg);
gl = grid_get_line(s->grid, s->grid->hsize + s->cy);
gl->flags |= flags;
memcpy(&gl->osc133_data, &od, sizeof gl->osc133_data);
screen_write_collect_clear(ctx, s->cy, 1);
ci->x = 0;