From 08040438d06b9b64f12cd790765ec21c02397a6d Mon Sep 17 00:00:00 2001 From: FreeBirdLjj Date: Mon, 29 Sep 2014 14:01:30 +0800 Subject: [PATCH] Support for inline markdown in unordered list. --- src/viewer.c | 195 ++++++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 97 deletions(-) diff --git a/src/viewer.c b/src/viewer.c index 079cd3d..5413183 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -397,120 +397,121 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { } void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) { - int i; // increment - if(line->text->text) { - int offset = 0; // text offset - - // IS_UNORDERED_LIST_3 - if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) { - offset = next_nonblank(line->text, 0); - char format_s[15]; - strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); - strcpy(&format_s[4], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? " | " : " "); - strcpy(&format_s[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_UNORDERED_LIST_2 - } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { - offset = next_nonblank(line->text, 0); - char format_s[11]; - strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); - strcpy(&format_s[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_UNORDERED_LIST_1 - } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { - offset = next_nonblank(line->text, 0); - char format_s[7]; - strcpy(&format_s[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_CODE - } else if(CHECK_BIT(line->bits, IS_CODE)) { - - // set static offset for code - offset = CODE_INDENT; - - // reverse color for code blocks - if(colors) - wattron(window, COLOR_PAIR(CP_BLACK)); + if(!line->text->text) { + return; + } - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + int i; // increment + int offset = 0; // text offset + + // move the cursor in position + wmove(window, y, x); + + // IS_UNORDERED_LIST_3 + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) { + offset = next_nonblank(line->text, 0); + char prompt[10]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "| " : " "); + strcpy(&prompt[3], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? "| " : " "); + strcpy(&prompt[6], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // IS_UNORDERED_LIST_2 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { + offset = next_nonblank(line->text, 0); + char prompt[7]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "| " : " "); + strcpy(&prompt[3], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // IS_UNORDERED_LIST_1 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { + offset = next_nonblank(line->text, 0); + char prompt[4]; + strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // IS_CODE + } else if(CHECK_BIT(line->bits, IS_CODE)) { + + // set static offset for code + offset = CODE_INDENT; + + // reverse color for code blocks + if(colors) + wattron(window, COLOR_PAIR(CP_BLACK)); - } else { + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); - // IS_H1 || IS_H2 - if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { + } else { - // set headline color - if(colors) - wattron(window, COLOR_PAIR(CP_BLUE)); + // IS_H1 || IS_H2 + if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { - // enable underline for H1 - if(CHECK_BIT(line->bits, IS_H1)) - wattron(window, A_UNDERLINE); + // set headline color + if(colors) + wattron(window, COLOR_PAIR(CP_BLUE)); - // skip hashes - while(line->text->text[offset] == '#') - offset = next_word(line->text, offset); + // enable underline for H1 + if(CHECK_BIT(line->bits, IS_H1)) + wattron(window, A_UNDERLINE); - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + // skip hashes + while(line->text->text[offset] == '#') + offset = next_word(line->text, offset); - wattroff(window, A_UNDERLINE); + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); - } else { - // move the cursor in position - wmove(window, y, x); - - // IS_QUOTE - if(CHECK_BIT(line->bits, IS_QUOTE)) { - while(line->text->text[offset] == '>') { - // print a reverse color block - if(colors) { - wattron(window, COLOR_PAIR(CP_BLACK)); - wprintw(window, "%s", " "); - wattron(window, COLOR_PAIR(CP_WHITE)); - wprintw(window, "%s", " "); - } else { - wprintw(window, "%s", ">"); - } + wattroff(window, A_UNDERLINE); - // find next quote or break - offset++; - if(line->text->text[offset] == ' ') - offset = next_word(line->text, offset); + } else { + + // IS_QUOTE + if(CHECK_BIT(line->bits, IS_QUOTE)) { + while(line->text->text[offset] == '>') { + // print a reverse color block + if(colors) { + wattron(window, COLOR_PAIR(CP_BLACK)); + wprintw(window, "%s", " "); + wattron(window, COLOR_PAIR(CP_WHITE)); + wprintw(window, "%s", " "); + } else { + wprintw(window, "%s", ">"); } - } - inline_display(window, &line->text->text[offset], colors); + // find next quote or break + offset++; + if(line->text->text[offset] == ' ') + offset = next_word(line->text, offset); + } } + + inline_display(window, &line->text->text[offset], colors); } + } - // fill rest off line with spaces - for(i = getcurx(window) - x; i < max_cols; i++) - wprintw(window, "%s", " "); + // fill rest off line with spaces + for(i = getcurx(window) - x; i < max_cols; i++) + wprintw(window, "%s", " "); - // reset to default color - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - wattroff(window, A_UNDERLINE); - } + // reset to default color + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + wattroff(window, A_UNDERLINE); } void inline_display(WINDOW *window, const char *c, const int colors) { -- 2.20.1