mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-08-28 17:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use one image support switch

Browse Source
This commit is contained in:
Michael Grant
2026-08-06 14:27:07 +01:00
parent 596de59d11
commit 0b2739c62c
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -556,7 +556,6 @@ if test "x$with_image_support" = xyes; then
AC_MSG_ERROR("image support requires libpng 1.6 and zlib")
)
AC_DEFINE(ENABLE_IMAGES)
AC_DEFINE(ENABLE_SIXEL)
fi
AM_CONDITIONAL(ENABLE_IMAGES, [test "x$with_image_support" = xyes])

8
input.c
View File

@@ -1592,7 +1592,7 @@ input_csi_dispatch(struct input_ctx *ictx)
case -1:
break;
case 0:
#ifdef ENABLE_SIXEL
#ifdef ENABLE_IMAGES
input_reply(ictx, 1, "\033[?1;2;4c");
#else
input_reply(ictx, 1, "\033[?1;2c");
@@ -2110,7 +2110,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_IMAGES
int n, m, o;
if (ictx->param_list_len > 3)
@@ -2635,7 +2635,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_IMAGES
struct window *w;
struct sixel_image *si;
int p2;
@@ -2663,7 +2663,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
}
#endif
#ifdef ENABLE_SIXEL
#ifdef ENABLE_IMAGES
if (wp != NULL && buf[0] == 'q' && ictx->interm_len == 0) {
w = wp->window;
if (input_split(ictx) != 0)

2
screen-write.c
View File

@@ -3072,7 +3072,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_IMAGES
/* Write a SIXEL image. */
void
screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si,

8
tmux.h
View File

@@ -81,7 +81,7 @@ struct image;
struct image_backend;
struct image_rectangle;
#endif
#ifdef ENABLE_SIXEL
#ifdef ENABLE_IMAGES
struct sixel_image;
#endif
@@ -1877,7 +1877,7 @@ struct tty_ctx {
size_t size;
} sel;
#ifdef ENABLE_SIXEL
#ifdef ENABLE_IMAGES
struct image *image;
#endif
};
@@ -3640,7 +3640,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_IMAGES
void screen_write_sixelimage(struct screen_write_ctx *,
struct sixel_image *, u_int);
#endif
@@ -4295,7 +4295,7 @@ void kitty_free_output(struct tty *, int);
void kitty_geometry_changed(struct tty *);
#endif
#ifdef ENABLE_SIXEL
#ifdef ENABLE_IMAGES
/* image-sixel.c */
#define SIXEL_COLOUR_REGISTERS 1024
void sixel_draw_rectangle(struct tty *,