From 56c58c41f900ca7d7568068a32d8d9d46940e77e Mon Sep 17 00:00:00 2001 From: nick black Date: Sun, 13 Jun 2021 15:25:08 -0400 Subject: [PATCH] removed accursed alacritty_sixel_hack, hurrah! --- src/lib/input.c | 8 ++++---- src/lib/termdesc.c | 1 - src/lib/termdesc.h | 7 ------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/lib/input.c b/src/lib/input.c index 21784d4d3..9ac560fe2 100644 --- a/src/lib/input.c +++ b/src/lib/input.c @@ -665,11 +665,11 @@ ruts_numeric(int* numeric, unsigned char c){ // ought be fed to the machine, and -1 on an invalid state transition. static int pump_control_read(init_state* inits, unsigned char c){ - fprintf(stderr, "state: %2d char: %1c %3d %02x\n", inits->state, isprint(c) ? c : ' ', c, c); +//fprintf(stderr, "state: %2d char: %1c %3d %02x\n", inits->state, isprint(c) ? c : ' ', c, c); if(c == NCKEY_ESC){ - if(inits->state != STATE_NULL && inits->state != STATE_DCS && inits->state != STATE_DCS_DRAIN && inits->state != STATE_XTVERSION2 && inits->state != STATE_XTGETTCAP3 && inits->state != STATE_DA_DRAIN){ + /*if(inits->state != STATE_NULL && inits->state != STATE_DCS && inits->state != STATE_DCS_DRAIN && inits->state != STATE_XTVERSION2 && inits->state != STATE_XTGETTCAP3 && inits->state != STATE_DA_DRAIN){ fprintf(stderr, "Unexpected escape in state %d\n", inits->state); - } + }*/ inits->state = STATE_ESC; return 0; } @@ -684,7 +684,7 @@ pump_control_read(init_state* inits, unsigned char c){ }else if(c == 'P'){ inits->state = STATE_DCS; }else if(c == '\\'){ - fprintf(stderr, "string terminator -- parse previous response FIXME\n"); +//fprintf(stderr, "string terminator -- parse previous response FIXME\n"); // FIXME only now do we parse e.g. XTGETTCAP response inits->state = STATE_NULL; } diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c index 1eb7c1fe9..3666ae920 100644 --- a/src/lib/termdesc.c +++ b/src/lib/termdesc.c @@ -94,7 +94,6 @@ apply_term_heuristics(tinfo* ti, const char* termname, int fd){ setup_kitty_bitmaps(ti, fd); }else if(strstr(termname, "alacritty")){ termname = "Alacritty"; - ti->alacritty_sixel_hack = true; ti->quadrants = true; // ti->sextants = true; // alacritty https://github.com/alacritty/alacritty/issues/4409 */ ti->RGBflag = true; diff --git a/src/lib/termdesc.h b/src/lib/termdesc.h index 7c47e2161..d5017646b 100644 --- a/src/lib/termdesc.h +++ b/src/lib/termdesc.h @@ -144,13 +144,6 @@ typedef struct tinfo { bool sextants; // do we have (good, vetted) Unicode 13 sextant support? bool braille; // do we have Braille support? (linux console does not) - // alacritty went rather off the reservation for their sixel support. they - // reply to DSA with CSI?6c, meaning VT102, but no VT102 had Sixel support, - // so if the TERM variable contains "alacritty", *and* we get VT102, we go - // ahead and query XTSMGRAPHICS. - // FIXME we can get rid of this with proper input handling #1469 - bool alacritty_sixel_hack; - // mlterm resets the cursor (i.e. makes it visible) any time you print // a sprixel. we work around this spiritedly unorthodox decision. bool sprixel_cursor_hack; // do sprixels reset the cursor? (mlterm)