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

init vtmachine: extract numeric arguments for sixel #1469

Browse Source
This commit is contained in:
nick black 2021-06-13 14:57:47 -04:00 committed by Nick Black
parent 398ebca5fd
commit 5fcce3d8b7
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/input.c
View File

@ -641,9 +641,24 @@ typedef struct init_state {
STATE_SIXEL_CREGS, // reading max color registers until 'S' STATE_SIXEL_CREGS, // reading max color registers until 'S'
STATE_XTSMGRAPHICS_DRAIN, // drain out XTSMGRAPHICS to 'S' STATE_XTSMGRAPHICS_DRAIN, // drain out XTSMGRAPHICS to 'S'
} state; } state;
int numeric; // currently-lexed numeric
bool xtgettcap_good; // high when we've received DCS 1 bool xtgettcap_good; // high when we've received DCS 1
} init_state; } init_state;
static int
ruts_numeric(int* numeric, unsigned char c){
if(!isdigit(c)){
return -1;
}
int digit = c - '0';
if(INT_MAX / 10 - digit < *numeric){ // would overflow
return -1;
}
*numeric *= 10;
*numeric += digit;
return 0;
}
// FIXME ought implement the full Williams automaton // FIXME ought implement the full Williams automaton
// FIXME doesn't handle 8-bit controls (would need convert UTF-8) // FIXME doesn't handle 8-bit controls (would need convert UTF-8)
// returns 1 after handling the Device Attributes response, 0 if more input // returns 1 after handling the Device Attributes response, 0 if more input
@ -663,6 +678,7 @@ pump_control_read(init_state* inits, unsigned char c){
// not an escape -- throw into user queue // not an escape -- throw into user queue
break; break;
case STATE_ESC: case STATE_ESC:
inits->numeric = 0;
if(c == '['){ if(c == '['){
inits->state = STATE_CSI; inits->state = STATE_CSI;
}else if(c == 'P'){ }else if(c == 'P'){
@ -790,8 +806,11 @@ pump_control_read(init_state* inits, unsigned char c){
break; break;
case STATE_SIXEL_CREGS: case STATE_SIXEL_CREGS:
if(c == 'S'){ if(c == 'S'){
// FIXME extract color register count fprintf(stderr, "%d color registers!\n", inits->numeric);
// FIXME set color register count
inits->state = STATE_NULL; inits->state = STATE_NULL;
}else if(ruts_numeric(&inits->numeric, c)){
return -1;
} }
break; break;
case STATE_DA_6: case STATE_DA_6:
@ -832,14 +851,21 @@ pump_control_read(init_state* inits, unsigned char c){
break; break;
case STATE_SIXEL_WIDTH: case STATE_SIXEL_WIDTH:
if(c == ';'){ if(c == ';'){
// FIXME extract width fprintf(stderr, "%d max sixel width!\n", inits->numeric);
// FIXME set width
inits->state = STATE_SIXEL_HEIGHT; inits->state = STATE_SIXEL_HEIGHT;
inits->numeric = 0;
}else if(ruts_numeric(&inits->numeric, c)){
return -1;
} }
break; break;
case STATE_SIXEL_HEIGHT: case STATE_SIXEL_HEIGHT:
if(c == 'S'){ if(c == 'S'){
// FIXME extract height fprintf(stderr, "%d max sixel height!\n", inits->numeric);
// FIXME set height
inits->state = STATE_NULL; inits->state = STATE_NULL;
}else if(ruts_numeric(&inits->numeric, c)){
return -1;
} }
break; break;
case STATE_XTSMGRAPHICS_DRAIN: case STATE_XTSMGRAPHICS_DRAIN: