circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-31 06:36: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:44:49 +01:00
parent 4fd8431ad0 285a3b7522
commit 2a6aac4c14
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
screen-write.c
View File

@@ -2775,7 +2775,7 @@ screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si,
screen_write_collect_flush(ctx, 0, __func__);
screen_write_initctx(ctx, &ttyctx, 0);
ttyctx.ptr = image_store(s, si);
ttyctx.image = image_store(s, si);
tty_write(tty_cmd_sixelimage, &ttyctx);

4
tmux.h
View File

@@ -1766,6 +1766,10 @@ struct tty_ctx {
const char *data;
size_t size;
} sel;
#ifdef ENABLE_SIXEL
struct image *image;
#endif
};
/*

14
tty.c
View File

@@ -1562,9 +1562,11 @@ tty_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
if (wp->layout_cell == NULL)
return (0);
/* Set the properties relevant to the current client. */
ttyctx->bigger = tty_window_offset(&c->tty, &ttyctx->wox, &ttyctx->woy,
&ttyctx->wsx, &ttyctx->wsy);
if (tty_window_offset(&c->tty, &ttyctx->wox, &ttyctx->woy, &ttyctx->wsx,
&ttyctx->wsy))
ttyctx->flags |= TTY_CTX_WINDOW_BIGGER;
else
ttyctx->flags &= ~TTY_CTX_WINDOW_BIGGER;
ttyctx->yoff = ttyctx->ryoff = wp->yoff;
if (status_at_line(c) == 0)
@@ -1593,10 +1595,10 @@ tty_draw_images(struct client *c, struct window_pane *wp, struct screen *s)
ttyctx.sx = wp->sx;
ttyctx.sy = wp->sy;
ttyctx.ptr = im;
ttyctx.image = im;
ttyctx.arg = wp;
ttyctx.set_client_cb = tty_set_client_cb;
ttyctx.allow_invisible_panes = 1;
ttyctx.flags |= TTY_CTX_INVISIBLE_PANES;
tty_write_one(tty_cmd_sixelimage, c, &ttyctx);
}
}
@@ -2355,7 +2357,7 @@ tty_sixelimage_draw(struct tty *tty, const struct tty_ctx *ctx,
void
tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
{
struct image *im = ctx->ptr;
struct image *im = ctx->image;
struct sixel_image *si = im->data;
char *data;
size_t size;