From f5196e6e851c7d1dcf8c7e9c50f4da314c6ac238 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Thu, 8 Nov 2007 23:57:09 +0100 Subject: [PATCH] Support cursor, be an rxvt, fix emacs, vim, screen, and mutt. Signed-off-by: Pierre Habouzit --- am/cflags.mk | 1 + demo/Makefile | 2 +- demo/boxshell.c | 51 ++++-- madtty/madtty.c | 465 +++++++++++++++++++++++++++--------------------- madtty/madtty.h | 25 +-- 5 files changed, 305 insertions(+), 239 deletions(-) diff --git a/am/cflags.mk b/am/cflags.mk index cde512c..9273793 100644 --- a/am/cflags.mk +++ b/am/cflags.mk @@ -3,6 +3,7 @@ ifneq (,$(filter gcc%,$(CC))) _gccmachine:=$(shell $(CC) -dumpmachine) _cobjs := .objs-$(_gccmachine:-linux-gnu=)-$(_gccversion) + CFLAGS += -ggdb3 # Use pipes and not temp files. CFLAGS += -pipe # optimize even more diff --git a/demo/Makefile b/demo/Makefile index 7e218c7..c915abc 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -4,7 +4,7 @@ include $(DEPTH)/am/header.mk bin_PROGRAMS = boxshell boxshell_SOURCES = boxshell.c -boxshell_LDFLAGS = -L../madtty -lmadtty +boxshell_LDFLAGS = -L../madtty -lmadtty -Wl,--rpath,/home/madcoder/dev/madtty/madtty boxshell_CPPFLAGS = -Wno-error include $(DEPTH)/am/footer.mk diff --git a/demo/boxshell.c b/demo/boxshell.c index b3c8f2d..7c9512d 100644 --- a/demo/boxshell.c +++ b/demo/boxshell.c @@ -6,10 +6,13 @@ */ #include -#include + #include +#include #include +#include #include +#include #include #include @@ -18,17 +21,24 @@ static unsigned char getout = 0; static int screen_w, screen_h; static WINDOW *term_win; -void sigchld(int signo __attribute__((unused))) +void handler(int signo) { - getout = 1; + switch (signo) { + case SIGCHLD: + getout = 1; + break; + case SIGWINCH: + break; + } } int main(void) { - struct timeval next = { 0, 0 }; madtty_t *rt; + int dirty = 0; - signal(SIGCHLD, sigchld); + signal(SIGCHLD, handler); + signal(SIGWINCH, handler); madtty_initialize(); getmaxyx(stdscr, screen_h, screen_w); @@ -47,31 +57,40 @@ int main(void) * also, redraw the terminal to the window at each iteration */ while (!getout) { fd_set rfds; - struct timeval tv = { 0 , 1000 }, t; + struct timeval tv = { 0, 1000 * 1000 / 50 }; int ch; FD_ZERO(&rfds); FD_SET(rt->pty, &rfds); if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) { - if (madtty_process(rt)) - break; + if (FD_ISSET(rt->pty, &rfds)) { + madtty_process(rt); + dirty = 1; + } } while ((ch = getch()) != ERR) { +#if 0 + if (ch == KEY_F(3)) { + struct winsize ws = { + .ws_row = --rt->rows, + .ws_col = --rt->cols, + }; + + erase(); + ioctl(rt->pty, TIOCSWINSZ, &ws); + wresize(term_win, rt->rows, rt->cols); + } +#endif madtty_keypress(rt, ch); /* pass the keypress for handling */ + dirty = 1; } - gettimeofday(&t, NULL); - if (timercmp(&t, &next, >=)) { + if (dirty) { madtty_draw(rt, term_win, 0, 0); wrefresh(term_win); - gettimeofday(&next, NULL); - next.tv_usec += 1000 * 1000 / 50; - if (next.tv_usec > 1000 * 1000) { - next.tv_usec -= 1000 * 1000; - next.tv_sec++; - } + dirty = 0; } } diff --git a/madtty/madtty.c b/madtty/madtty.c index 837b2bd..4453345 100644 --- a/madtty/madtty.c +++ b/madtty/madtty.c @@ -19,25 +19,63 @@ Copyright © 2006 Pierre Habouzit */ +#include #include #include #include #include #include +#include #include #include #include -#include +#include #include "madtty.h" +#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) + +enum { + C0_NUL = 0x00, + C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, + C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , + C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, + C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, +}; + +enum { + C1_40 = 0x40, + C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, + C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, + C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, + C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, +}; + +enum { + CSI_ICH = 0x40, + CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, + CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , + CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, + CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, + CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, + CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, + CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , + CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F +}; + +struct mtty_row_t { + wchar_t *text; + uint16_t *attr; + unsigned dirty : 1; +}; + static char const * const keytable[KEY_MAX+1] = { ['\n'] = "\r", [KEY_UP] = "\e[A", [KEY_DOWN] = "\e[B", [KEY_RIGHT] = "\e[C", [KEY_LEFT] = "\e[D", - [KEY_BACKSPACE] = "\b", + [KEY_BACKSPACE] = "\177", [KEY_HOME] = "\e[1~", [KEY_IC] = "\e[2~", [KEY_DC] = "\e[3~", @@ -59,6 +97,7 @@ static char const * const keytable[KEY_MAX+1] = { static void mtty_row_set(mtty_row_t *row, int start, int len, uint16_t attr) { + row->dirty = true; wmemset(row->text + start, 0, len); for (int i = start; i < len + start; i++) { row->attr[i] = attr; @@ -79,6 +118,9 @@ static void mtty_row_roll(mtty_row_t *start, mtty_row_t *end, int count) memcpy(buf, start, count * sizeof(mtty_row_t)); memmove(start, start + count, (n - count) * sizeof(mtty_row_t)); memcpy(end - count, buf, count * sizeof(mtty_row_t)); + for (mtty_row_t *row = start; row < end; row++) { + row->dirty = true; + } } } @@ -110,19 +152,6 @@ static void cursor_line_down(madtty_t *rt) mtty_row_set(rt->curs_row, 0, rt->cols, 0); } -static void cursor_line_up(madtty_t *rt) -{ - rt->curs_row--; - if (rt->curs_row >= rt->scroll_top) - return; - - /* must scroll the scrolling region up by 1 line, and put cursor on - * first line of it */ - rt->curs_row = rt->scroll_top; - mtty_row_roll(rt->scroll_top, rt->scroll_bot, -1); - mtty_row_set(rt->curs_row, 0, rt->cols, 0); -} - __attribute__((const)) static uint16_t build_attrs(unsigned curattrs) { @@ -130,108 +159,18 @@ static uint16_t build_attrs(unsigned curattrs) >> NCURSES_ATTR_SHIFT; } -static void put_normal_char(madtty_t *rt, wchar_t c) -{ - mtty_row_t *tmp; - - if (rt->curs_col >= rt->cols) { - rt->curs_col = 0; - cursor_line_down(rt); - } - - tmp = rt->curs_row; - - if (rt->insert) { - wmemmove(tmp->text + rt->curs_col + 1, tmp->text + rt->curs_col, - (rt->cols - rt->curs_col - 1)); - memmove(tmp->attr + rt->curs_col + 1, tmp->attr + rt->curs_col, - (rt->cols - rt->curs_col - 1) * sizeof(tmp->attr[0])); - } - - tmp->text[rt->curs_col] = c; - tmp->attr[rt->curs_col] = build_attrs(rt->curattrs); - rt->curs_col++; -} - -static void put_graphmode_char(madtty_t *rt, int c) -{ - char nc; - /* do some very pitiful translation to regular ascii chars */ - switch (c) { - case 'j': case 'k': case 'l': case 'm': case 'n': case 't': - case 'u': case 'v': case 'w': - nc = '+'; break; - case 'x': - nc = '|'; break; - default: - nc = '%'; - } - - put_normal_char(rt, nc); -} - static void new_escape_sequence(madtty_t *rt) { rt->escaped = true; - rt->esbuf_len = 0; - rt->esbuf[0] = '\0'; + rt->elen = 0; + rt->ebuf[0] = '\0'; } static void cancel_escape_sequence(madtty_t *rt) { rt->escaped = false; - rt->esbuf_len = 0; - rt->esbuf[0] = '\0'; -} - -static void handle_control_char(madtty_t *rt, int c) -{ - switch (c) { - case '\r': /* carriage return */ - rt->curs_col = 0; - break; - - case '\n': /* line feed */ - rt->curs_col = 0; - cursor_line_down(rt); - break; - - case '\b': /* backspace */ - if (rt->curs_col > 0) - rt->curs_col--; - break; - - case '\t': /* tab */ - rt->curs_col = (rt->curs_col + 8) & ~7; - clamp_cursor_to_bounds(rt); - break; - - case '\x1b': /* begin escape sequence (aborting previous one if any) */ - new_escape_sequence(rt); - break; - - case '\x0e': /* enter graphical character mode */ - rt->graphmode = true; - break; - - case '\x0f': /* exit graphical character mode */ - rt->graphmode = false; - break; - - case '\x9b': /* CSI character. Equivalent to ESC [ */ - new_escape_sequence(rt); - rt->esbuf[rt->esbuf_len++] = '['; - break; - - case '\x18': - case '\x1a': /* these interrupt escape sequences */ - cancel_escape_sequence(rt); - break; - - case '\a': /* bell */ - /* do nothing for now... maybe a visual bell would be nice? */ - break; - } + rt->elen = 0; + rt->ebuf[0] = '\0'; } static bool is_valid_csi_ender(int c) @@ -361,25 +300,20 @@ static void interpret_csi_C(madtty_t *rt, char verb, int param[], int pcount) /* Interpret the 'erase line' escape sequence */ static void interpret_csi_EL(madtty_t *rt, int param[], int pcount) { - int start, len; - int cmd = pcount ? param[0] : 0; + attr_t attr = build_attrs(rt->curattrs); - switch (cmd) { + switch (pcount ? param[0] : 0) { case 1: - start = 0; - len = rt->curs_col + 1; + mtty_row_set(rt->curs_row, 0, rt->curs_col + 1, attr); break; case 2: - start = 0; - len = rt->cols; + mtty_row_set(rt->curs_row, 0, rt->cols, attr); break; default: - start = rt->curs_col; - len = rt->cols - start; + mtty_row_set(rt->curs_row, rt->curs_col, rt->cols - rt->curs_col, + attr); break; } - - mtty_row_set(rt->curs_row, start, len, build_attrs(rt->curattrs)); } /* Interpret the 'insert blanks' sequence (ICH) */ @@ -420,6 +354,13 @@ static void interpret_csi_DCH(madtty_t *rt, int param[], int pcount) mtty_row_set(row, rt->cols - n, n, build_attrs(rt->curattrs)); } +/* Interpret a 'scroll reverse' (SR) */ +static void interpret_csi_SR(madtty_t *rt) +{ + mtty_row_roll(rt->scroll_top, rt->scroll_bot, -1); + mtty_row_set(rt->scroll_top, 0, rt->cols, build_attrs(rt->curattrs)); +} + /* Interpret an 'insert line' sequence (IL) */ static void interpret_csi_IL(madtty_t *rt, int param[], int pcount) { @@ -435,7 +376,6 @@ static void interpret_csi_IL(madtty_t *rt, int param[], int pcount) mtty_row_set(row, 0, rt->cols, build_attrs(rt->curattrs)); } } - } /* Interpret a 'delete line' sequence (DL) */ @@ -506,12 +446,10 @@ static void es_interpret_csi(madtty_t *rt) { static int csiparam[MAX_CSI_ES_PARAMS]; int param_count = 0; - const char *p = rt->esbuf + 1; - char verb = rt->esbuf[rt->esbuf_len - 1]; + const char *p = rt->ebuf + 1; + char verb = rt->ebuf[rt->elen - 1]; - if (!strncmp(rt->esbuf, "[?", 2)) { /* private-mode CSI, ignore */ - return; - } + p += rt->ebuf[1] == '?'; /* CSI private mode */ /* parse numeric parameters */ while (isdigit((unsigned char)*p) || *p == ';') { @@ -527,6 +465,20 @@ static void es_interpret_csi(madtty_t *rt) p++; } + if (rt->ebuf[1] == '?') { + switch (verb) { + case 'l': + if (csiparam[0] == 25) + rt->curshid = true; + break; + + case 'h': + if (csiparam[0] == 25) + rt->curshid = false; + break; + } + } + /* delegate handling depending on command character (verb) */ switch (verb) { case 'h': @@ -577,39 +529,165 @@ static void es_interpret_csi(madtty_t *rt) static void try_interpret_escape_seq(madtty_t *rt) { - char firstchar = rt->esbuf[0]; - char lastchar = rt->esbuf[rt->esbuf_len-1]; + char lastchar = rt->ebuf[rt->elen-1]; - if (!firstchar) - return; /* too early to do anything */ + switch (*rt->ebuf) { + case '\0': + return; - /* interpret ESC-M as reverse line-feed */ - if (firstchar == 'M') { - cursor_line_up(rt); + case 'M': + interpret_csi_SR(rt); cancel_escape_sequence(rt); return; + + case '(': + case ')': + if (rt->elen == 2) + goto cancel; + break; + + case ']': /* xterm thing */ + if (lastchar == '\a') + goto cancel; + break; + + default: + goto cancel; + + case '[': + if (is_valid_csi_ender(lastchar)) { + es_interpret_csi(rt); + cancel_escape_sequence(rt); + return; + } + break; } - if (firstchar != '[' && firstchar != ']') { - /* unrecognized escape sequence. Let's forget about it. */ + if (rt->elen + 1 >= (int)sizeof(rt->ebuf)) { + int i; +cancel: +#if 0 + fprintf(stderr, "cancelled: \\033"); + for (i = 0; i < rt->elen; i++) { + int c = rt->ebuf[i]; + if (isprint(c) && c >= ' ') { + fputc(c, stderr); + } else { + fprintf(stderr, "\\%03o", c); + } + } + fputc('\n', stderr); +#endif cancel_escape_sequence(rt); - return; } +} - if (firstchar == '[' && is_valid_csi_ender(lastchar)) { - es_interpret_csi(rt); - cancel_escape_sequence(rt); - } else if (firstchar == ']' && lastchar == '\a') { - /* we have an xterm escape sequence: interpret it */ +static void madtty_process_nonprinting(madtty_t *rt, wchar_t wc) +{ + switch (wc) { + case C0_ESC: + new_escape_sequence(rt); + break; - /* es_interpret_xterm_es(rt); -- TODO!*/ - cancel_escape_sequence(rt); + case C0_BEL: + /* do nothing for now... maybe a visual bell would be nice? */ + break; + + case C0_BS: + if (rt->curs_col > 0) + rt->curs_col--; + break; + + case C0_HT: /* tab */ + rt->curs_col = (rt->curs_col + 8) & ~7; + if (rt->curs_col >= rt->cols) + rt->curs_col = rt->cols - 1; + break; + + case C0_CR: + rt->curs_col = 0; + break; + + case C0_VT: + case C0_FF: + case C0_LF: + cursor_line_down(rt); + break; + + case C0_SO: /* shift out - acs */ + rt->graphmode = true; + break; + case C0_SI: /* shift in - acs */ + rt->graphmode = false; + break; } +} - /* if the escape sequence took up all available space and could - * not yet be parsed, abort it */ - if (rt->esbuf_len + 1 >= ESEQ_BUF_SIZE) - cancel_escape_sequence(rt); +void madtty_putc(madtty_t *rt, wchar_t wc) +{ + if (!rt->seen_input) { + rt->seen_input = 1; + kill(-rt->childpid, SIGWINCH); + } + +#if 0 + if (wc == '\n' || (wc >= ' ' && isprint(wc))) { + fputc(wc, stderr); + } else { + fprintf(stderr, "\\%03o", wc); + } +#endif + + if (rt->escaped) { + assert (rt->elen + 1 < (int)sizeof(rt->ebuf)); + rt->ebuf[rt->elen] = wc; + rt->ebuf[++rt->elen] = '\0'; + try_interpret_escape_seq(rt); + } else if (IS_CONTROL(wc)) { + madtty_process_nonprinting(rt, wc); + } else { + mtty_row_t *tmp; + + if (rt->graphmode) { + // vt100 special graphics and line drawing + // 5f-7e standard vt100 + // 40-5e rxvt extension for extra curses acs chars + static uint16_t vt100_0[62] = { // 41 .. 7e + 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! + 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f + 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 + 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f + 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 + 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f + 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 + 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e + }; + + if (wc >= 0x41 && wc <= 0x7e && vt100_0[wc - 0x41]) { + wc = vt100_0[wc - 0x41]; + // width = 1; // vt100 line drawing characters are always single-width + } + } + + if (rt->curs_col >= rt->cols) { + rt->curs_col = 0; + cursor_line_down(rt); + } + + tmp = rt->curs_row; + + if (rt->insert) { + wmemmove(tmp->text + rt->curs_col + 1, tmp->text + rt->curs_col, + (rt->cols - rt->curs_col - 1)); + memmove(tmp->attr + rt->curs_col + 1, tmp->attr + rt->curs_col, + (rt->cols - rt->curs_col - 1) * sizeof(tmp->attr[0])); + } + + tmp->text[rt->curs_col] = wc; + tmp->attr[rt->curs_col] = build_attrs(rt->curattrs); + tmp->dirty = true; + rt->curs_col++; + } } int madtty_process(madtty_t *rt) @@ -621,47 +699,33 @@ int madtty_process(madtty_t *rt) return -1; } - res = read(rt->pty, rt->rbuf + rt->rbuf_len, - sizeof(rt->rbuf) - rt->rbuf_len); + res = read(rt->pty, rt->rbuf + rt->rlen, sizeof(rt->rbuf) - rt->rlen); if (res < 0) return -1; - rt->rbuf_len += res; - while (pos < rt->rbuf_len) { + rt->rlen += res; + while (pos < rt->rlen) { wchar_t wc; ssize_t len; - len = (ssize_t)mbrtowc(&wc, rt->rbuf + pos, rt->rbuf_len - pos, - &rt->ps); - if (len < 0) { - rt->rbuf_len -= pos; - memmove(rt->rbuf, rt->rbuf + pos, rt->rbuf_len); - return len == -2 ? 0 : -1; + len = (ssize_t)mbrtowc(&wc, rt->rbuf + pos, rt->rlen - pos, &rt->ps); + if (len == -2) { + rt->rlen -= pos; + memmove(rt->rbuf, rt->rbuf + pos, rt->rlen); + return 0; } - pos += len ? len : 1; - - if (wc < ' ') { - handle_control_char(rt, wc); - continue; + if (len == -1) { + len = 1; + wc = rt->rbuf[pos]; } - if (rt->escaped && rt->esbuf_len < ESEQ_BUF_SIZE) { - /* append character to ongoing escape sequence */ - rt->esbuf[rt->esbuf_len] = wc; - rt->esbuf[++rt->esbuf_len] = 0; - - try_interpret_escape_seq(rt); - } else - if (rt->graphmode) { - put_graphmode_char(rt, wc); - } else { - put_normal_char(rt, wc); - } + pos += len ? len : 1; + madtty_putc(rt, wc); } - rt->rbuf_len -= pos; - memmove(rt->rbuf, rt->rbuf + pos, rt->rbuf_len); + rt->rlen -= pos; + memmove(rt->rbuf, rt->rbuf + pos, rt->rlen); return 0; } @@ -721,13 +785,16 @@ void madtty_destroy(madtty_t *rt) void madtty_draw(madtty_t *rt, WINDOW *win, int srow, int scol) { - int i, j; - - for (i = 0; i < rt->rows; i++) { + curs_set(0); + for (int i = 0; i < rt->rows; i++) { mtty_row_t *row = rt->lines + i; - wmove(win, srow + i, scol); - for (j = 0; j < rt->cols; j++) { + + if (!row->dirty) + continue; + + wmove(win, srow + i, scol); + for (int j = 0; j < rt->cols; j++) { if (!j || row->attr[j] != row->attr[j - 1]) wattrset(win, (attr_t)row->attr[j] << NCURSES_ATTR_SHIFT); if (row->text[j] >= 128) { @@ -740,9 +807,11 @@ void madtty_draw(madtty_t *rt, WINDOW *win, int srow, int scol) waddch(win, row->text[j] > ' ' ? row->text[j] : ' '); } } + row->dirty = false; } wmove(win, srow + rt->curs_row - rt->lines, scol + rt->curs_col); + curs_set(!rt->curshid); } /******************************************************/ @@ -762,8 +831,7 @@ pid_t madtty_forkpty(madtty_t *rt, const char *path, const char *argv[]) if (pid == 0) { setsid(); - - setenv("TERM", "linux", 1); + setenv("TERM", "rxvt", 1); execv(path, (char *const*)argv); fprintf(stderr, "\nexecv() failed.\nCommand: '%s'\n", argv[0]); exit(1); @@ -772,25 +840,6 @@ pid_t madtty_forkpty(madtty_t *rt, const char *path, const char *argv[]) return rt->childpid = pid; } -static int madtty_write(madtty_t *rt, const char *data, int len) -{ - int res; - - if (rt->pty < 0) { - errno = EINVAL; - return -1; - } - -again: - res = write(rt->pty, data, len); - if (res < 0) { - if (errno == EINTR || errno == EAGAIN) - goto again; - } - - return res; -} - void madtty_keypress(madtty_t *rt, int keycode) { char c = (char)keycode; @@ -801,13 +850,19 @@ void madtty_keypress(madtty_t *rt, int keycode) buf = keytable[keycode]; len = strlen(keytable[keycode]); } else { +#if 0 + if (keycode == KEY_F(3)) { + kill(-rt->childpid, SIGWINCH); + return; + } +#endif buf = &c; len = 1; } while (len > 0) { - int res = madtty_write(rt, buf, len); - if (res < 0) + int res = write(rt->pty, buf, len); + if (res < 0 && errno != EAGAIN && errno != EINTR) return; buf += res; @@ -819,9 +874,9 @@ void madtty_initialize(void) { setlocale(LC_ALL, ""); initscr(); - noecho(); start_color(); use_default_colors(); + noecho(); raw(); nodelay(stdscr, TRUE); keypad(stdscr, TRUE); diff --git a/madtty/madtty.h b/madtty/madtty.h index 2defa71..c7e2a82 100644 --- a/madtty/madtty.h +++ b/madtty/madtty.h @@ -31,28 +31,19 @@ #include #define MAX_CSI_ES_PARAMS 32 -#define ESEQ_BUF_SIZE 128 /* size of escape sequence buffer */ -typedef struct mtty_row_t { - wchar_t *text; - uint16_t *attr; -} mtty_row_t; - -/* Represents each of the text cells in the terminal screen */ -typedef struct { - char s[4]; - char len; - int16_t attrs; -} RoteCell; +typedef struct mtty_row_t mtty_row_t; typedef struct { int pty; pid_t childpid; /* flags */ - unsigned insert : 1; - unsigned escaped : 1; - unsigned graphmode : 1; + unsigned seen_input : 1; + unsigned insert : 1; + unsigned escaped : 1; + unsigned graphmode : 1; + unsigned curshid : 1; /* geometry */ int rows, cols; @@ -70,8 +61,8 @@ typedef struct { /* buffers and parsing state */ mbstate_t ps; char rbuf[BUFSIZ]; - char esbuf[ESEQ_BUF_SIZE]; - int rbuf_len, esbuf_len; + char ebuf[BUFSIZ]; + int rlen, elen; } madtty_t; void madtty_initialize(void); -- 2.20.1