circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 14:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Change --enable-sixel to --enable-images (the former stays as an alias).

Browse Source
This commit is contained in:
Nicholas Marriott
2026-10-12 13:19:29 +01:00
parent b973733720
commit 40a1901bad
9 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -249,8 +249,8 @@ if HAVE_UTF8PROC
nodist_tmux_SOURCES += compat/utf8proc.c nodist_tmux_SOURCES += compat/utf8proc.c
endif endif
# Enable sixel support. # Enable image support.
if ENABLE_SIXEL if ENABLE_IMAGES
dist_tmux_SOURCES += image.c image-sixel.c dist_tmux_SOURCES += image.c image-sixel.c
endif endif

25
configure.ac
View File

@@ -541,15 +541,24 @@ if test "x$enable_cgroups" = xyes; then
fi fi
fi fi
# Enable sixel support. # Enable image support.
AC_ARG_ENABLE(
images,
AS_HELP_STRING(--enable-images, enable image support)
)
AC_ARG_ENABLE( AC_ARG_ENABLE(
sixel, sixel,
AS_HELP_STRING(--enable-sixel, enable sixel images) AS_HELP_STRING(--enable-sixel, alias for --enable-images),
[
if test "x$enable_images" = x; then
enable_images=$enable_sixel
fi
]
) )
if test "x$enable_sixel" = xyes; then if test "x$enable_images" = xyes; then
AC_DEFINE(ENABLE_SIXEL) AC_DEFINE(ENABLE_IMAGES)
fi fi
AM_CONDITIONAL(ENABLE_SIXEL, [test "x$enable_sixel" = xyes]) AM_CONDITIONAL(ENABLE_IMAGES, [test "x$enable_images" = xyes])
# Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well. # Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well.
AC_MSG_CHECKING(for b64_ntop) AC_MSG_CHECKING(for b64_ntop)
@@ -1148,10 +1157,10 @@ if test "x$enable_asan" = xyes; then
else else
AC_MSG_NOTICE([ASAN: off]) AC_MSG_NOTICE([ASAN: off])
fi fi
if test "x$enable_sixel" = xyes; then if test "x$enable_images" = xyes; then
AC_MSG_NOTICE([SIXEL: on]) AC_MSG_NOTICE([images: on])
else else
AC_MSG_NOTICE([SIXEL: off]) AC_MSG_NOTICE([images: off])
fi fi
if test "x$enable_debug" = xyes; then if test "x$enable_debug" = xyes; then
AC_MSG_NOTICE([debug: on]) AC_MSG_NOTICE([debug: on])

2
format.c
View File

@@ -3074,7 +3074,7 @@ format_cb_version(__unused struct format_tree *ft)
static void * static void *
format_cb_sixel_support(__unused struct format_tree *ft) format_cb_sixel_support(__unused struct format_tree *ft)
{ {
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
return (xstrdup("1")); return (xstrdup("1"));
#else #else
return (xstrdup("0")); return (xstrdup("0"));

8
input.c
View File

@@ -1582,7 +1582,7 @@ input_csi_dispatch(struct input_ctx *ictx)
case -1: case -1:
break; break;
case 0: case 0:
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
input_reply(ictx, 1, "\033[?1;2;4c"); input_reply(ictx, 1, "\033[?1;2;4c");
#else #else
input_reply(ictx, 1, "\033[?1;2c"); input_reply(ictx, 1, "\033[?1;2c");
@@ -2100,7 +2100,7 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx)
static void static void
input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx) input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx)
{ {
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
int n, m, o; int n, m, o;
if (ictx->param_list_len > 3) if (ictx->param_list_len > 3)
@@ -2625,7 +2625,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
const char prefix[] = "tmux;"; const char prefix[] = "tmux;";
const u_int prefixlen = (sizeof prefix) - 1; const u_int prefixlen = (sizeof prefix) - 1;
long long allow_passthrough = 0; long long allow_passthrough = 0;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct window *w; struct window *w;
struct sixel_image *si; struct sixel_image *si;
int p2; int p2;
@@ -2641,7 +2641,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
return (0); return (0);
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (wp != NULL && buf[0] == 'q' && ictx->interm_len == 0) { if (wp != NULL && buf[0] == 'q' && ictx->interm_len == 0) {
w = wp->window; w = wp->window;
if (input_split(ictx) != 0) if (input_split(ictx) != 0)

2
screen-redraw.c
View File

@@ -1921,7 +1921,7 @@ redraw_draw(struct client *c, struct window_pane *wp, int flags)
tty_reset(tty); tty_reset(tty);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (wp != NULL) if (wp != NULL)
tty_draw_images(c, wp); tty_draw_images(c, wp);
else { else {

38
screen-write.c
View File

@@ -1471,7 +1471,7 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx)
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&gc, &grid_default_cell, sizeof gc);
utf8_set(&gc.data, 'E'); utf8_set(&gc.data, 'E');
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_free_all(s) && ctx->wp != NULL) if (image_free_all(s) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1518,7 +1518,7 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
if (s->cx > screen_size_x(s) - 1) if (s->cx > screen_size_x(s) - 1)
return; return;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1559,7 +1559,7 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
if (s->cx > screen_size_x(s) - 1) if (s->cx > screen_size_x(s) - 1)
return; return;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1600,7 +1600,7 @@ screen_write_clearcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
if (s->cx > screen_size_x(s) - 1) if (s->cx > screen_size_x(s) - 1)
return; return;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1635,7 +1635,7 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1703,7 +1703,7 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg)
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1776,7 +1776,7 @@ screen_write_clearline(struct screen_write_ctx *ctx, u_int bg)
if (gl->cellsize == 0 && COLOUR_DEFAULT(bg)) if (gl->cellsize == 0 && COLOUR_DEFAULT(bg))
return; return;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1815,7 +1815,7 @@ screen_write_clearendofline(struct screen_write_ctx *ctx, u_int bg)
if (s->cx > sx - 1 || (s->cx >= gl->cellsize && COLOUR_DEFAULT(bg))) if (s->cx > sx - 1 || (s->cx >= gl->cellsize && COLOUR_DEFAULT(bg)))
return; return;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1842,7 +1842,7 @@ screen_write_clearstartofline(struct screen_write_ctx *ctx, u_int bg)
return; return;
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) if (image_check_line(s, s->cy, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1896,7 +1896,7 @@ screen_write_reverseindex(struct screen_write_ctx *ctx, u_int bg)
return; return;
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_free_all(s) && ctx->wp != NULL) if (image_free_all(s) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -1948,7 +1948,7 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped, u_int bg)
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid *gd = s->grid; struct grid *gd = s->grid;
struct grid_line *gl; struct grid_line *gl;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
int redraw = 0; int redraw = 0;
#endif #endif
u_int rupper = s->rupper, rlower = s->rlower; u_int rupper = s->rupper, rlower = s->rlower;
@@ -1971,7 +1971,7 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped, u_int bg)
return; return;
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (rlower == screen_size_y(s) - 1) if (rlower == screen_size_y(s) - 1)
redraw = image_scroll_up(s, 1); redraw = image_scroll_up(s, 1);
else else
@@ -2003,7 +2003,7 @@ screen_write_scrollup(struct screen_write_ctx *ctx, u_int lines, u_int bg)
ctx->bg = bg; ctx->bg = bg;
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_scroll_up(s, lines) && ctx->wp != NULL) if (image_scroll_up(s, lines) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -2032,7 +2032,7 @@ screen_write_scrolldown(struct screen_write_ctx *ctx, u_int lines, u_int bg)
else if (lines > s->rlower - s->rupper + 1) else if (lines > s->rlower - s->rupper + 1)
lines = s->rlower - s->rupper + 1; lines = s->rlower - s->rupper + 1;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_free_all(s) && ctx->wp != NULL) if (image_free_all(s) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -2073,7 +2073,7 @@ screen_write_clearendofscreen(struct screen_write_ctx *ctx, u_int bg)
struct visible_ranges *r; struct visible_ranges *r;
struct visible_range *ri; struct visible_range *ri;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -2154,7 +2154,7 @@ screen_write_clearstartofscreen(struct screen_write_ctx *ctx, u_int bg)
struct visible_ranges *r; struct visible_ranges *r;
struct visible_range *ri; struct visible_range *ri;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_line(s, 0, s->cy - 1) && ctx->wp != NULL) if (image_check_line(s, 0, s->cy - 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -2227,7 +2227,7 @@ screen_write_clearscreen(struct screen_write_ctx *ctx, u_int bg)
struct visible_ranges *r; struct visible_ranges *r;
struct visible_range *ri; struct visible_range *ri;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_free_all(s) && ctx->wp != NULL) if (image_free_all(s) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -2735,7 +2735,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
} }
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
if (image_check_area(s, s->cx, s->cy, ci->used, 1) && ctx->wp != NULL) if (image_check_area(s, s->cx, s->cy, ci->used, 1) && ctx->wp != NULL)
ctx->wp->flags |= PANE_REDRAW; ctx->wp->flags |= PANE_REDRAW;
#endif #endif
@@ -3239,7 +3239,7 @@ screen_write_rawstring(struct screen_write_ctx *ctx, u_char *str, u_int len,
tty_write(tty_cmd_rawstring, &ttyctx); tty_write(tty_cmd_rawstring, &ttyctx);
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* Write a SIXEL image. */ /* Write a SIXEL image. */
void void
screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si, screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si,

18
screen.c
View File

@@ -93,7 +93,7 @@ screen_init(struct screen *s, u_int sx, u_int sy, u_int hlimit)
s->tabs = NULL; s->tabs = NULL;
s->sel = NULL; s->sel = NULL;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
TAILQ_INIT(&s->images); TAILQ_INIT(&s->images);
TAILQ_INIT(&s->saved_images); TAILQ_INIT(&s->saved_images);
#endif #endif
@@ -132,7 +132,7 @@ screen_reinit(struct screen *s, int check)
screen_clear_selection(s); screen_clear_selection(s);
screen_free_titles(s); screen_free_titles(s);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
image_free_all(s); image_free_all(s);
#endif #endif
@@ -154,7 +154,7 @@ screen_reset_hyperlinks(struct screen *s)
void void
screen_free(struct screen *s) screen_free(struct screen *s)
{ {
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct image *im; struct image *im;
#endif #endif
@@ -174,7 +174,7 @@ screen_free(struct screen *s)
hyperlinks_free(s->hyperlinks); hyperlinks_free(s->hyperlinks);
screen_free_titles(s); screen_free_titles(s);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* /*
* Images saved when entering the alternate screen stay linked in the * Images saved when entering the alternate screen stay linked in the
* global list; move them back so they are freed and unlinked here, or * global list; move them back so they are freed and unlinked here, or
@@ -377,7 +377,7 @@ screen_resize_cursor(struct screen *s, u_int sx, u_int sy, int reflow,
if (sy != screen_size_y(s)) if (sy != screen_size_y(s))
screen_resize_y(s, sy, eat_empty, &cy); screen_resize_y(s, sy, eat_empty, &cy);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
image_free_all(s); image_free_all(s);
#endif #endif
@@ -692,7 +692,7 @@ int
screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor) screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor)
{ {
u_int sx, sy; u_int sx, sy;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct image *im; struct image *im;
#endif #endif
@@ -709,7 +709,7 @@ screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor)
} }
memcpy(&s->saved_cell, gc, sizeof s->saved_cell); memcpy(&s->saved_cell, gc, sizeof s->saved_cell);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
TAILQ_CONCAT(&s->saved_images, &s->images, entry); TAILQ_CONCAT(&s->saved_images, &s->images, entry);
TAILQ_FOREACH(im, &s->saved_images, entry) TAILQ_FOREACH(im, &s->saved_images, entry)
im->list = &s->saved_images; im->list = &s->saved_images;
@@ -728,7 +728,7 @@ int
screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor) screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor)
{ {
u_int sx = screen_size_x(s), sy = screen_size_y(s); u_int sx = screen_size_x(s), sy = screen_size_y(s);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct image *im; struct image *im;
#endif #endif
@@ -774,7 +774,7 @@ screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor)
grid_destroy(s->saved_grid); grid_destroy(s->saved_grid);
s->saved_grid = NULL; s->saved_grid = NULL;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
image_free_all(s); image_free_all(s);
TAILQ_CONCAT(&s->images, &s->saved_images, entry); TAILQ_CONCAT(&s->images, &s->saved_images, entry);
TAILQ_FOREACH(im, &s->images, entry) TAILQ_FOREACH(im, &s->images, entry)

14
tmux.h
View File

@@ -77,7 +77,7 @@ struct screen_write_cline;
struct screen_write_ctx; struct screen_write_ctx;
struct session; struct session;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct sixel_image; struct sixel_image;
#endif #endif
@@ -1037,7 +1037,7 @@ struct style {
u_int link; u_int link;
}; };
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* Image. */ /* Image. */
struct image { struct image {
struct screen *s; struct screen *s;
@@ -1113,7 +1113,7 @@ struct screen {
bitstr_t *tabs; bitstr_t *tabs;
struct screen_sel *sel; struct screen_sel *sel;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct images images; struct images images;
struct images saved_images; struct images saved_images;
#endif #endif
@@ -1904,7 +1904,7 @@ struct tty_ctx {
size_t size; size_t size;
} sel; } sel;
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
struct image *image; struct image *image;
#endif #endif
}; };
@@ -3005,7 +3005,7 @@ void tty_cmd_scrolldown(struct tty *, const struct tty_ctx *);
void tty_cmd_reverseindex(struct tty *, const struct tty_ctx *); void tty_cmd_reverseindex(struct tty *, const struct tty_ctx *);
void tty_cmd_setselection(struct tty *, const struct tty_ctx *); void tty_cmd_setselection(struct tty *, const struct tty_ctx *);
void tty_cmd_rawstring(struct tty *, const struct tty_ctx *); void tty_cmd_rawstring(struct tty *, const struct tty_ctx *);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
void tty_cmd_sixelimage(struct tty *, const struct tty_ctx *); void tty_cmd_sixelimage(struct tty *, const struct tty_ctx *);
void tty_draw_images(struct client *, struct window_pane *); void tty_draw_images(struct client *, struct window_pane *);
#endif #endif
@@ -3649,7 +3649,7 @@ void screen_write_setselection(struct screen_write_ctx *, const char *,
u_char *, u_int); u_char *, u_int);
void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int, void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int,
int); int);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
void screen_write_sixelimage(struct screen_write_ctx *, void screen_write_sixelimage(struct screen_write_ctx *,
struct sixel_image *, u_int); struct sixel_image *, u_int);
#endif #endif
@@ -4237,7 +4237,7 @@ void spawn_editor_finish(struct window_pane *);
/* regsub.c */ /* regsub.c */
char *regsub(const char *, const char *, const char *, int); char *regsub(const char *, const char *, const char *, int);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* image.c */ /* image.c */
int image_free_all(struct screen *); int image_free_all(struct screen *);
struct image *image_store(struct screen *, struct sixel_image *); struct image *image_store(struct screen *, struct sixel_image *);

8
tty.c
View File

@@ -68,7 +68,7 @@ static void tty_emulate_repeat(struct tty *, enum tty_code_code,
enum tty_code_code, u_int); enum tty_code_code, u_int);
static void tty_draw_pane(struct tty *, const struct tty_ctx *, u_int); static void tty_draw_pane(struct tty *, const struct tty_ctx *, u_int);
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
static void tty_write_one(void (*)(struct tty *, const struct tty_ctx *), static void tty_write_one(void (*)(struct tty *, const struct tty_ctx *),
struct client *, struct tty_ctx *); struct client *, struct tty_ctx *);
#endif #endif
@@ -1460,7 +1460,7 @@ tty_check_codeset(struct tty *tty, const struct grid_cell *gc)
return (&new); return (&new);
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* Update context for client. */ /* Update context for client. */
static int static int
tty_set_client_cb(struct tty_ctx *ttyctx, struct client *c) tty_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
@@ -1588,7 +1588,7 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *),
} }
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
/* Only write to the incoming tty instead of every client. */ /* Only write to the incoming tty instead of every client. */
static void static void
tty_write_one(void (*cmdfn)(struct tty *, const struct tty_ctx *), tty_write_one(void (*cmdfn)(struct tty *, const struct tty_ctx *),
@@ -2034,7 +2034,7 @@ tty_cmd_rawstring(struct tty *tty, const struct tty_ctx *ctx)
tty_invalidate(tty); tty_invalidate(tty);
} }
#ifdef ENABLE_SIXEL #ifdef ENABLE_IMAGES
void void
tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
{ {