KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement basic ESC code handling

Browse Source
This commit is contained in:
Kovid Goyal
2016-11-16 09:07:15 +05:30
parent 44a8cc062e
commit 5208500eb9
5 changed files with 228 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kitty/parser.c
+113 -17
View File
@@ -22,6 +22,8 @@
static inline void read_##name(Screen *screen, uint8_t UNUSED *buf, unsigned int UNUSED buflen, unsigned int UNUSED *pos)
#endif
#define SET_STATE(state) screen->parser_state = state; screen->parser_buf_pos = 0;
// Parse text {{{
HANDLER(text) {
uint8_t ch;
@@ -39,40 +41,39 @@ HANDLER(text) {
#define CALL_SCREEN_HANDLER(name) \
DRAW_TEXT; \
Py_XDECREF(PyObject_CallFunction(dump_callback, "sC", #name, (int)ch)); PyErr_Clear(); \
screen_##name(screen, ch); break;
name(screen, ch); break;
#else
#define CALL_SCREEN_HANDLER(name) \
DRAW_TEXT; \
screen_##name(screen, ch); break;
name(screen, ch); break;
#endif
#define CHANGE_PARSER_STATE(state) screen->parser_state = state; return;
switch(ch) {
case BEL:
CALL_SCREEN_HANDLER(bell);
CALL_SCREEN_HANDLER(screen_bell);
case BS:
CALL_SCREEN_HANDLER(backspace);
CALL_SCREEN_HANDLER(screen_backspace);
case HT:
CALL_SCREEN_HANDLER(tab);
CALL_SCREEN_HANDLER(screen_tab);
case LF:
case VT:
case FF:
CALL_SCREEN_HANDLER(linefeed);
CALL_SCREEN_HANDLER(screen_linefeed);
case CR:
CALL_SCREEN_HANDLER(carriage_return);
CALL_SCREEN_HANDLER(screen_carriage_return);
case SO:
CALL_SCREEN_HANDLER(shift_out);
CALL_SCREEN_HANDLER(screen_shift_out);
case SI:
CALL_SCREEN_HANDLER(shift_in);
CALL_SCREEN_HANDLER(screen_shift_in);
case ESC:
CHANGE_PARSER_STATE(ESC_STATE);
DRAW_TEXT; SET_STATE(ESC_STATE); return;
case CSI:
CHANGE_PARSER_STATE(CSI_STATE);
DRAW_TEXT; SET_STATE(CSI_STATE); return;
case OSC:
DRAW_TEXT; SET_STATE(OSC_STATE); return;
case NUL:
case DEL:
break;
case OSC:
CHANGE_PARSER_STATE(OSC_STATE);
break; // no-op
default:
if (!screen->parser_has_pending_text) {
screen->parser_has_pending_text = true;
@@ -85,9 +86,104 @@ HANDLER(text) {
// }}}
// Parse ESC {{{
HANDLER(esc) {
screen->parser_state = NORMAL_STATE;
static inline void screen_linefeed2(Screen *screen) { screen_linefeed(screen, '\n'); }
static inline void escape_dispatch(Screen *screen, uint8_t ch, PyObject UNUSED *dump_callback) {
#ifdef DUMP_COMMANDS
#define CALL_ED(name) \
Py_XDECREF(PyObject_CallFunction(dump_callback, "s", #name)); PyErr_Clear(); \
name(screen); break;
#else
#define CALL_ED(name) name(screen); break;
#endif
switch (ch) {
case RIS:
CALL_ED(screen_reset);
case IND:
CALL_ED(screen_index);
case NEL:
CALL_ED(screen_linefeed2);
case RI:
CALL_ED(screen_reverse_index);
case HTS:
CALL_ED(screen_set_tab_stop);
case DECSC:
CALL_ED(screen_save_cursor);
case DECRC:
CALL_ED(screen_restore_cursor);
case DECPNM:
CALL_ED(screen_normal_keypad_mode);
case DECPAM:
CALL_ED(screen_alternate_keypad_mode);
#ifdef DUMP_COMMANDS
default:
Py_XDECREF(PyObject_CallFunction(dump_callback, "sB", "Unknown char in escape_dispatch: ", ch)); PyErr_Clear();
#endif
}
}
static inline void sharp_dispatch(Screen *screen, uint8_t ch, PyObject UNUSED *dump_callback) {
switch(ch) {
case DECALN:
#ifdef DUMP_COMMANDS
Py_XDECREF(PyObject_CallFunction(dump_callback, "s", "screen_alignment_display")); PyErr_Clear();
#endif
screen_alignment_display(screen);
break;
#ifdef DUMP_COMMANDS
default:
Py_XDECREF(PyObject_CallFunction(dump_callback, "sB", "Unknown char in sharp_dispatch: ", ch)); PyErr_Clear();
#endif
}
}
HANDLER(esc) {
#ifdef DUMP_COMMANDS
#define ESC_DISPATCH(which, extra) which(screen, ch, extra); SET_STATE(NORMAL_STATE); \
Py_XDECREF(PyObject_CallFunction(dump_callback, "sCC", #which, (int)ch, (int)(extra))); PyErr_Clear(); \
return;
#else
#define ESC_DISPATCH(which, extra) which(screen, ch, extra); SET_STATE(NORMAL_STATE); return;
#endif
#ifdef DUMP_COMMANDS
#define ESC_DELEGATE(which) which(screen, ch, dump_callback); SET_STATE(NORMAL_STATE); return;
#else
#define ESC_DELEGATE(which) which(screen, ch, NULL); SET_STATE(NORMAL_STATE); return;
#endif
uint8_t ch = buf[(*pos)++];
switch(screen->parser_buf_pos) {
case 0:
switch(ch) {
case '[':
SET_STATE(CSI_STATE); return;
case ']':
SET_STATE(OSC_STATE); return;
case 'P':
SET_STATE(DCS_STATE); return;
case '#':
case '%':
case '(':
case ')':
screen->parser_buf[0] = ch; screen->parser_buf_pos++; return;
default:
ESC_DELEGATE(escape_dispatch);
}
break;
case 1:
switch(screen->parser_buf[0]) {
case '#':
ESC_DELEGATE(sharp_dispatch);
case '%':
ESC_DISPATCH(screen_select_other_charset, 0);
case '(':
case ')':
ESC_DISPATCH(screen_define_charset, screen->parser_buf[0]);
}
break;
}
}
// }}}
// Parse CSI {{{