Some trivial bits from master.

This commit is contained in:
Nicholas Marriott
2026-05-25 15:49:22 +01:00
parent c60422241b
commit 6c1773542d
3 changed files with 3 additions and 5 deletions

View File

@@ -216,7 +216,6 @@ layout_parse(struct window *w, const char *layout, char **cause)
if (floating_lc != NULL) if (floating_lc != NULL)
ncells += layout_count_cells(floating_lc); ncells += layout_count_cells(floating_lc);
if (npanes > ncells) { if (npanes > ncells) {
/* Modify this to open a new pane */
xasprintf(cause, "have %u panes but need %u", npanes, xasprintf(cause, "have %u panes but need %u", npanes,
ncells); ncells);
goto fail; goto fail;

1
tmux.h
View File

@@ -1264,7 +1264,6 @@ struct window_pane {
int yoff; int yoff;
int flags; int flags;
int saved_flags;
#define PANE_REDRAW 0x1 #define PANE_REDRAW 0x1
#define PANE_DROP 0x2 #define PANE_DROP 0x2
#define PANE_FOCUSED 0x4 #define PANE_FOCUSED 0x4

6
tty.c
View File

@@ -1380,7 +1380,7 @@ static void
tty_clear_pane_area(struct tty *tty, const struct tty_ctx *ctx, u_int py, tty_clear_pane_area(struct tty *tty, const struct tty_ctx *ctx, u_int py,
u_int ny, u_int px, u_int nx, u_int bg) u_int ny, u_int px, u_int nx, u_int bg)
{ {
u_int i, j, x, y, rx, ry; u_int i, j, x, y, rx, ry;
if (tty_clamp_area(tty, ctx, px, py, nx, ny, &i, &j, &x, &y, &rx, &ry)) if (tty_clamp_area(tty, ctx, px, py, nx, ny, &i, &j, &x, &y, &rx, &ry))
tty_clear_area(tty, ctx, y, ry, x, rx, bg); tty_clear_area(tty, ctx, y, ry, x, rx, bg);
@@ -2045,7 +2045,7 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
{ {
const struct grid_cell *gcp = ctx->cell; const struct grid_cell *gcp = ctx->cell;
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct visible_ranges *r = NULL; struct visible_ranges *r;
u_int px, py, i, vis = 0; u_int px, py, i, vis = 0;
px = ctx->xoff + ctx->ocx - ctx->wox; px = ctx->xoff + ctx->ocx - ctx->wox;
@@ -2081,7 +2081,7 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
tty_cursor_pane_unless_wrap(tty, ctx, ctx->ocx, ctx->ocy); tty_cursor_pane_unless_wrap(tty, ctx, ctx->ocx, ctx->ocy);
tty_cell(tty, ctx->cell, &ctx->defaults, ctx->palette, tty_cell(tty, ctx->cell, &ctx->defaults, ctx->palette,
ctx->s->hyperlinks); ctx->s->hyperlinks);
if (ctx->flags & TTY_CTX_CELL_INVALIDATE) if (ctx->flags & TTY_CTX_CELL_INVALIDATE)
tty_invalidate(tty); tty_invalidate(tty);