Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

send DA following XTSMGRAPHICS #1469

Browse Source
This commit is contained in:
nick black 2021-06-06 06:29:17 -04:00 committed by Nick Black
parent 8f0324547e
commit 60c030e232
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/termdesc.c
View File

@ -448,15 +448,27 @@ query_xtsmgraphics(int fd, const char* seq, int* val, int* val2){
return 0; return 0;
} }
// Device Attributes; replies with (depending on decTerminalID resource):
// ⇒ CSI ? 1 ; 2 c ("VT100 with Advanced Video Option")
// ⇒ CSI ? 1 ; 0 c ("VT101 with No Options")
// ⇒ CSI ? 4 ; 6 c ("VT132 with Advanced Video and Graphics")
// ⇒ CSI ? 6 c ("VT102")
// ⇒ CSI ? 7 c ("VT131")
// ⇒ CSI ? 1 2 ; Ps c ("VT125")
// ⇒ CSI ? 6 2 ; Ps c ("VT220")
// ⇒ CSI ? 6 3 ; Ps c ("VT320")
// ⇒ CSI ? 6 4 ; Ps c ("VT420")
#define ESC_DA "\e[c"
// query for Sixel details including the number of color registers and, one day // query for Sixel details including the number of color registers and, one day
// perhaps, maximum geometry. xterm binds its return by the current geometry, // perhaps, maximum geometry. xterm binds its return by the current geometry,
// making it useless for a one-time query. // making it useless for a one-time query.
static int static int
query_sixel_details(tinfo* ti, int fd){ query_sixel_details(tinfo* ti, int fd){
if(query_xtsmgraphics(fd, "\x1b[?2;4;0S", &ti->sixel_maxx, &ti->sixel_maxy)){ if(query_xtsmgraphics(fd, "\x1b[?2;4;0S" ESC_DA, &ti->sixel_maxx, &ti->sixel_maxy)){
return -1; return -1;
} }
if(query_xtsmgraphics(fd, "\x1b[?1;1;0S", &ti->color_registers, NULL)){ if(query_xtsmgraphics(fd, "\x1b[?1;1;0S" ESC_DA, &ti->color_registers, NULL)){
return -1; return -1;
} }
//fprintf(stderr, "Sixel ColorRegs: %d Max_x: %d Max_y: %d\n", ti->color_registers, ti->sixel_maxx, ti->sixel_maxy); //fprintf(stderr, "Sixel ColorRegs: %d Max_x: %d Max_y: %d\n", ti->color_registers, ti->sixel_maxx, ti->sixel_maxy);
@ -466,8 +478,7 @@ query_sixel_details(tinfo* ti, int fd){
// query for Sixel support // query for Sixel support
static int static int
query_sixel(tinfo* ti, int fd){ query_sixel(tinfo* ti, int fd){
// Send Device Attributes (see decTerminalID resource) if(writen(fd, ESC_DA, strlen(ESC_DA)) != 3){
if(writen(fd, "\x1b[c", 3) != 3){
return -1; return -1;
} }
char in; char in;
@ -506,6 +517,9 @@ query_sixel(tinfo* ti, int fd){
} }
state = WANT_C4; state = WANT_C4;
}else if(in == 'c'){ }else if(in == 'c'){
if(in4){
setup_sixel_bitmaps(ti);
}
state = DONE; state = DONE;
}else if(in == '6'){ }else if(in == '6'){
state = WANT_VT102_C; state = WANT_VT102_C;
@ -514,11 +528,9 @@ query_sixel(tinfo* ti, int fd){
break; break;
case WANT_VT102_C: case WANT_VT102_C:
if(in == 'c'){ if(in == 'c'){
// until graphics/ayosec is merged, alacritty doesn't actually if(ti->alacritty_sixel_hack){
// have sixel support. enable this then. FIXME
/*if(ti->alacritty_sixel_hack){
setup_sixel_bitmaps(ti); setup_sixel_bitmaps(ti);
}*/ }
state = DONE; state = DONE;
}else if(in == ';'){ }else if(in == ';'){
state = WANT_C4; state = WANT_C4;

1
src/lib/termdesc.h
View File

@ -139,6 +139,7 @@ typedef struct tinfo {
// reply to DSA with CSI?6c, meaning VT102, but no VT102 had Sixel support, // 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 // so if the TERM variable contains "alacritty", *and* we get VT102, we go
// ahead and query XTSMGRAPHICS. // ahead and query XTSMGRAPHICS.
// FIXME we can get rid of this with proper input handling #1469
bool alacritty_sixel_hack; bool alacritty_sixel_hack;
// mlterm resets the cursor (i.e. makes it visible) any time you print // mlterm resets the cursor (i.e. makes it visible) any time you print