circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into floating_panes

Browse Source
This commit is contained in:
Nicholas Marriott
2026-05-22 12:39:09 +01:00
parent d3e8dd3623 d4255818c4
commit 4fd8431ad0
3 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
screen-write.c
View File

@@ -1173,7 +1173,7 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
grid_view_insert_cells(s->grid, s->cx, s->cy, nx, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = nx;
ttyctx.n = nx;
tty_write(tty_cmd_insertcharacter, &ttyctx);
}
@@ -1206,7 +1206,7 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
grid_view_delete_cells(s->grid, s->cx, s->cy, nx, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = nx;
ttyctx.n = nx;
tty_write(tty_cmd_deletecharacter, &ttyctx);
}
@@ -1239,7 +1239,7 @@ screen_write_clearcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
grid_view_clear(s->grid, s->cx, s->cy, nx, 1, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = nx;
ttyctx.n = nx;
tty_write(tty_cmd_clearcharacter, &ttyctx);
}
@@ -1275,7 +1275,7 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
grid_view_insert_lines(gd, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = ny;
ttyctx.n = ny;
tty_write(tty_cmd_insertline, &ttyctx);
return;
}
@@ -1295,7 +1295,7 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = ny;
ttyctx.n = ny;
tty_write(tty_cmd_insertline, &ttyctx);
}
@@ -1328,7 +1328,7 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
grid_view_delete_lines(gd, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = ny;
ttyctx.n = ny;
tty_write(tty_cmd_deleteline, &ttyctx);
return;
}
@@ -1347,7 +1347,7 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
grid_view_delete_lines_region(gd, s->rlower, s->cy, ny, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = ny;
ttyctx.n = ny;
tty_write(tty_cmd_deleteline, &ttyctx);
}
@@ -1626,7 +1626,7 @@ screen_write_scrolldown(struct screen_write_ctx *ctx, u_int lines, u_int bg)
grid_view_scroll_region_down(gd, s->rupper, s->rlower, bg);
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = lines;
ttyctx.n = lines;
tty_write(tty_cmd_scrolldown, &ttyctx);
}
@@ -2046,7 +2046,7 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
screen_write_initctx(ctx, &ttyctx, 1, 1);
if (wp != NULL && wp->yoff + wp->sy > wp->window->sy)
ttyctx.orlower -= (wp->yoff + wp->sy - wp->window->sy);
ttyctx.num = ctx->scrolled;
ttyctx.n = ctx->scrolled;
ttyctx.bg = ctx->bg;
tty_write(tty_cmd_scrollup, &ttyctx);
if (wp != NULL)
@@ -2136,7 +2136,7 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
if (ci->type == CLEAR) {
screen_write_initctx(ctx, &ttyctx, 1, 0);
ttyctx.bg = ci->bg;
ttyctx.num = wr_length;
ttyctx.n = wr_length;
tty_write(tty_cmd_clearcharacter,
&ttyctx);
} else {
@@ -2145,7 +2145,7 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
if (ci->wrapped)
ttyctx.flags |= TTY_CTX_WRAPPED;
ttyctx.ptr = cl->data + wr_start;
ttyctx.num = wr_length;
ttyctx.n = wr_length;
tty_write(tty_cmd_cells, &ttyctx);
}
items++;
@@ -2450,7 +2450,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
/* Create space for character in insert mode. */
if (s->mode & MODE_INSERT) {
screen_write_collect_flush(ctx, 0, __func__);
ttyctx.num = width;
ttyctx.n = width;
tty_write(tty_cmd_insertcharacter, &ttyctx);
}
@@ -2700,9 +2700,9 @@ screen_write_setselection(struct screen_write_ctx *ctx, const char *clip,
struct tty_ctx ttyctx;
screen_write_initctx(ctx, &ttyctx, 0, 0);
ttyctx.ptr = str;
ttyctx.ptr2 = (void *)clip;
ttyctx.num = len;
ttyctx.sel.clip = clip;
ttyctx.sel.data = str;
ttyctx.sel.size = len;
tty_write(tty_cmd_setselection, &ttyctx);
}
@@ -2717,8 +2717,8 @@ screen_write_rawstring(struct screen_write_ctx *ctx, u_char *str, u_int len,
screen_write_initctx(ctx, &ttyctx, 0, 0);
if (allow_invisible_panes)
ttyctx.flags |= TTY_CTX_INVISIBLE_PANES;
ttyctx.ptr = str;
ttyctx.num = len;
ttyctx.data.data = str;
ttyctx.data.size = len;
tty_write(tty_cmd_rawstring, &ttyctx);
}