From fd0bb6f84355611b43a0af2fe55db87c37bdcb2e Mon Sep 17 00:00:00 2001 From: nick black Date: Sun, 14 Mar 2021 07:22:49 -0400 Subject: [PATCH] sixel: get maximum geometry supported #1389 --- src/lib/internal.h | 4 +--- src/lib/terminfo.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/internal.h b/src/lib/internal.h index 207cacbc7..84b0a845a 100644 --- a/src/lib/internal.h +++ b/src/lib/internal.h @@ -294,9 +294,7 @@ typedef struct tinfo { uint32_t bg_collides_default; pthread_mutex_t pixel_query; // only query for pixel support once int color_registers; // sixel color registers (post pixel_query_done) - // FIXME at least xterm caps its "maximum graphics geometry" by the current - // window geometry. i don't want to requery on resize, so these are useless. - //int sixel_maxx, sixel_maxy; // sixel size maxima (post pixel_query_done) + int sixel_maxx, sixel_maxy; // sixel size maxima (post pixel_query_done) bool sixel_supported; // do we support sixel (post pixel_query_done)? bool pixel_query_done; // have we yet performed pixel query? bool sextants; // do we have (good, vetted) Unicode 13 sextant support? diff --git a/src/lib/terminfo.c b/src/lib/terminfo.c index 764e1747b..5471f5577 100644 --- a/src/lib/terminfo.c +++ b/src/lib/terminfo.c @@ -294,11 +294,9 @@ query_sixel_details(tinfo* ti, int fd){ if(query_xtsmgraphics(fd, "\x1b[?1;1;0S", &ti->color_registers, NULL)){ return -1; } - /* - if(query_xtsmgraphics(fd, "\x1b[?2;1;0S", &ti->sixel_maxx, &ti->sixel_maxy)){ + if(query_xtsmgraphics(fd, "\x1b[?2;4;0S", &ti->sixel_maxx, &ti->sixel_maxy)){ return -1; } - */ //fprintf(stderr, "Sixel ColorRegs: %d Max_x: %d Max_y: %d\n", ti->color_registers, ti->sixel_maxx, ti->sixel_maxy); return 0; }