espterm
/
espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser cleanup for adding new hash and short ESC sequences (issue #41) - EDM tbd

Browse Source
pull/111/merge
Ondřej Hruška 7 years ago
parent 12385b7a5f
commit c8067122d5
5 changed files with 142 additions and 124 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 201
      user/ansi_parser.c
  2. 7
      user/ansi_parser.h
  3. 15
      user/ansi_parser.rl
  4. 36
      user/ansi_parser_callbacks.c
  5. 7
      user/ansi_parser_callbacks.h

201
user/ansi_parser.c
Unescape View File

@ -11,23 +11,23 @@ static const char _ansi_actions[] = {
0, 1, 0, 1, 1, 1, 2, 1, 0, 1, 0, 1, 1, 1, 2, 1,
3, 1, 4, 1, 5, 1, 6, 1, 3, 1, 4, 1, 5, 1, 6, 1,
7, 1, 8, 1, 9, 1, 10, 1, 7, 1, 8, 1, 9, 1, 10, 1,
11, 1, 12, 1, 13, 1, 14, 2, 11, 1, 12, 1, 13, 2, 9, 10,
9, 10, 2, 9, 11 2, 9, 11
}; };
static const char _ansi_eof_actions[] = { static const char _ansi_eof_actions[] = {
0, 13, 13, 13, 13, 13, 13, 13, 0, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
0, 0, 0, 0, 0 13, 0, 0, 0, 0, 0
}; };
static const int ansi_start = 1; static const int ansi_start = 1;
static const int ansi_first_final = 24; static const int ansi_first_final = 25;
static const int ansi_error = 0; static const int ansi_error = 0;
static const int ansi_en_CSI_body = 3; static const int ansi_en_CSI_body = 4;
static const int ansi_en_OSC_body = 5; static const int ansi_en_OSC_body = 6;
static const int ansi_en_main = 1; static const int ansi_en_main = 1;
@ -114,20 +114,30 @@ case 1:
goto tr0; goto tr0;
case 2: case 2:
switch( (*p) ) { switch( (*p) ) {
case 55: goto tr3; case 35: goto tr3;
case 56: goto tr4;
case 91: goto tr5; case 91: goto tr5;
case 93: goto tr6; case 93: goto tr6;
case 99: goto tr7;
} }
if ( (*p) < 65 ) {
if ( 48 <= (*p) && (*p) <= 57 )
goto tr4;
} else if ( (*p) > 90 ) {
if ( 97 <= (*p) && (*p) <= 122 )
goto tr4;
} else
goto tr4;
goto tr2; goto tr2;
case 0: case 0:
goto _out; goto _out;
case 24: case 3:
if ( 48 <= (*p) && (*p) <= 57 )
goto tr7;
goto tr2;
case 25:
if ( (*p) == 27 ) if ( (*p) == 27 )
goto tr1; goto tr1;
goto tr0; goto tr0;
case 3: case 4:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr10; goto tr10;
if ( (*p) < 60 ) { if ( (*p) < 60 ) {
@ -145,7 +155,7 @@ case 3:
} else } else
goto tr8; goto tr8;
goto tr2; goto tr2;
case 4: case 5:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr10; goto tr10;
if ( (*p) < 65 ) { if ( (*p) < 65 ) {
@ -157,100 +167,100 @@ case 4:
} else } else
goto tr11; goto tr11;
goto tr2; goto tr2;
case 25: case 26:
goto tr2; goto tr2;
case 5: case 6:
switch( (*p) ) { switch( (*p) ) {
case 66: goto tr12; case 66: goto tr12;
case 84: goto tr13; case 84: goto tr13;
case 87: goto tr14; case 87: goto tr14;
} }
goto tr2; goto tr2;
case 6: case 7:
if ( (*p) == 84 ) if ( (*p) == 84 )
goto tr15; goto tr15;
goto tr2; goto tr2;
case 7: case 8:
if ( (*p) == 78 ) if ( (*p) == 78 )
goto tr16; goto tr16;
goto tr2; goto tr2;
case 8: case 9:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr17; goto tr17;
goto tr2; goto tr2;
case 9: case 10:
if ( (*p) == 61 ) if ( (*p) == 61 )
goto tr18; goto tr18;
goto tr2; goto tr2;
case 10: case 11:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr20; case 7: goto tr20;
case 27: goto tr21; case 27: goto tr21;
} }
goto tr19; goto tr19;
case 26: case 27:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr20; case 7: goto tr20;
case 27: goto tr21; case 27: goto tr21;
} }
goto tr19; goto tr19;
case 11: case 12:
if ( (*p) == 92 ) if ( (*p) == 92 )
goto tr22; goto tr22;
goto tr2; goto tr2;
case 27: case 28:
goto tr2; goto tr2;
case 12: case 13:
if ( (*p) == 73 ) if ( (*p) == 73 )
goto tr23; goto tr23;
goto tr2; goto tr2;
case 13: case 14:
if ( (*p) == 84 ) if ( (*p) == 84 )
goto tr24; goto tr24;
goto tr2; goto tr2;
case 14: case 15:
if ( (*p) == 76 ) if ( (*p) == 76 )
goto tr25; goto tr25;
goto tr2; goto tr2;
case 15: case 16:
if ( (*p) == 69 ) if ( (*p) == 69 )
goto tr26; goto tr26;
goto tr2; goto tr2;
case 16: case 17:
if ( (*p) == 61 ) if ( (*p) == 61 )
goto tr27; goto tr27;
goto tr2; goto tr2;
case 17: case 18:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr29; case 7: goto tr29;
case 27: goto tr30; case 27: goto tr30;
} }
goto tr28; goto tr28;
case 28: case 29:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr29; case 7: goto tr29;
case 27: goto tr30; case 27: goto tr30;
} }
goto tr28; goto tr28;
case 18: case 19:
if ( (*p) == 92 ) if ( (*p) == 92 )
goto tr31; goto tr31;
goto tr2; goto tr2;
case 19: case 20:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr32; goto tr32;
goto tr2; goto tr2;
case 20: case 21:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr33; goto tr33;
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr32; goto tr32;
goto tr2; goto tr2;
case 21: case 22:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr34; goto tr34;
goto tr2; goto tr2;
case 22: case 23:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr35; case 7: goto tr35;
case 27: goto tr36; case 27: goto tr36;
@ -258,7 +268,7 @@ case 22:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr34; goto tr34;
goto tr2; goto tr2;
case 23: case 24:
if ( (*p) == 92 ) if ( (*p) == 92 )
goto tr35; goto tr35;
goto tr2; goto tr2;
@ -267,58 +277,57 @@ case 23:
tr2: cs = 0; goto f0; tr2: cs = 0; goto f0;
tr0: cs = 1; goto f1; tr0: cs = 1; goto f1;
tr1: cs = 2; goto _again; tr1: cs = 2; goto _again;
tr8: cs = 4; goto f7; tr3: cs = 3; goto _again;
tr9: cs = 4; goto f8; tr8: cs = 5; goto f6;
tr10: cs = 4; goto f9; tr9: cs = 5; goto f7;
tr12: cs = 6; goto _again; tr10: cs = 5; goto f8;
tr15: cs = 7; goto _again; tr12: cs = 7; goto _again;
tr16: cs = 8; goto _again; tr15: cs = 8; goto _again;
tr17: cs = 9; goto f8; tr16: cs = 9; goto _again;
tr18: cs = 10; goto _again; tr17: cs = 10; goto f7;
tr19: cs = 10; goto f11; tr18: cs = 11; goto _again;
tr21: cs = 11; goto _again; tr19: cs = 11; goto f10;
tr13: cs = 12; goto _again; tr21: cs = 12; goto _again;
tr23: cs = 13; goto _again; tr13: cs = 13; goto _again;
tr24: cs = 14; goto _again; tr23: cs = 14; goto _again;
tr25: cs = 15; goto _again; tr24: cs = 15; goto _again;
tr26: cs = 16; goto _again; tr25: cs = 16; goto _again;
tr27: cs = 17; goto _again; tr26: cs = 17; goto _again;
tr28: cs = 17; goto f11; tr27: cs = 18; goto _again;
tr30: cs = 18; goto _again; tr28: cs = 18; goto f10;
tr14: cs = 19; goto _again; tr30: cs = 19; goto _again;
tr32: cs = 20; goto f8; tr14: cs = 20; goto _again;
tr33: cs = 21; goto f9; tr32: cs = 21; goto f7;
tr34: cs = 22; goto f8; tr33: cs = 22; goto f8;
tr36: cs = 23; goto _again; tr34: cs = 23; goto f7;
tr3: cs = 24; goto f2; tr36: cs = 24; goto _again;
tr4: cs = 24; goto f3; tr4: cs = 25; goto f2;
tr5: cs = 24; goto f4; tr5: cs = 25; goto f3;
tr6: cs = 24; goto f5; tr6: cs = 25; goto f4;
tr7: cs = 24; goto f6; tr7: cs = 25; goto f5;
tr11: cs = 25; goto f10; tr11: cs = 26; goto f9;
tr20: cs = 26; goto f12; tr20: cs = 27; goto f11;
tr22: cs = 27; goto f13; tr22: cs = 28; goto f12;
tr31: cs = 27; goto f15; tr31: cs = 28; goto f14;
tr35: cs = 27; goto f16; tr35: cs = 28; goto f15;
tr29: cs = 28; goto f14; tr29: cs = 29; goto f13;
f1: _acts = _ansi_actions + 1; goto execFuncs; f1: _acts = _ansi_actions + 1; goto execFuncs;
f4: _acts = _ansi_actions + 3; goto execFuncs; f3: _acts = _ansi_actions + 3; goto execFuncs;
f7: _acts = _ansi_actions + 5; goto execFuncs; f6: _acts = _ansi_actions + 5; goto execFuncs;
f8: _acts = _ansi_actions + 7; goto execFuncs; f7: _acts = _ansi_actions + 7; goto execFuncs;
f9: _acts = _ansi_actions + 9; goto execFuncs; f8: _acts = _ansi_actions + 9; goto execFuncs;
f10: _acts = _ansi_actions + 11; goto execFuncs; f9: _acts = _ansi_actions + 11; goto execFuncs;
f0: _acts = _ansi_actions + 13; goto execFuncs; f0: _acts = _ansi_actions + 13; goto execFuncs;
f5: _acts = _ansi_actions + 15; goto execFuncs; f4: _acts = _ansi_actions + 15; goto execFuncs;
f16: _acts = _ansi_actions + 17; goto execFuncs; f15: _acts = _ansi_actions + 17; goto execFuncs;
f11: _acts = _ansi_actions + 19; goto execFuncs; f10: _acts = _ansi_actions + 19; goto execFuncs;
f15: _acts = _ansi_actions + 21; goto execFuncs; f14: _acts = _ansi_actions + 21; goto execFuncs;
f13: _acts = _ansi_actions + 23; goto execFuncs; f12: _acts = _ansi_actions + 23; goto execFuncs;
f6: _acts = _ansi_actions + 25; goto execFuncs; f5: _acts = _ansi_actions + 25; goto execFuncs;
f2: _acts = _ansi_actions + 27; goto execFuncs; f2: _acts = _ansi_actions + 27; goto execFuncs;
f3: _acts = _ansi_actions + 29; goto execFuncs; f13: _acts = _ansi_actions + 29; goto execFuncs;
f14: _acts = _ansi_actions + 31; goto execFuncs; f11: _acts = _ansi_actions + 32; goto execFuncs;
f12: _acts = _ansi_actions + 34; goto execFuncs;
execFuncs: execFuncs:
_nacts = *_acts++; _nacts = *_acts++;
@ -342,7 +351,7 @@ execFuncs:
csi_n[i] = 0; csi_n[i] = 0;
} }
{cs = 3;goto _again;} {cs = 4;goto _again;}
} }
break; break;
case 2: case 2:
@ -396,7 +405,7 @@ execFuncs:
osc_bi = 0; osc_bi = 0;
osc_buffer[0] = '\0'; osc_buffer[0] = '\0';
{cs = 5;goto _again;} {cs = 6;goto _again;}
} }
break; break;
case 8: case 8:
@ -429,28 +438,20 @@ execFuncs:
} }
break; break;
case 12: case 12:
/* #line 177 "user/ansi_parser.rl" */ /* #line 193 "user/ansi_parser.rl" */
{ {
// Reset screen apars_handle_hashCode((*p));
apars_handle_RESET_cmd();
{cs = 1;goto _again;} {cs = 1;goto _again;}
} }
break; break;
case 13: case 13:
/* #line 183 "user/ansi_parser.rl" */ /* #line 198 "user/ansi_parser.rl" */
{
apars_handle_saveCursorAttrs();
{cs = 1;goto _again;}
}
break;
case 14:
/* #line 188 "user/ansi_parser.rl" */
{ {
apars_handle_restoreCursorAttrs(); apars_handle_shortCode((*p));
{cs = 1;goto _again;} {cs = 1;goto _again;}
} }
break; break;
/* #line 454 "user/ansi_parser.c" */ /* #line 455 "user/ansi_parser.c" */
} }
} }
goto _again; goto _again;
@ -476,7 +477,7 @@ _again:
goto _again;} goto _again;}
} }
break; break;
/* #line 480 "user/ansi_parser.c" */ /* #line 481 "user/ansi_parser.c" */
} }
} }
} }
@ -484,6 +485,6 @@ goto _again;}
_out: {} _out: {}
} }
/* #line 208 "user/ansi_parser.rl" */ /* #line 217 "user/ansi_parser.rl" */
} }

7
user/ansi_parser.h
Unescape View File

@ -9,14 +9,13 @@
#define OSC_CHAR_MAX TERM_TITLE_LEN #define OSC_CHAR_MAX TERM_TITLE_LEN
extern void apars_handle_badseq(void); extern void apars_handle_badseq(void);
extern void apars_handle_CSI(char leadchar, int *params, char keychar);
extern void apars_handle_RESET_cmd(void);
extern void apars_handle_plainchar(char c); extern void apars_handle_plainchar(char c);
extern void apars_handle_CSI(char leadchar, int *params, char keychar);
extern void apars_handle_OSC_SetScreenSize(int rows, int cols); extern void apars_handle_OSC_SetScreenSize(int rows, int cols);
extern void apars_handle_saveCursorAttrs(void);
extern void apars_handle_restoreCursorAttrs(void);
extern void apars_handle_OSC_SetButton(int num, const char *buffer); extern void apars_handle_OSC_SetButton(int num, const char *buffer);
extern void apars_handle_OSC_SetTitle(const char *buffer); extern void apars_handle_OSC_SetTitle(const char *buffer);
extern void apars_handle_shortCode(char c);
extern void apars_handle_hashCode(char c);
/** /**
* \brief Linear ANSI chars stream parser * \brief Linear ANSI chars stream parser

15
user/ansi_parser.rl
Unescape View File

@ -190,6 +190,16 @@ ansi_parser(const char *newdata, size_t len)
fgoto main; fgoto main;
} }
action HASH_code {
apars_handle_hashCode(fc);
fgoto main;
}
action SHORT_code {
apars_handle_shortCode(fc);
fgoto main;
}
# --- Main parser loop --- # --- Main parser loop ---
main := main :=
@ -197,9 +207,8 @@ ansi_parser(const char *newdata, size_t len)
(NOESC @plain_char)* ESC ( (NOESC @plain_char)* ESC (
'[' @CSI_start | '[' @CSI_start |
']' @OSC_start | ']' @OSC_start |
'c' @RESET_cmd | '#' digit @HASH_code |
'7' @CSI_SaveCursorAttrs | [a-zA-Z0-9] @SHORT_code
'8' @CSI_RestoreCursorAttrs
) )
)+ $!errBadSeq; )+ $!errBadSeq;

36
user/ansi_parser_callbacks.c
Unescape View File

@ -241,23 +241,33 @@ apars_handle_CSI(char leadchar, int *params, char keychar)
} }
} }
void ICACHE_FLASH_ATTR apars_handle_saveCursorAttrs(void) void ICACHE_FLASH_ATTR apars_handle_hashCode(char c)
{ {
screen_cursor_save(1); //
} }
void ICACHE_FLASH_ATTR apars_handle_restoreCursorAttrs(void) void ICACHE_FLASH_ATTR apars_handle_shortCode(char c)
{ {
screen_cursor_restore(1); switch(c) {
} case 'c': // screen reset
screen_reset();
/** break;
* \brief Handle a request to reset the display device case '7': // save cursor + attrs
*/ screen_cursor_save(1);
void ICACHE_FLASH_ATTR break;
apars_handle_RESET_cmd(void) case '8': // restore cursor + attrs
{ screen_cursor_restore(1);
screen_reset(); break;
case 'E': // same as CR LF
// TODO
break;
case 'D': // move cursor down, scroll screen up if needed
// TODO
break;
case 'M': // move cursor up, scroll screen down if needed
// TODO
break;
}
} }
/** /**

7
user/ansi_parser_callbacks.h
Unescape View File

@ -2,13 +2,12 @@
#define ANSI_PARSER_CALLBACKS_H #define ANSI_PARSER_CALLBACKS_H
void apars_handle_badseq(void); void apars_handle_badseq(void);
void apars_handle_CSI(char leadchar, int *params, char keychar);
void apars_handle_RESET_cmd(void);
void apars_handle_plainchar(char c); void apars_handle_plainchar(char c);
void apars_handle_CSI(char leadchar, int *params, char keychar);
void apars_handle_OSC_SetScreenSize(int rows, int cols); void apars_handle_OSC_SetScreenSize(int rows, int cols);
void apars_handle_saveCursorAttrs(void);
void apars_handle_restoreCursorAttrs(void);
void apars_handle_OSC_SetButton(int num, const char *buffer); void apars_handle_OSC_SetButton(int num, const char *buffer);
void apars_handle_OSC_SetTitle(const char *buffer); void apars_handle_OSC_SetTitle(const char *buffer);
void apars_handle_shortCode(char c);
void apars_handle_hashCode(char c);
#endif //ESP_VT100_FIRMWARE_ANSI_PARSER_CALLBACKS_H #endif //ESP_VT100_FIRMWARE_ANSI_PARSER_CALLBACKS_H

Write Preview
Loading…
Cancel
Save