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

Implemented device status query cmd & cursor save/restore with attrs

Browse Source
This commit is contained in:
MightyPork
2017-01-28 02:04:18 +01:00
parent 1d891dd313
commit b1baffa3d5
7 changed files with 139 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/ansi_parser.c
+76 -55
View File
@@ -9,7 +9,8 @@
static const char _ansi_actions[] = { 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 7, 1, 8, 1, 9, 1, 10, 1,
11, 1, 12
}; };
static const char _ansi_eof_actions[] = { static const char _ansi_eof_actions[] = {
@@ -64,7 +65,7 @@ ansi_parser(const char *newdata, size_t len)
// Init Ragel on the first run // Init Ragel on the first run
if (cs == -1) { if (cs == -1) {
/* #line 68 "user/ansi_parser.c" */ /* #line 69 "user/ansi_parser.c" */
{ {
cs = ansi_start; cs = ansi_start;
} }
@@ -74,7 +75,7 @@ ansi_parser(const char *newdata, size_t len)
// The parser // The parser
/* #line 78 "user/ansi_parser.c" */ /* #line 79 "user/ansi_parser.c" */
{ {
const char *_acts; const char *_acts;
unsigned int _nacts; unsigned int _nacts;
@@ -91,9 +92,11 @@ case 1:
goto tr0; goto tr0;
case 2: case 2:
switch( (*p) ) { switch( (*p) ) {
case 91: goto tr3; case 55: goto tr3;
case 93: goto tr4; case 56: goto tr4;
case 99: goto tr5; case 91: goto tr5;
case 93: goto tr6;
case 99: goto tr7;
} }
goto tr2; goto tr2;
case 0: case 0:
@@ -104,118 +107,122 @@ case 14:
goto tr0; goto tr0;
case 3: case 3:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr8; goto tr10;
if ( (*p) < 60 ) { if ( (*p) < 60 ) {
if ( (*p) > 47 ) { if ( (*p) > 47 ) {
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr7; goto tr9;
} else if ( (*p) >= 32 ) } else if ( (*p) >= 32 )
goto tr6; goto tr8;
} else if ( (*p) > 64 ) { } else if ( (*p) > 64 ) {
if ( (*p) > 90 ) { if ( (*p) > 90 ) {
if ( 97 <= (*p) && (*p) <= 122 ) if ( 97 <= (*p) && (*p) <= 122 )
goto tr9; goto tr11;
} else if ( (*p) >= 65 ) } else if ( (*p) >= 65 )
goto tr9; goto tr11;
} else } else
goto tr6; goto tr8;
goto tr2; goto tr2;
case 4: case 4:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr8; goto tr10;
if ( (*p) < 65 ) { if ( (*p) < 65 ) {
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr7; goto tr9;
} else if ( (*p) > 90 ) { } else if ( (*p) > 90 ) {
if ( 97 <= (*p) && (*p) <= 122 ) if ( 97 <= (*p) && (*p) <= 122 )
goto tr9; goto tr11;
} else } else
goto tr9; goto tr11;
goto tr2; goto tr2;
case 15: case 15:
goto tr2; goto tr2;
case 5: case 5:
switch( (*p) ) { switch( (*p) ) {
case 70: goto tr10; case 70: goto tr12;
case 87: goto tr11; case 87: goto tr13;
} }
goto tr2; goto tr2;
case 6: case 6:
if ( (*p) == 82 ) if ( (*p) == 82 )
goto tr12; goto tr14;
goto tr2; goto tr2;
case 7: case 7:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr13; case 7: goto tr15;
case 27: goto tr14; case 27: goto tr16;
} }
goto tr2; goto tr2;
case 16: case 16:
goto tr2; goto tr2;
case 8: case 8:
if ( (*p) == 92 ) if ( (*p) == 92 )
goto tr13; goto tr15;
goto tr2; goto tr2;
case 9: case 9:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr15; goto tr17;
goto tr2; goto tr2;
case 10: case 10:
if ( (*p) == 59 ) if ( (*p) == 59 )
goto tr16; goto tr18;
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr15; goto tr17;
goto tr2; goto tr2;
case 11: case 11:
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr17; goto tr19;
goto tr2; goto tr2;
case 12: case 12:
switch( (*p) ) { switch( (*p) ) {
case 7: goto tr18; case 7: goto tr20;
case 27: goto tr19; case 27: goto tr21;
} }
if ( 48 <= (*p) && (*p) <= 57 ) if ( 48 <= (*p) && (*p) <= 57 )
goto tr17; goto tr19;
goto tr2; goto tr2;
case 13: case 13:
if ( (*p) == 92 ) if ( (*p) == 92 )
goto tr18; goto tr20;
goto tr2; goto tr2;
} }
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;
tr6: cs = 4; goto f5;
tr7: cs = 4; goto f6;
tr8: cs = 4; goto f7; tr8: cs = 4; goto f7;
tr10: cs = 6; goto _again; tr9: cs = 4; goto f8;
tr12: cs = 7; goto _again; tr10: cs = 4; goto f9;
tr14: cs = 8; goto _again; tr12: cs = 6; goto _again;
tr11: cs = 9; goto _again; tr14: cs = 7; goto _again;
tr15: cs = 10; goto f6; tr16: cs = 8; goto _again;
tr16: cs = 11; goto f7; tr13: cs = 9; goto _again;
tr17: cs = 12; goto f6; tr17: cs = 10; goto f8;
tr19: cs = 13; goto _again; tr18: cs = 11; goto f9;
tr19: cs = 12; goto f8;
tr21: cs = 13; goto _again;
tr3: cs = 14; goto f2; tr3: cs = 14; goto f2;
tr4: cs = 14; goto f3; tr4: cs = 14; goto f3;
tr5: cs = 14; goto f4; tr5: cs = 14; goto f4;
tr9: cs = 15; goto f8; tr6: cs = 14; goto f5;
tr13: cs = 16; goto f9; tr7: cs = 14; goto f6;
tr18: cs = 16; goto f10; tr11: cs = 15; goto f10;
tr15: cs = 16; goto f11;
tr20: cs = 16; goto f12;
f1: _acts = _ansi_actions + 1; goto execFuncs; f1: _acts = _ansi_actions + 1; goto execFuncs;
f2: _acts = _ansi_actions + 3; goto execFuncs; f4: _acts = _ansi_actions + 3; goto execFuncs;
f5: _acts = _ansi_actions + 5; goto execFuncs; f7: _acts = _ansi_actions + 5; goto execFuncs;
f6: _acts = _ansi_actions + 7; goto execFuncs; f8: _acts = _ansi_actions + 7; goto execFuncs;
f7: _acts = _ansi_actions + 9; goto execFuncs; f9: _acts = _ansi_actions + 9; goto execFuncs;
f8: _acts = _ansi_actions + 11; goto execFuncs; f10: _acts = _ansi_actions + 11; goto execFuncs;
f0: _acts = _ansi_actions + 13; goto execFuncs; f0: _acts = _ansi_actions + 13; goto execFuncs;
f3: _acts = _ansi_actions + 15; goto execFuncs; f5: _acts = _ansi_actions + 15; goto execFuncs;
f9: _acts = _ansi_actions + 17; goto execFuncs; f11: _acts = _ansi_actions + 17; goto execFuncs;
f10: _acts = _ansi_actions + 19; goto execFuncs; f12: _acts = _ansi_actions + 19; goto execFuncs;
f4: _acts = _ansi_actions + 21; goto execFuncs; f6: _acts = _ansi_actions + 21; goto execFuncs;
f2: _acts = _ansi_actions + 23; goto execFuncs;
f3: _acts = _ansi_actions + 25; goto execFuncs;
execFuncs: execFuncs:
_nacts = *_acts++; _nacts = *_acts++;
@@ -316,7 +323,21 @@ execFuncs:
{cs = 1; goto _again;} {cs = 1; goto _again;}
} }
break; break;
/* #line 320 "user/ansi_parser.c" */ case 11:
/* #line 147 "user/ansi_parser.rl" */
{
apars_handle_saveCursorAttrs();
{cs = 1; goto _again;}
}
break;
case 12:
/* #line 152 "user/ansi_parser.rl" */
{
apars_handle_restoreCursorAttrs();
{cs = 1; goto _again;}
}
break;
/* #line 341 "user/ansi_parser.c" */
} }
} }
goto _again; goto _again;
@@ -340,7 +361,7 @@ _again:
{cs = 1; goto _again;} {cs = 1; goto _again;}
} }
break; break;
/* #line 344 "user/ansi_parser.c" */ /* #line 365 "user/ansi_parser.c" */
} }
} }
} }
@@ -348,6 +369,6 @@ _again:
_out: {} _out: {}
} }
/* #line 159 "user/ansi_parser.rl" */ /* #line 171 "user/ansi_parser.rl" */
} }
user/ansi_parser.h
+2
View File
@@ -12,6 +12,8 @@ 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_OSC_FactoryReset(void); extern void apars_handle_OSC_FactoryReset(void);
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);
/** /**
* \brief Linear ANSI chars stream parser * \brief Linear ANSI chars stream parser
user/ansi_parser.rl
+13 -1
View File
@@ -144,6 +144,16 @@ ansi_parser(const char *newdata, size_t len)
fgoto main; fgoto main;
} }
action CSI_SaveCursorAttrs {
apars_handle_saveCursorAttrs();
fgoto main;
}
action CSI_RestoreCursorAttrs {
apars_handle_restoreCursorAttrs();
fgoto main;
}
# --- Main parser loop --- # --- Main parser loop ---
main := main :=
@@ -151,7 +161,9 @@ 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 'c' @RESET_cmd |
'7' @CSI_SaveCursorAttrs |
'8' @CSI_RestoreCursorAttrs
) )
)+ $!errBadSeq; )+ $!errBadSeq;
user/ansi_parser_callbacks.c
+17 -2
View File
@@ -143,17 +143,22 @@ apars_handle_CSI(char leadchar, int *params, char keychar)
break; break;
// SCP, RCP // SCP, RCP
case 's': screen_cursor_save(); break; case 's': screen_cursor_save(0); break;
case 'u': screen_cursor_restore(); break; case 'u': screen_cursor_restore(0); break;
case 'n': case 'n':
if (n1 == 6) { if (n1 == 6) {
// Query cursor position
char buf[20]; char buf[20];
int x, y; int x, y;
screen_cursor_get(&y, &x); screen_cursor_get(&y, &x);
sprintf(buf, "\033[%d;%dR", y+1, x+1); sprintf(buf, "\033[%d;%dR", y+1, x+1);
UART_WriteString(UART0, buf, UART_TIMEOUT_US); UART_WriteString(UART0, buf, UART_TIMEOUT_US);
} }
else if (n1 == 5) {
// Query device status - reply "Device is OK"
UART_WriteString(UART0, "\0330n", UART_TIMEOUT_US);
}
break; break;
// DECTCEM cursor show hide // DECTCEM cursor show hide
@@ -193,6 +198,16 @@ apars_handle_CSI(char leadchar, int *params, char keychar)
} }
} }
void ICACHE_FLASH_ATTR apars_handle_saveCursorAttrs(void)
{
screen_cursor_save(1);
}
void ICACHE_FLASH_ATTR apars_handle_restoreCursorAttrs(void)
{
screen_cursor_restore(1);
}
/** /**
* \brief Handle a request to reset the display device * \brief Handle a request to reset the display device
*/ */
user/ansi_parser_callbacks.h
+2
View File
@@ -7,5 +7,7 @@ void apars_handle_RESET_cmd(void);
void apars_handle_plainchar(char c); void apars_handle_plainchar(char c);
void apars_handle_OSC_FactoryReset(void); void apars_handle_OSC_FactoryReset(void);
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);
#endif //ESP_VT100_FIRMWARE_ANSI_PARSER_CALLBACKS_H #endif //ESP_VT100_FIRMWARE_ANSI_PARSER_CALLBACKS_H
user/screen.c
+27 -2
View File
@@ -41,6 +41,12 @@ static struct {
static struct { static struct {
int x; int x;
int y; int y;
// optionally saved attrs
bool withAttrs;
bool inverse;
Color fg;
Color bg;
} cursor_sav; } cursor_sav;
/** /**
@@ -354,21 +360,40 @@ screen_cursor_move(int dy, int dx)
* Save the cursor pos * Save the cursor pos
*/ */
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
screen_cursor_save(void) screen_cursor_save(bool withAttrs)
{ {
cursor_sav.x = cursor.x; cursor_sav.x = cursor.x;
cursor_sav.y = cursor.y; cursor_sav.y = cursor.y;
cursor_sav.withAttrs = withAttrs;
if (withAttrs) {
cursor_sav.fg = cursor.fg;
cursor_sav.bg = cursor.bg;
cursor_sav.inverse = cursor.inverse;
} else {
cursor_sav.fg = SCREEN_DEF_FG;
cursor_sav.bg = SCREEN_DEF_BG;
cursor_sav.inverse = 0;
}
} }
/** /**
* Restore the cursor pos * Restore the cursor pos
*/ */
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
screen_cursor_restore(void) screen_cursor_restore(bool withAttrs)
{ {
NOTIFY_LOCK(); NOTIFY_LOCK();
cursor.x = cursor_sav.x; cursor.x = cursor_sav.x;
cursor.y = cursor_sav.y; cursor.y = cursor_sav.y;
if (withAttrs) {
cursor.fg = cursor_sav.fg;
cursor.bg = cursor_sav.bg;
cursor.inverse = cursor_sav.inverse;
}
NOTIFY_DONE(); NOTIFY_DONE();
} }
user/screen.h
+2 -2
View File
@@ -101,10 +101,10 @@ void screen_cursor_set_y(int y);
void screen_cursor_move(int dy, int dx); void screen_cursor_move(int dy, int dx);
/** Save the cursor pos */ /** Save the cursor pos */
void screen_cursor_save(void); void screen_cursor_save(bool withAttrs);
/** Restore the cursor pos */ /** Restore the cursor pos */
void screen_cursor_restore(void); void screen_cursor_restore(bool withAttrs);
/** Enable cursor display */ /** Enable cursor display */
void screen_cursor_enable(bool enable); void screen_cursor_enable(bool enable);