From aefdb348466fc451f7c007a77826d831dd11c586 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 2 Mar 2026 17:10:19 +0000 Subject: [PATCH] rename: ENABLE_SIXEL to ENABLE_SIXEL_IMAGES --- Makefile.am | 2 +- configure.ac | 4 ++-- format.c | 4 ++-- input.c | 8 ++++---- screen-redraw.c | 2 +- screen-write.c | 40 ++++++++++++++++++++-------------------- screen.c | 12 ++++++------ tmux.h | 14 +++++++------- tty.c | 10 +++++----- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9f424d7b..757bcca9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -232,7 +232,7 @@ nodist_tmux_SOURCES += compat/utf8proc.c endif # Enable sixel support. -if ENABLE_SIXEL +if ENABLE_SIXEL_IMAGES dist_tmux_SOURCES += image.c image-sixel.c endif diff --git a/configure.ac b/configure.ac index b91126ae..21377697 100644 --- a/configure.ac +++ b/configure.ac @@ -477,9 +477,9 @@ AC_ARG_ENABLE( ) if test "x$enable_sixel_images" = xyes; then - AC_DEFINE(ENABLE_SIXEL) + AC_DEFINE(ENABLE_SIXEL_IMAGES) fi -AM_CONDITIONAL(ENABLE_SIXEL, [test "x$enable_sixel_images" = xyes]) +AM_CONDITIONAL(ENABLE_SIXEL_IMAGES, [test "x$enable_sixel_images" = xyes]) # Enable kitty graphics protocol support. AC_ARG_ENABLE( diff --git a/format.c b/format.c index a0819a68..4afd6972 100644 --- a/format.c +++ b/format.c @@ -2564,11 +2564,11 @@ format_cb_version(__unused struct format_tree *ft) static void * format_cb_image_support(__unused struct format_tree *ft) { -#if defined(ENABLE_SIXEL) && defined(ENABLE_KITTY_IMAGES) +#if defined(ENABLE_SIXEL_IMAGES) && defined(ENABLE_KITTY_IMAGES) return (xstrdup("kitty,sixel")); #endif -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES return (xstrdup("sixel")); #endif diff --git a/input.c b/input.c index a32d2bab..e3323aa8 100644 --- a/input.c +++ b/input.c @@ -1561,7 +1561,7 @@ input_csi_dispatch(struct input_ctx *ictx) case -1: break; case 0: -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES input_reply(ictx, 1, "\033[?1;2;4c"); #else input_reply(ictx, 1, "\033[?1;2c"); @@ -2035,7 +2035,7 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx) static void input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx) { -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES int n, m, o; if (ictx->param_list_len > 3) @@ -2560,7 +2560,7 @@ input_dcs_dispatch(struct input_ctx *ictx) const char prefix[] = "tmux;"; const u_int prefixlen = (sizeof prefix) - 1; long long allow_passthrough = 0; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES struct window *w; struct sixel_image *si; int p2; @@ -2575,7 +2575,7 @@ input_dcs_dispatch(struct input_ctx *ictx) return (0); } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES w = wp->window; if (buf[0] == 'q' && ictx->interm_len == 0) { if (input_split(ictx) != 0) diff --git a/screen-redraw.c b/screen-redraw.c index 380861fd..17de6962 100644 --- a/screen-redraw.c +++ b/screen-redraw.c @@ -1016,7 +1016,7 @@ screen_redraw_draw_pane(struct screen_redraw_ctx *ctx, struct window_pane *wp) } } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES tty_draw_images(c, wp, s); #endif } diff --git a/screen-write.c b/screen-write.c index 30f73d86..fc9efc50 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1072,7 +1072,7 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx) memcpy(&gc, &grid_default_cell, sizeof gc); utf8_set(&gc.data, 'E'); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_free_all(s) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1111,7 +1111,7 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg) if (s->cx > screen_size_x(s) - 1) return; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1144,7 +1144,7 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg) if (s->cx > screen_size_x(s) - 1) return; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1177,7 +1177,7 @@ screen_write_clearcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg) if (s->cx > screen_size_x(s) - 1) return; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1200,14 +1200,14 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny, u_int bg) struct grid *gd = s->grid; struct tty_ctx ttyctx; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES u_int sy = screen_size_y(s); #endif if (ny == 0) ny = 1; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1260,7 +1260,7 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny, u_int bg) if (ny == 0) ny = 1; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1313,7 +1313,7 @@ screen_write_clearline(struct screen_write_ctx *ctx, u_int bg) if (gl->cellsize == 0 && COLOUR_DEFAULT(bg)) return; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1347,7 +1347,7 @@ screen_write_clearendofline(struct screen_write_ctx *ctx, u_int bg) if (s->cx > sx - 1 || (s->cx >= gl->cellsize && COLOUR_DEFAULT(bg))) return; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1374,7 +1374,7 @@ screen_write_clearstartofline(struct screen_write_ctx *ctx, u_int bg) return; } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1422,7 +1422,7 @@ screen_write_reverseindex(struct screen_write_ctx *ctx, u_int bg) struct tty_ctx ttyctx; if (s->cy == s->rupper) { -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_free_all(s) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1469,7 +1469,7 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped, u_int bg) struct screen *s = ctx->s; struct grid *gd = s->grid; struct grid_line *gl; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES int redraw = 0; #endif u_int rupper = s->rupper, rlower = s->rlower; @@ -1487,7 +1487,7 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped, u_int bg) } if (s->cy == s->rlower) { -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (rlower == screen_size_y(s) - 1) redraw = image_scroll_up(s, 1); else @@ -1520,7 +1520,7 @@ screen_write_scrollup(struct screen_write_ctx *ctx, u_int lines, u_int bg) ctx->bg = bg; } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_scroll_up(s, lines) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1549,7 +1549,7 @@ screen_write_scrolldown(struct screen_write_ctx *ctx, u_int lines, u_int bg) else if (lines > s->rlower - s->rupper + 1) lines = s->rlower - s->rupper + 1; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_free_all(s) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1578,7 +1578,7 @@ screen_write_clearendofscreen(struct screen_write_ctx *ctx, u_int bg) struct tty_ctx ttyctx; u_int sx = screen_size_x(s), sy = screen_size_y(s); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1612,7 +1612,7 @@ screen_write_clearstartofscreen(struct screen_write_ctx *ctx, u_int bg) struct tty_ctx ttyctx; u_int sx = screen_size_x(s); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_line(s, 0, s->cy - 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1640,7 +1640,7 @@ screen_write_clearscreen(struct screen_write_ctx *ctx, u_int bg) struct tty_ctx ttyctx; u_int sx = screen_size_x(s), sy = screen_size_y(s); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_free_all(s) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -1957,7 +1957,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx) } } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES if (image_check_area(s, s->cx, s->cy, ci->used, 1) && ctx->wp != NULL) ctx->wp->flags |= PANE_REDRAW; #endif @@ -2398,7 +2398,7 @@ screen_write_rawstring(struct screen_write_ctx *ctx, u_char *str, u_int len, tty_write(tty_cmd_rawstring, &ttyctx); } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES /* Write a SIXEL image. */ void screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si, diff --git a/screen.c b/screen.c index a07a8e8c..316f7311 100644 --- a/screen.c +++ b/screen.c @@ -89,7 +89,7 @@ screen_init(struct screen *s, u_int sx, u_int sy, u_int hlimit) s->tabs = NULL; s->sel = NULL; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES TAILQ_INIT(&s->images); TAILQ_INIT(&s->saved_images); #endif @@ -127,7 +127,7 @@ screen_reinit(struct screen *s) screen_clear_selection(s); screen_free_titles(s); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES image_free_all(s); #endif @@ -164,7 +164,7 @@ screen_free(struct screen *s) hyperlinks_free(s->hyperlinks); screen_free_titles(s); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES image_free_all(s); #endif } @@ -324,7 +324,7 @@ screen_resize_cursor(struct screen *s, u_int sx, u_int sy, int reflow, if (sy != screen_size_y(s)) screen_resize_y(s, sy, eat_empty, &cy); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES image_free_all(s); #endif @@ -649,7 +649,7 @@ screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor) } memcpy(&s->saved_cell, gc, sizeof s->saved_cell); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES TAILQ_CONCAT(&s->saved_images, &s->images, entry); #endif @@ -707,7 +707,7 @@ screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor) grid_destroy(s->saved_grid); s->saved_grid = NULL; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES image_free_all(s); TAILQ_CONCAT(&s->images, &s->saved_images, entry); #endif diff --git a/tmux.h b/tmux.h index 1619128e..5ffb77e9 100644 --- a/tmux.h +++ b/tmux.h @@ -68,7 +68,7 @@ struct screen_write_cline; struct screen_write_ctx; struct session; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES struct sixel_image; #endif @@ -930,7 +930,7 @@ struct style { enum style_default_type default_type; }; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES /* Image. */ struct image { struct screen *s; @@ -1027,7 +1027,7 @@ struct screen { bitstr_t *tabs; struct screen_sel *sel; -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES struct images images; struct images saved_images; #endif @@ -2664,7 +2664,7 @@ struct visible_ranges *tty_check_overlay_range(struct tty *, u_int, u_int, void tty_draw_line(struct tty *, struct screen *, u_int, u_int, u_int, u_int, u_int, const struct grid_cell *, struct colour_palette *); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES void tty_draw_images(struct client *, struct window_pane *, struct screen *); #endif @@ -2698,7 +2698,7 @@ void tty_cmd_reverseindex(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 *); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES void tty_cmd_sixelimage(struct tty *, const struct tty_ctx *); #endif @@ -3311,7 +3311,7 @@ void screen_write_setselection(struct screen_write_ctx *, const char *, u_char *, u_int); void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int, int); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES void screen_write_sixelimage(struct screen_write_ctx *, struct sixel_image *, u_int); #endif @@ -3779,7 +3779,7 @@ struct window_pane *spawn_pane(struct spawn_context *, char **); /* regsub.c */ char *regsub(const char *, const char *, const char *, int); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES /* image.c */ int image_free_all(struct screen *); struct image *image_store(struct screen *, struct sixel_image *); diff --git a/tty.c b/tty.c index 49e8e684..50cdee5f 100644 --- a/tty.c +++ b/tty.c @@ -67,7 +67,7 @@ static void tty_emulate_repeat(struct tty *, enum tty_code_code, static void tty_draw_pane(struct tty *, const struct tty_ctx *, u_int); static int tty_check_overlay(struct tty *, u_int, u_int); -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES static void tty_write_one(void (*)(struct tty *, const struct tty_ctx *), struct client *, struct tty_ctx *); #endif @@ -1459,7 +1459,7 @@ tty_check_overlay_range(struct tty *tty, u_int px, u_int py, u_int nx) return (c->overlay_check(c, c->overlay_data, px, py, nx)); } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES /* Update context for client. */ static int tty_set_client_cb(struct tty_ctx *ttyctx, struct client *c) @@ -1485,7 +1485,7 @@ tty_set_client_cb(struct tty_ctx *ttyctx, struct client *c) void tty_draw_images(struct client *c, struct window_pane *wp, struct screen *s) { -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES struct image *im; struct tty_ctx ttyctx; @@ -1588,7 +1588,7 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *), } } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES /* Only write to the incoming tty instead of every client. */ static void tty_write_one(void (*cmdfn)(struct tty *, const struct tty_ctx *), @@ -2113,7 +2113,7 @@ tty_cmd_rawstring(struct tty *tty, const struct tty_ctx *ctx) tty_invalidate(tty); } -#ifdef ENABLE_SIXEL +#ifdef ENABLE_SIXEL_IMAGES void tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx) {