X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=0e2da5893e7960c8485222a2573d49562a495d91;hb=e9663e348e5e5d36b36ec38a582df7df1fc9126b;hp=6b551de0e51449735b86386e7fe7c35dfaef414b;hpb=57d199e001fa71fc1d0e2aa4e7daae975254392c;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 6b551de..0e2da58 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -21,10 +21,10 @@ * */ +#include // isalnum #include // setlocale -#include #include // strchr -#include +#include // usleep #include "viewer.h" @@ -65,6 +65,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { int c = 0; // char int i = 0; // iterate int l = 0; // line number + int lc = 0; // line count int sc = 1; // slide count int colors = 0; // amount of colors supported int fade = 0; // disable color fading by default @@ -82,41 +83,80 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide_t *slide = deck->slide; line_t *line; + // set locale to display UTF-8 correctly in ncurses + setlocale(LC_CTYPE, ""); + + // init ncurses + initscr(); + while(slide) { - // set max_lines if line count exceeded - max_lines = (slide->lines > max_lines) ? slide->lines : max_lines; + lc = 0; line = slide->line; + while(line) { - // set max_cols if length exceeded - max_cols = (line->length > max_cols) ? line->length : max_cols; + + if (line && line->text && line->text->text) + lc += url_count_inline(line->text->text); + + if (line && line->text && line->text->text) + line->length -= url_len_inline(line->text->text); + + if(line->length > COLS) { + i = line->length; + offset = 0; + while(i > COLS) { + + i = prev_blank(line->text, offset + COLS) - offset; + + // single word is > COLS + if(!i) { + // calculate min_width + i = next_blank(line->text, offset + COLS) - offset; + + // disable ncurses + endwin(); + + // print error + fprintf(stderr, "Error: Terminal width (%i columns) too small. Need at least %i columns.\n", COLS, i); + fprintf(stderr, "You may need to shorten some lines by inserting line breaks.\n"); + + return 1; + } + + // set max_cols + max_cols = MAX(i, max_cols); + + // iterate to next line + offset = prev_blank(line->text, offset + COLS); + i = line->length - offset; + lc++; + } + // set max_cols one last time + max_cols = MAX(i, max_cols); + } else { + // set max_cols + max_cols = MAX(line->length, max_cols); + } + lc++; line = line->next; } - slide = slide->next; - } - // set locale to display UTF-8 correctly in ncurses - setlocale(LC_CTYPE, ""); + max_lines = MAX(lc, max_lines); - // init ncurses - initscr(); + slide = slide->next; + } - if((max_cols > COLS) || - (max_lines + bar_top + bar_bottom + 2 > LINES)) { + // not enough lines + if(max_lines + bar_top + bar_bottom > LINES) { // disable ncurses endwin(); // print error - fprintf(stderr, "Error: Terminal size %ix%i too small. Need at least %ix%i.\n", - COLS, LINES, max_cols, max_lines + bar_top + bar_bottom + 2); - - // print hint to solve it - if(max_lines + bar_top + bar_bottom + 2 > LINES) - fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n"); - if(max_cols > COLS) - fprintf(stderr, "Automatic line wrapping is not supported jet. You may need to shorten some lines by inserting line breaks.\n"); + fprintf(stderr, "Error: Terminal height (%i lines) too small. Need at least %i lines.\n", LINES, max_lines + bar_top + bar_bottom); + fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n"); - return(1); + return 1; } // disable cursor @@ -161,7 +201,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { init_pair(CP_YELLOW, 208, trans); // enable color fading - if(!nofade) fade = 1; + if(!nofade) + fade = true; // 8 color mode } else { @@ -200,6 +241,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = deck->slide; while(slide) { + + url_init(); + // clear windows werase(content); werase(stdscr); @@ -232,6 +276,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { "%d / %d", sc, deck->slides); // make header + fooder visible + wrefresh(content); wrefresh(stdscr); line = slide->line; @@ -240,8 +285,15 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // print lines while(line) { add_line(content, l, (COLS - max_cols) / 2, line, max_cols, colors); + l += (line->length / COLS) + 1; line = line->next; - l++; + } + + int i, ymax; + getmaxyx( content, ymax, i ); + for (i = 0; i < url_get_amount(); i++) { + mvwprintw(content, ymax - url_get_amount() - 1 + i, 3, + "[%d] %s", i, url_get_target(i)); } // make content visible @@ -252,7 +304,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { fade_in(content, trans, colors, invert); // re-enable fading after any undefined key press - if(COLORS == 256 && !nofade) fade = 1; + if(COLORS == 256 && !nofade) + fade = true; // wait for user input c = getch(); @@ -264,6 +317,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // show previous slide case KEY_UP: case KEY_LEFT: + case KEY_PPAGE: case 8: // BACKSPACE (ascii) case 127: // BACKSPACE (xterm) case 263: // BACKSPACE (getty) @@ -273,13 +327,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = slide->prev; sc--; } else { - fade = 0; + fade = false; } break; // show next slide case KEY_DOWN: case KEY_RIGHT: + case KEY_NPAGE: case '\n': // ENTER case ' ': // SPACE case 'j': @@ -288,7 +343,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = slide->next; sc++; } else { - fade = 0; + fade = false; } break; @@ -320,7 +375,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { } } else { // disable fading if slide n doesn't exist - fade = 0; + fade = false; } break; @@ -343,82 +398,147 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // quit case 'q': // do not fade out on exit - fade = 0; - slide = (void*)0; + fade = false; + slide = NULL; break; default: // disable fading on undefined key press - fade = 0; + fade = false; break; } // fade out if(fade) fade_out(content, trans, colors, invert); + + url_purge(); } endwin(); - return(0); + return 0; } void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) { - int i = 0; // increment - char *c; // char pointer for iteration - char *special = "\\*_`"; // list of interpreted chars - cstack_t *stack = cstack_init(); - - if(line->text->text) { - int offset = 0; // text offset - - 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]); - } 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]); - } 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]); - } else - - - // IS_CODE - 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)); - - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + if(!line->text->text) { + return; + } + + 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[13]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); + strcpy(&prompt[4], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? " | " : " "); + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " | " : " "); + } else { + strcpy(&prompt[8], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + + // IS_UNORDERED_LIST_2 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { + offset = next_nonblank(line->text, 0); + char prompt[9]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " | " : " "); + } else { + strcpy(&prompt[4], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + + // IS_UNORDERED_LIST_1 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { + offset = next_nonblank(line->text, 0); + char prompt[5]; + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " | " : " "); + } else { + strcpy(&prompt[0], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + } + + // IS_CODE + 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)); + + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); + } + + if(!CHECK_BIT(line->bits, IS_UNORDERED_LIST_1) && + !CHECK_BIT(line->bits, IS_UNORDERED_LIST_2) && + !CHECK_BIT(line->bits, IS_UNORDERED_LIST_3) && + !CHECK_BIT(line->bits, IS_CODE)) { + + // 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", ">"); + } + + // 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); } else { + // IS_CENTER + if(CHECK_BIT(line->bits, IS_CENTER)) { + if(line->length < max_cols) { + wmove(window, y, x + ((max_cols - line->length) / 2)); + } + } + // IS_H1 || IS_H2 if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { @@ -435,144 +555,189 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo offset = next_word(line->text, offset); // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + wprintw(window, + "%s", &line->text->text[offset]); wattroff(window, A_UNDERLINE); + // no line-wide markdown } 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", ">"); - } - // 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", " "); + + // 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) { + const static char *special = "\\*_`!["; // list of interpreted chars + const char *i = c; // iterator + const char *start_link_name, *start_url; + int length_link_name, url_num; + cstack_t *stack = cstack_init(); + + + // for each char in line + for(; *i; i++) { + + // if char is in special char list + if(strchr(special, *i)) { + + // closing special char (or second backslash) + // only if not followed by :alnum: + if((stack->top)(stack, *i) && + (!isalnum((int)i[1]) || *(i + 1) == '\0' || *i == '\\')) { + + switch(*i) { + // print escaped backslash + case '\\': + wprintw(window, "%c", *i); + break; + // disable highlight + case '*': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // disable underline + case '_': + wattroff(window, A_UNDERLINE); + break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; } - // for each char in line - c = &line->text->text[offset]; - while(*c) { - - // if char is in special char list - if(strchr(special, *c)) { - - // closing special char (or second backslash) - if((stack->top)(stack, *c)) { - - switch(*c) { - // print escaped backslash - case '\\': - wprintw(window, "%c", *c); - break; - // disable highlight - case '*': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - // disable underline - case '_': - wattroff(window, A_UNDERLINE); - break; - // disable inline code - case '`': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - } + // remove top special char from stack + (stack->pop)(stack); - // remove top special char from stack - (stack->pop)(stack); + // treat special as regular char + } else if((stack->top)(stack, '\\')) { + wprintw(window, "%c", *i); - // treat special as regular char - } else if((stack->top)(stack, '\\')) { - wprintw(window, "%c", *c); + // remove backslash from stack + (stack->pop)(stack); - // remove backslash from stack - (stack->pop)(stack); + // opening special char + } else { - // opening special char - } else { - switch(*c) { - // enable highlight - case '*': - if(colors) - wattron(window, COLOR_PAIR(CP_RED)); - break; - // enable underline - case '_': - wattron(window, A_UNDERLINE); - break; - // enable inline code - case '`': - if(colors) - wattron(window, COLOR_PAIR(CP_BLACK)); - break; - // do nothing for backslashes - } + // emphasis or code span can start after new-line or space only + // and of cause after another emphasis markup + //TODO this condition looks ugly + if(i == c || + *(i - 1) == ' ' || + ((*(i - 1) == '_' || *(i - 1) == '*') && ((i - 1) == c || *(i - 2) == ' ')) || + *i == '\\') { - // push special char to stack - (stack->push)(stack, *c); - } + // url in pandoc style + if ((*i == '[' && strchr(i, ']')) || + (*i == '!' && *(i + 1) == '[' && strchr(i, ']'))) { - } else { - // remove backslash from stack - if((stack->top)(stack, '\\')) - (stack->pop)(stack); + if (*i == '!') i++; - // print regular char - wprintw(window, "%c", *c); - } + if (strchr(i, ']')[1] == '(') { + i++; - c++; - } + // turn higlighting and underlining on + if (colors) + wattron(window, COLOR_PAIR(CP_BLUE)); + wattron(window, A_UNDERLINE); + + start_link_name = i; + + // print the content of the label + // the label is printed as is + do { + wprintw(window, "%c", *i); + i++; + } while (*i != ']'); + + length_link_name = i - 1 - start_link_name; + + i++; + i++; + + start_url = i; + + while (*i != ')') i++; + + url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0); + + wprintw(window, " [%d]", url_num); + + // turn highlighting and underlining off + wattroff(window, A_UNDERLINE); + wattron(window, COLOR_PAIR(CP_WHITE)); + + } else { + wprintw(window, "["); + } - // pop stack until empty to prevent formated trailing spaces - while(!(stack->empty)(stack)) { - switch((stack->pop)(stack)) { - // disable highlight + } else switch(*i) { + // enable highlight case '*': if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); + wattron(window, COLOR_PAIR(CP_RED)); break; - // disable underline + // enable underline case '_': - wattroff(window, A_UNDERLINE); + wattron(window, A_UNDERLINE); break; - // disable inline code + // enable inline code case '`': if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); + wattron(window, COLOR_PAIR(CP_BLACK)); break; // do nothing for backslashes } + + // push special char to stack + (stack->push)(stack, *i); + + } else { + wprintw(window, "%c", *i); } } - } - // fill rest off line with spaces - for(i = getcurx(window) - x; i < max_cols; i++) - wprintw(window, "%s", " "); + } else { + // remove backslash from stack + if((stack->top)(stack, '\\')) + (stack->pop)(stack); - // reset to default color - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - wattroff(window, A_UNDERLINE); + // print regular char + wprintw(window, "%c", *i); + } + } + + // pop stack until empty to prevent formated trailing spaces + while(!(stack->empty)(stack)) { + switch((stack->pop)(stack)) { + // disable highlight + case '*': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // disable underline + case '_': + wattroff(window, A_UNDERLINE); + break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // do nothing for backslashes + } } (stack->delete)(stack);