circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Add enable-sixel option." 

This reverts commit 71dc6d7138.
pull/3592/head
topcat001 2023-06-07 18:47:58 -07:00
parent 54606f456f
commit 7ef0296155
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input.c
View File

@ -2245,7 +2245,6 @@ input_dcs_dispatch(struct input_ctx *ictx)
#ifdef ENABLE_SIXEL
struct window *w = wp->window;
struct sixel_image *si;
long long enable_sixel = 0;
#endif
if (wp == NULL)
@ -2264,8 +2263,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
}
#ifdef ENABLE_SIXEL
enable_sixel = options_get_number(wp->options, "enable-sixel");
if (enable_sixel && buf[0] == 'q') {
if (buf[0] == 'q') {
si = sixel_parse(buf, len, w->xpixel, w->ypixel);
if (si != NULL) {
sixel_log(si);

12
options-table.c
View File

@ -93,9 +93,6 @@ static const char *options_table_extended_keys_list[] = {
static const char *options_table_allow_passthrough_list[] = {
"off", "on", "all", NULL
};
static const char *options_table_enable_sixel_list[] = {
"off", "on", NULL
};
/* Status line format. */
#define OPTIONS_TABLE_STATUS_FORMAT1 \
@ -903,15 +900,6 @@ const struct options_table_entry options_table[] = {
.text = "Style of the marked line in copy mode."
},
{ .name = "enable-sixel",
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
.choices = options_table_enable_sixel_list,
.default_num = 0,
.text = "Whether sixel sequences are allowed "
"Can be 'off' (disallowed), or 'on' (allowed)."
},
{ .name = "fill-character",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,

2
tty.c
View File

@ -2239,7 +2239,7 @@ tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
int fallback = 0;
if ((~tty->term->flags & TERM_SIXEL) &&
!tty_term_has(tty->term, TTYC_SXL))
!tty_term_has(tty->term, TTYC_SXL))
fallback = 1;
if (tty->xpixel == 0 || tty->ypixel == 0)
fallback = 1;