From: Pierre Habouzit Date: Sat, 10 Nov 2007 15:37:39 +0000 (+0100) Subject: Import madtty, use it to deal with colors from now on as it needs to know what is... X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=00f34116b32751764d42f81159c292d850c74bac;p=apps%2Fmadmutt.git Import madtty, use it to deal with colors from now on as it needs to know what is assigned to what. Signed-off-by: Pierre Habouzit --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d03b50..9e0e34d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ SET(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/madmutt") SET(PKGDOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/madmutt") SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc") SET(VERSION "devel") -SET(MUTTLIBS) +SET(MUTTLIBS "-lutil") ADD_DEFINITIONS("-DBINDIR=\\\"${BINDIR}\\\"") ADD_DEFINITIONS("-DPKGDATADIR=\\\"${PKGDATADIR}\\\"") diff --git a/lib-ui/CMakeLists.txt b/lib-ui/CMakeLists.txt index 4b34247..04c676a 100644 --- a/lib-ui/CMakeLists.txt +++ b/lib-ui/CMakeLists.txt @@ -7,6 +7,7 @@ ADD_LIBRARY(ui hdrline.c history.c layout.c + madtty.c menu.c query.c sidebar.c diff --git a/lib-ui/color.c b/lib-ui/color.c index 9a1a65d..a927e9a 100644 --- a/lib-ui/color.c +++ b/lib-ui/color.c @@ -10,6 +10,7 @@ #include #include "pattern.h" #include "mutt.h" +#include "madtty.h" /* globals */ int *ColorQuote; @@ -32,9 +33,6 @@ typedef struct color_list { struct color_list *next; } COLOR_LIST; -static COLOR_LIST *ColorList = NULL; -static int UserColors = 0; - static struct mapping_t Colors[] = { {"black", COLOR_BLACK}, {"blue", COLOR_BLUE}, @@ -84,20 +82,15 @@ static COLOR_LINE *mutt_new_color_line (void) return (p); } -static void mutt_free_color_line (COLOR_LINE ** l, int free_colors) +static void mutt_free_color_line(COLOR_LINE ** l) { COLOR_LINE *tmp; if (!l || !*l) return; - tmp = *l; - if (free_colors && tmp->fg != -1 && tmp->bg != -1) - mutt_free_color (tmp->fg, tmp->bg); - /* we should really use the container type for regular expressions. */ - regfree (&tmp->rx); pattern_list_wipe(&tmp->color_pattern); p_delete(&tmp->pattern); @@ -120,92 +113,6 @@ void ci_start_color (void) /* special meaning: toggle the relevant attribute */ ColorDefs[MT_COLOR_BOLD] = 0; ColorDefs[MT_COLOR_UNDERLINE] = 0; - - start_color (); -} - -int mutt_alloc_color (int fg, int bg) -{ - COLOR_LIST *p = ColorList; - int i; - - /* check to see if this color is already allocated to save space */ - while (p) { - if (p->fg == fg && p->bg == bg) { - (p->count)++; - return (COLOR_PAIR (p->index)); - } - p = p->next; - } - - /* check to see if there are colors left */ - if (++UserColors > COLOR_PAIRS) - return (A_NORMAL); - - /* find the smallest available index (object) */ - i = 1; - for (;;) { - p = ColorList; - while (p) { - if (p->index == i) - break; - p = p->next; - } - if (p == NULL) - break; - i++; - } - - p = p_new(COLOR_LIST, 1); - p->next = ColorList; - ColorList = p; - - p->index = i; - p->count = 1; - p->bg = bg; - p->fg = fg; - - if (fg == COLOR_DEFAULT) - fg = -1; - if (bg == COLOR_DEFAULT) - bg = -1; - - init_pair (i, fg, bg); - - return (COLOR_PAIR (p->index)); -} - -void mutt_free_color (int fg, int bg) -{ - COLOR_LIST *p, *q; - - p = ColorList; - while (p) { - if (p->fg == fg && p->bg == bg) { - (p->count)--; - if (p->count > 0) - return; - - UserColors--; - - if (p == ColorList) { - ColorList = ColorList->next; - p_delete(&p); - return; - } - q = ColorList; - while (q) { - if (q->next == p) { - q->next = p->next; - p_delete(&p); - return; - } - q = q->next; - } - /* can't get here */ - } - p = p->next; - } } static int @@ -301,7 +208,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ do_cache = 1; last = tmp; tmp = tmp->next; - mutt_free_color_line (&last, parse_uncolor); + mutt_free_color_line(&last); } ColorIndexList = NULL; } @@ -315,7 +222,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ last->next = tmp->next; else ColorIndexList = tmp->next; - mutt_free_color_line (&tmp, parse_uncolor); + mutt_free_color_line(&tmp); break; } } @@ -362,13 +269,12 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive, if (tmp) { if (fg != -1 && bg != -1) { if (tmp->fg != fg || tmp->bg != bg) { - mutt_free_color (tmp->fg, tmp->bg); tmp->fg = fg; tmp->bg = bg; - attr |= mutt_alloc_color (fg, bg); - } - else + attr |= madtty_color_pair(fg, bg); + } else { attr |= (tmp->pair & ~A_BOLD); + } } tmp->pair = attr; } else { @@ -383,7 +289,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive, mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch)); if ((tmp->color_pattern = mutt_pattern_comp (buf, M_FULL_MSG, err)) == NULL) { - mutt_free_color_line (&tmp, 1); + mutt_free_color_line(&tmp); return -1; } /* force re-caching of index colors */ @@ -395,7 +301,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive, REGCOMP (&tmp->rx, s, (sensitive ? mutt_which_case (s) : REG_ICASE))) != 0) { regerror (r, &tmp->rx, err->data, err->dsize); - mutt_free_color_line (&tmp, 1); + mutt_free_color_line(&tmp); return (-1); } tmp->next = *top; @@ -403,7 +309,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive, if (fg != -1 && bg != -1) { tmp->fg = fg; tmp->bg = bg; - attr |= mutt_alloc_color (fg, bg); + attr |= madtty_color_pair(fg, bg); } tmp->pair = attr; *top = tmp; @@ -515,7 +421,7 @@ parse_attr_spec (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr, static int fgbgattr_to_color (int fg, int bg, int attr) { if (fg != -1 && bg != -1) - return attr | mutt_alloc_color (fg, bg); + return attr | madtty_color_pair(fg, bg); else return attr; } diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index ac049bf..437ffbc 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -26,6 +26,7 @@ #include "mutt.h" #include "pager.h" #include "charset.h" +#include "madtty.h" /* not possible to unget more than one char under some curses libs, and it * is impossible to unget function keys in SLang, so roll our own input @@ -310,6 +311,8 @@ void mutt_show_error (void) void curses_initialize(void) { initscr(); + start_color(); + madtty_init_colors(); ci_start_color(); noecho(); raw(); diff --git a/lib-ui/curses.h b/lib-ui/curses.h index eebf4a1..fe8b63e 100644 --- a/lib-ui/curses.h +++ b/lib-ui/curses.h @@ -116,7 +116,6 @@ void mutt_query_menu (char *, ssize_t); void mutt_show_error (void); ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n); -int mutt_alloc_color (int fg, int bg); int mutt_any_key_to_continue (const char *); void mutt_what_key (void); int mutt_complete (char *, ssize_t); diff --git a/lib-ui/madtty.c b/lib-ui/madtty.c new file mode 100644 index 0000000..135e9a7 --- /dev/null +++ b/lib-ui/madtty.c @@ -0,0 +1,991 @@ +/* + LICENSE INFORMATION: + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License (LGPL) as published by the Free Software Foundation. + + Please refer to the COPYING file for more information. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Copyright © 2004 Bruno T. C. de Oliveira + Copyright © 2006 Pierre Habouzit + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "madtty.h" + +#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) + +static int has_default = 0; + +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 madtty_t { + int pty; + pid_t childpid; + + /* flags */ + unsigned seen_input : 1; + unsigned insert : 1; + unsigned escaped : 1; + unsigned graphmode : 1; + unsigned curshid : 1; + + /* geometry */ + int rows, cols; + unsigned curattrs; + + struct t_row_t *lines; + struct t_row_t *scroll_top; + struct t_row_t *scroll_bot; + + /* cursor */ + struct t_row_t *curs_row; + int curs_col, curs_srow, curs_scol; + + /* buffers and parsing state */ + mbstate_t ps; + char rbuf[BUFSIZ]; + char ebuf[BUFSIZ]; + int rlen, elen; +}; + +typedef struct t_row_t { + wchar_t *text; + uint16_t *attr; + unsigned dirty : 1; +} t_row_t; + +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] = "\177", + [KEY_HOME] = "\e[1~", + [KEY_IC] = "\e[2~", + [KEY_DC] = "\e[3~", + [KEY_END] = "\e[4~", + [KEY_PPAGE] = "\e[5~", + [KEY_NPAGE] = "\e[6~", + [KEY_SUSPEND] = "\x1A", /* Ctrl+Z gets mapped to this */ + [KEY_F(1)] = "\e[[A", + [KEY_F(2)] = "\e[[B", + [KEY_F(3)] = "\e[[C", + [KEY_F(4)] = "\e[[D", + [KEY_F(5)] = "\e[[E", + [KEY_F(6)] = "\e[17~", + [KEY_F(7)] = "\e[18~", + [KEY_F(8)] = "\e[19~", + [KEY_F(9)] = "\e[20~", + [KEY_F(10)] = "\e[21~", +}; + +static void t_row_set(t_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; + } +} + +static void t_row_roll(t_row_t *start, t_row_t *end, int count) +{ + int n = end - start; + + count %= n; + if (count < 0) + count += n; + + if (count) { + t_row_t *buf = alloca(count * sizeof(t_row_t)); + + memcpy(buf, start, count * sizeof(t_row_t)); + memmove(start, start + count, (n - count) * sizeof(t_row_t)); + memcpy(end - count, buf, count * sizeof(t_row_t)); + for (t_row_t *row = start; row < end; row++) { + row->dirty = true; + } + } +} + +static void clamp_cursor_to_bounds(madtty_t *t) +{ + if (t->curs_row < t->lines) { + t->curs_row = t->lines; + } + if (t->curs_row >= t->lines + t->rows) { + t->curs_row = t->lines + t->rows - 1; + } + + if (t->curs_col < 0) { + t->curs_col = 0; + } + if (t->curs_col >= t->cols) { + t->curs_col = t->cols - 1; + } +} + +static void cursor_line_down(madtty_t *t) +{ + t->curs_row++; + if (t->curs_row < t->scroll_bot) + return; + + t->curs_row = t->scroll_bot - 1; + t_row_roll(t->scroll_top, t->scroll_bot, 1); + t_row_set(t->curs_row, 0, t->cols, 0); +} + +__attribute__((const)) +static uint16_t build_attrs(unsigned curattrs) +{ + return ((curattrs & ~A_COLOR) | COLOR_PAIR(curattrs & 0xff)) + >> NCURSES_ATTR_SHIFT; +} + +static void new_escape_sequence(madtty_t *t) +{ + t->escaped = true; + t->elen = 0; + t->ebuf[0] = '\0'; +} + +static void cancel_escape_sequence(madtty_t *t) +{ + t->escaped = false; + t->elen = 0; + t->ebuf[0] = '\0'; +} + +static bool is_valid_csi_ender(int c) +{ + return (c >= 'a' && c <= 'z') + || (c >= 'A' && c <= 'Z') + || (c == '@' || c == '`'); +} + +/* interprets a 'set attribute' (SGR) CSI escape sequence */ +static void interpret_csi_SGR(madtty_t *t, int param[], int pcount) +{ + int i; + + if (pcount == 0) { + /* special case: reset attributes */ + t->curattrs = A_NORMAL; + return; + } + + for (i = 0; i < pcount; i++) { + switch (param[i]) { +#define CASE(x, op) case x: op; break + CASE(0, t->curattrs = A_NORMAL); + CASE(1, t->curattrs |= A_BOLD); + CASE(4, t->curattrs |= A_UNDERLINE); + CASE(5, t->curattrs |= A_BLINK); + CASE(6, t->curattrs |= A_BLINK); + CASE(7, t->curattrs |= A_REVERSE); + CASE(8, t->curattrs |= A_INVIS); + CASE(22, t->curattrs &= ~A_BOLD); + CASE(24, t->curattrs &= ~A_UNDERLINE); + CASE(25, t->curattrs &= ~A_BLINK); + CASE(27, t->curattrs &= ~A_REVERSE); + CASE(28, t->curattrs &= ~A_INVIS); + + case 30 ... 37: /* fg */ + if (has_default) { + t->curattrs &= ~0xf0; + t->curattrs |= (param[i] + 1 - 30) << 4; + } else { + t->curattrs &= ~070; + t->curattrs |= (7 - (param[i] - 30)) << 3; + } + break; + + case 39: + t->curattrs &= has_default ? ~0xf0 : ~070; + break; + + case 40 ... 47: /* bg */ + if (has_default) { + t->curattrs &= ~0x0f; + t->curattrs |= (param[i] + 1 - 40); + } else { + t->curattrs &= ~007; + t->curattrs |= (param[i] - 40); + } + break; + + case 49: + t->curattrs &= has_default ? ~0x0f : ~007; + break; + + default: + break; + } + } +} + +/* interprets an 'erase display' (ED) escape sequence */ +static void interpret_csi_ED(madtty_t *t, int param[], int pcount) +{ + t_row_t *row, *start, *end; + attr_t attr = build_attrs(t->curattrs); + + /* decide range */ + if (pcount && param[0] == 2) { + start = t->lines; + end = t->lines + t->rows; + } else + if (pcount && param[0] == 1) { + start = t->lines; + end = t->curs_row; + t_row_set(t->curs_row, 0, t->curs_col + 1, attr); + } else { + t_row_set(t->curs_row, t->curs_col, + t->cols - t->curs_col, attr); + start = t->curs_row + 1; + end = t->lines + t->rows; + } + + for (row = start; row < end; row++) { + t_row_set(row, 0, t->cols, attr); + } +} + +/* interprets a 'move cursor' (CUP) escape sequence */ +static void interpret_csi_CUP(madtty_t *t, int param[], int pcount) +{ + if (pcount == 0) { + /* special case */ + t->curs_row = t->lines; + t->curs_col = 0; + return; + } else + if (pcount < 2) { + return; /* malformed */ + } + + t->curs_row = t->lines + param[0] - 1; + t->curs_col = param[1] - 1; + + clamp_cursor_to_bounds(t); +} + +/* Interpret the 'relative mode' sequences: CUU, CUD, CUF, CUB, CNL, + * CPL, CHA, HPR, VPA, VPR, HPA */ +static void +interpret_csi_C(madtty_t *t, char verb, int param[], int pcount) +{ + int n = (pcount && param[0] > 0) ? param[0] : 1; + + switch (verb) { + case 'A': t->curs_row -= n; break; + case 'B': case 'e': t->curs_row += n; break; + case 'C': case 'a': t->curs_col += n; break; + case 'D': t->curs_col -= n; break; + case 'E': t->curs_row += n; t->curs_col = 0; break; + case 'F': t->curs_row -= n; t->curs_col = 0; break; + case 'G': case '`': t->curs_col = param[0] - 1; break; + case 'd': t->curs_row = t->lines + param[0] - 1; break; + } + + clamp_cursor_to_bounds(t); +} + +/* Interpret the 'erase line' escape sequence */ +static void interpret_csi_EL(madtty_t *t, int param[], int pcount) +{ + attr_t attr = build_attrs(t->curattrs); + + switch (pcount ? param[0] : 0) { + case 1: + t_row_set(t->curs_row, 0, t->curs_col + 1, attr); + break; + case 2: + t_row_set(t->curs_row, 0, t->cols, attr); + break; + default: + t_row_set(t->curs_row, t->curs_col, t->cols - t->curs_col, + attr); + break; + } +} + +/* Interpret the 'insert blanks' sequence (ICH) */ +static void interpret_csi_ICH(madtty_t *t, int param[], int pcount) +{ + t_row_t *row = t->curs_row; + int n = (pcount && param[0] > 0) ? param[0] : 1; + int i; + + if (t->curs_col + n > t->cols) { + n = t->cols - t->curs_col; + } + + for (i = t->cols - 1; i >= t->curs_col + n; i--) { + row->text[i] = row->text[i - n]; + row->attr[i] = row->attr[i - n]; + } + + t_row_set(row, t->curs_col, n, build_attrs(t->curattrs)); +} + +/* Interpret the 'delete chars' sequence (DCH) */ +static void interpret_csi_DCH(madtty_t *t, int param[], int pcount) +{ + t_row_t *row = t->curs_row; + int n = (pcount && param[0] > 0) ? param[0] : 1; + int i; + + if (t->curs_col + n > t->cols) { + n = t->cols - t->curs_col; + } + + for (i = t->curs_col; i < t->cols - n; i++) { + row->text[i] = row->text[i + n]; + row->attr[i] = row->attr[i + n]; + } + + t_row_set(row, t->cols - n, n, build_attrs(t->curattrs)); +} + +/* Interpret a 'scroll reverse' (SR) */ +static void interpret_csi_SR(madtty_t *t) +{ + t_row_roll(t->scroll_top, t->scroll_bot, -1); + t_row_set(t->scroll_top, 0, t->cols, build_attrs(t->curattrs)); +} + +/* Interpret an 'insert line' sequence (IL) */ +static void interpret_csi_IL(madtty_t *t, int param[], int pcount) +{ + int n = (pcount && param[0] > 0) ? param[0] : 1; + + if (t->curs_row + n >= t->scroll_bot) { + for (t_row_t *row = t->curs_row; row < t->scroll_bot; row++) { + t_row_set(row, 0, t->cols, build_attrs(t->curattrs)); + } + } else { + t_row_roll(t->curs_row, t->scroll_bot, -n); + for (t_row_t *row = t->curs_row; row < t->curs_row + n; row++) { + t_row_set(row, 0, t->cols, build_attrs(t->curattrs)); + } + } +} + +/* Interpret a 'delete line' sequence (DL) */ +static void interpret_csi_DL(madtty_t *t, int param[], int pcount) +{ + int n = (pcount && param[0] > 0) ? param[0] : 1; + + if (t->curs_row + n >= t->scroll_bot) { + for (t_row_t *row = t->curs_row; row < t->scroll_bot; row++) { + t_row_set(row, 0, t->cols, build_attrs(t->curattrs)); + } + } else { + t_row_roll(t->curs_row, t->scroll_bot, n); + for (t_row_t *row = t->scroll_bot - n; row < t->scroll_bot; row++) { + t_row_set(row, 0, t->cols, build_attrs(t->curattrs)); + } + } +} + +/* Interpret an 'erase characters' (ECH) sequence */ +static void interpret_csi_ECH(madtty_t *t, int param[], int pcount) +{ + int n = (pcount && param[0] > 0) ? param[0] : 1; + + if (t->curs_col + n < t->cols) { + n = t->cols - t->curs_col; + } + t_row_set(t->curs_row, t->curs_col, n, build_attrs(t->curattrs)); +} + +/* Interpret a 'set scrolling region' (DECSTBM) sequence */ +static void interpret_csi_DECSTBM(madtty_t *t, int param[], int pcount) +{ + int new_top, new_bot; + + switch (pcount) { + case 0: + t->scroll_top = t->lines; + t->scroll_bot = t->lines + t->rows; + break; + default: + return; /* malformed */ + + case 2: + new_top = param[0] - 1; + new_bot = param[1]; + + /* clamp to bounds */ + if (new_top < 0) + new_top = 0; + if (new_top >= t->rows) + new_top = t->rows - 1; + if (new_bot < 0) + new_bot = 0; + if (new_bot >= t->rows) + new_bot = t->rows; + + /* check for range validity */ + if (new_top < new_bot) { + t->scroll_top = t->lines + new_top; + t->scroll_bot = t->lines + new_bot; + } + break; + } +} + +static void es_interpret_csi(madtty_t *t) +{ + static int csiparam[BUFSIZ]; + int param_count = 0; + const char *p = t->ebuf + 1; + char verb = t->ebuf[t->elen - 1]; + + p += t->ebuf[1] == '?'; /* CSI private mode */ + + /* parse numeric parameters */ + while (isdigit((unsigned char)*p) || *p == ';') { + if (*p == ';') { + if (param_count >= (int)sizeof(csiparam)) + return; /* too long! */ + csiparam[param_count++] = 0; + } else { + if (param_count == 0) csiparam[param_count++] = 0; + csiparam[param_count - 1] *= 10; + csiparam[param_count - 1] += *p - '0'; + } + + p++; + } + + if (t->ebuf[1] == '?') { + switch (verb) { + case 'l': + if (csiparam[0] == 25) + t->curshid = true; + break; + + case 'h': + if (csiparam[0] == 25) + t->curshid = false; + break; + } + } + + /* delegate handling depending on command character (verb) */ + switch (verb) { + case 'h': + if (param_count == 1 && csiparam[0] == 4) /* insert mode */ + t->insert = true; + break; + case 'l': + if (param_count == 1 && csiparam[0] == 4) /* replace mode */ + t->insert = false; + break; + case 'm': /* it's a 'set attribute' sequence */ + interpret_csi_SGR(t, csiparam, param_count); break; + case 'J': /* it's an 'erase display' sequence */ + interpret_csi_ED(t, csiparam, param_count); break; + case 'H': case 'f': /* it's a 'move cursor' sequence */ + interpret_csi_CUP(t, csiparam, param_count); break; + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': + case 'e': case 'a': case 'd': case '`': + /* it is a 'relative move' */ + interpret_csi_C(t, verb, csiparam, param_count); break; + case 'K': /* erase line */ + interpret_csi_EL(t, csiparam, param_count); break; + case '@': /* insert characters */ + interpret_csi_ICH(t, csiparam, param_count); break; + case 'P': /* delete characters */ + interpret_csi_DCH(t, csiparam, param_count); break; + case 'L': /* insert lines */ + interpret_csi_IL(t, csiparam, param_count); break; + case 'M': /* delete lines */ + interpret_csi_DL(t, csiparam, param_count); break; + case 'X': /* erase chars */ + interpret_csi_ECH(t, csiparam, param_count); break; + case 'r': /* set scrolling region */ + interpret_csi_DECSTBM(t, csiparam, param_count); break; + case 's': /* save cursor location */ + t->curs_srow = t->curs_row - t->lines; + t->curs_scol = t->curs_col; + break; + case 'u': /* restore cursor location */ + t->curs_row = t->lines + t->curs_srow; + t->curs_col = t->curs_scol; + clamp_cursor_to_bounds(t); + break; + default: + break; + } +} + +static void try_interpret_escape_seq(madtty_t *t) +{ + char lastchar = t->ebuf[t->elen-1]; + + switch (*t->ebuf) { + case '\0': + return; + + case 'M': + interpret_csi_SR(t); + cancel_escape_sequence(t); + return; + + case '(': + case ')': + if (t->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(t); + cancel_escape_sequence(t); + return; + } + break; + } + + if (t->elen + 1 >= (int)sizeof(t->ebuf)) { +cancel: + cancel_escape_sequence(t); + } +} + +static void madtty_process_nonprinting(madtty_t *t, wchar_t wc) +{ + switch (wc) { + case C0_ESC: + new_escape_sequence(t); + break; + + case C0_BEL: + /* do nothing for now... maybe a visual bell would be nice? */ + break; + + case C0_BS: + if (t->curs_col > 0) + t->curs_col--; + break; + + case C0_HT: /* tab */ + t->curs_col = (t->curs_col + 8) & ~7; + if (t->curs_col >= t->cols) + t->curs_col = t->cols - 1; + break; + + case C0_CR: + t->curs_col = 0; + break; + + case C0_VT: + case C0_FF: + case C0_LF: + cursor_line_down(t); + break; + + case C0_SO: /* shift out - acs */ + t->graphmode = true; + break; + case C0_SI: /* shift in - acs */ + t->graphmode = false; + break; + } +} + +// vt100 special graphics and line drawing +// 5f-7e standard vt100 +// 40-5e rxvt extension for extra curses acs chars +static uint16_t const 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 +}; + +static void madtty_putc(madtty_t *t, wchar_t wc) +{ + int width = 0; + + if (!t->seen_input) { + t->seen_input = 1; + kill(-t->childpid, SIGWINCH); + } + + if (t->escaped) { + assert (t->elen + 1 < (int)sizeof(t->ebuf)); + t->ebuf[t->elen] = wc; + t->ebuf[++t->elen] = '\0'; + try_interpret_escape_seq(t); + } else if (IS_CONTROL(wc)) { + madtty_process_nonprinting(t, wc); + } else { + t_row_t *tmp; + + if (t->graphmode) { + if (wc >= 0x41 && wc <= 0x7e && vt100_0[wc - 0x41]) { + wc = vt100_0[wc - 0x41]; + } + width = 1; + } else { + width = wcwidth(wc) ?: 1; + } + + if (width == 2 && t->curs_col == t->cols - 1) { + tmp = t->curs_row; + tmp->dirty = true; + tmp->text[t->curs_col] = 0; + tmp->attr[t->curs_col] = build_attrs(t->curattrs); + t->curs_col++; + } + + if (t->curs_col >= t->cols) { + t->curs_col = 0; + cursor_line_down(t); + } + + tmp = t->curs_row; + tmp->dirty = true; + + if (t->insert) { + wmemmove(tmp->text + t->curs_col + width, tmp->text + t->curs_col, + (t->cols - t->curs_col - width)); + memmove(tmp->attr + t->curs_col + width, tmp->attr + t->curs_col, + (t->cols - t->curs_col - width) * sizeof(tmp->attr[0])); + } + + tmp->text[t->curs_col] = wc; + tmp->attr[t->curs_col] = build_attrs(t->curattrs); + t->curs_col++; + if (width == 2) { + tmp->text[t->curs_col] = 0; + tmp->attr[t->curs_col] = build_attrs(t->curattrs); + t->curs_col++; + } + } +} + +int madtty_process(madtty_t *t) +{ + int res, pos = 0; + + if (t->pty < 0) { + errno = EINVAL; + return -1; + } + + res = read(t->pty, t->rbuf + t->rlen, sizeof(t->rbuf) - t->rlen); + if (res < 0) + return -1; + + t->rlen += res; + while (pos < t->rlen) { + wchar_t wc; + ssize_t len; + + len = (ssize_t)mbrtowc(&wc, t->rbuf + pos, t->rlen - pos, &t->ps); + if (len == -2) { + t->rlen -= pos; + memmove(t->rbuf, t->rbuf + pos, t->rlen); + return 0; + } + + if (len == -1) { + len = 1; + wc = t->rbuf[pos]; + } + + pos += len ? len : 1; + madtty_putc(t, wc); + } + + t->rlen -= pos; + memmove(t->rbuf, t->rbuf + pos, t->rlen); + return 0; +} + +madtty_t *madtty_create(int rows, int cols) +{ + madtty_t *t; + int i; + + if (rows <= 0 || cols <= 0) + return NULL; + + t = (madtty_t*)calloc(sizeof(madtty_t), 1); + if (!t) + return NULL; + + /* record dimensions */ + t->rows = rows; + t->cols = cols; + + /* default mode is replace */ + t->insert = false; + + /* create the cell matrix */ + t->lines = (t_row_t*)calloc(sizeof(t_row_t), t->rows); + for (i = 0; i < t->rows; i++) { + t->lines[i].text = (wchar_t *)calloc(sizeof(wchar_t), t->cols); + t->lines[i].attr = (uint16_t *)calloc(sizeof(uint16_t), t->cols); + } + + t->pty = -1; /* no pty for now */ + + /* initialization of other public fields */ + t->curs_row = t->lines; + t->curs_col = 0; + t->curattrs = A_NORMAL; /* white text over black background */ + + /* initial scrolling area is the whole window */ + t->scroll_top = t->lines; + t->scroll_bot = t->lines + t->rows; + + return t; +} + +void madtty_resize(madtty_t *t, int rows, int cols) +{ + struct winsize ws = { .ws_row = rows, .ws_col = cols }; + t_row_t *lines = t->lines; + + if (rows <= 0 || cols <= 0) + return; + + if (t->rows != rows) { + while (t->rows > rows) { + free(lines[t->rows - 1].text); + free(lines[t->rows - 1].attr); + t->rows--; + } + + lines = realloc(lines, sizeof(t_row_t) * rows); + } + + if (t->cols != cols) { + for (int row = 0; row < t->rows; row++) { + lines[row].text = realloc(lines[row].text, sizeof(wchar_t) * cols); + lines[row].attr = realloc(lines[row].attr, sizeof(uint16_t) * cols); + if (t->cols < cols) + t_row_set(lines + row, t->cols, cols - t->cols, 0); + } + t->cols = cols; + } + + while (t->rows < rows) { + lines[t->rows].text = (wchar_t *)calloc(sizeof(wchar_t), cols); + lines[t->rows].attr = (uint16_t *)calloc(sizeof(uint16_t), cols); + t->rows++; + } + + t->curs_row += lines - t->lines; + t->scroll_top += lines - t->lines; + t->scroll_bot += lines - t->lines; + if (t->scroll_bot > lines + t->rows) + t->scroll_bot = lines + t->rows; + t->lines = lines; + clamp_cursor_to_bounds(t); + ioctl(t->pty, TIOCSWINSZ, &ws); + kill(-t->childpid, SIGWINCH); +} + +void madtty_destroy(madtty_t *t) +{ + int i; + if (!t) + return; + + for (i = 0; i < t->rows; i++) { + free(t->lines[i].text); + free(t->lines[i].attr); + } + free(t->lines); + free(t); +} + +void madtty_draw(madtty_t *t, WINDOW *win, int srow, int scol) +{ + curs_set(0); + for (int i = 0; i < t->rows; i++) { + t_row_t *row = t->lines + i; + + + if (!row->dirty) + continue; + + wmove(win, srow + i, scol); + for (int j = 0; j < t->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) { + char buf[MB_CUR_MAX + 1]; + int len; + + len = wcrtomb(buf, row->text[j], NULL); + waddnstr(win, buf, len); + if (wcwidth(row->text[j]) > 1) + j++; + } else { + waddch(win, row->text[j] > ' ' ? row->text[j] : ' '); + } + } + row->dirty = false; + } + + wmove(win, srow + t->curs_row - t->lines, scol + t->curs_col); + curs_set(!t->curshid); +} + +/******************************************************/ + +pid_t madtty_forkpty(madtty_t *t, const char *p, const char *argv[], int *pty) +{ + struct winsize ws; + pid_t pid; + + ws.ws_row = t->rows; + ws.ws_col = t->cols; + ws.ws_xpixel = ws.ws_ypixel = 0; + + pid = forkpty(&t->pty, NULL, NULL, &ws); + if (pid < 0) + return -1; + + if (pid == 0) { + setsid(); + setenv("TERM", "rxvt", 1); + execv(p, (char *const*)argv); + fprintf(stderr, "\nexecv() failed.\nCommand: '%s'\n", argv[0]); + exit(1); + } + + if (pty) + *pty = t->pty; + return t->childpid = pid; +} + +int madtty_getpty(madtty_t *t) +{ + return t->pty; +} + +void madtty_keypress(madtty_t *t, int keycode) +{ + char c = (char)keycode; + const char *buf; + int len; + + if (keycode >= 0 && keycode < KEY_MAX && keytable[keycode]) { + buf = keytable[keycode]; + len = strlen(keytable[keycode]); + } else { + buf = &c; + len = 1; + } + + while (len > 0) { + int res = write(t->pty, buf, len); + if (res < 0 && errno != EAGAIN && errno != EINTR) + return; + + buf += res; + len -= res; + } +} + +void madtty_init_colors(void) +{ + if (COLORS > 8) { + use_default_colors(); + assume_default_colors(-1, -1); + has_default = 1; + + for (int bg = -1; bg < 8; bg++) { + for (int fg = -1; fg < 8; fg++) { + init_pair((fg + 1) * 16 + bg + 1, fg, bg); + } + } + } else { + for (int bg = 0; bg < 8; bg++) { + for (int fg = 0; fg < 8; fg++) { + init_pair((7 - fg) * 8 + bg, fg, bg); + } + } + } +} + +int madtty_color_pair(int fg, int bg) +{ + if (fg < -1) + fg = -1; + if (bg < -1) + bg = -1; + return COLOR_PAIR(has_default ? (fg + 1) * 16 + bg + 1 : (7 - fg) * 8 + bg); +} diff --git a/lib-ui/madtty.h b/lib-ui/madtty.h new file mode 100644 index 0000000..d36ddfb --- /dev/null +++ b/lib-ui/madtty.h @@ -0,0 +1,49 @@ +/* + LICENSE INFORMATION: + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License (LGPL) as published by the Free Software Foundation. + + Please refer to the COPYING file for more information. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Copyright © 2004 Bruno T. C. de Oliveira + Copyright © 2006 Pierre Habouzit + */ + +#ifndef MADTTY_MADTTY_H +#define MADTTY_MADTTY_H + +#include +#include +#include +#include +#include +#include +#include + +void madtty_init_colors(void); +int madtty_color_pair(int fg, int bg); + +typedef struct madtty_t madtty_t; + +madtty_t *madtty_create(int rows, int cols); +void madtty_resize(madtty_t *, int rows, int cols); +void madtty_destroy(madtty_t *); +pid_t madtty_forkpty(madtty_t *, const char *, const char *argv[], int *pty); +int madtty_getpty(madtty_t *); + +int madtty_process(madtty_t *); +void madtty_keypress(madtty_t *, int keycode); +void madtty_draw(madtty_t *, WINDOW *win, int startrow, int startcol); + + +#endif /* MADTTY_MADTTY_H */ diff --git a/pager.c b/pager.c index 24fe18a..59db45f 100644 --- a/pager.c +++ b/pager.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include "mutt.h" @@ -216,7 +217,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, if (special || a->attr) { if ((a->attr & ANSI_COLOR)) { if (a->pair == -1) - a->pair = mutt_alloc_color (a->fg, a->bg); + a->pair = madtty_color_pair(a->fg, a->bg); color = a->pair; if (a->attr & ANSI_BOLD) color |= A_BOLD;