X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=c538e7c654b888d2c82f6bc6f94fd64996674822;hb=60f4f976c4f4743ff299dcc3a92c0b9f86d8bbc3;hp=0e8204f55a7d2013a6caab0f85c26c9e33fc10e2;hpb=6363ec143cd316f05d85697c7edbe50a1592b750;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 0e8204f..c538e7c 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -2,7 +2,7 @@ * Functions necessary to display a deck of slides in different color modes * using ncurses. Only white, red, and blue are supported, as they can be * faded in 256 color mode. - * Copyright (C) 2015 Michael Goehler + * Copyright (C) 2018 Michael Goehler * * This file is part of mdp. * @@ -26,7 +26,9 @@ #include // iswalnum #include // strcpy #include // usleep +#include // getenv #include "viewer.h" +#include "config.h" // color ramp for fading from black to color static short white_ramp[24] = { 16, 232, 233, 234, 235, 236, @@ -60,20 +62,21 @@ static short red_ramp_invert[24] = { 15, 231, 231, 224, 224, 225, 206, 207, 201, 200, 199, 199, 198, 198, 197, 197, 196, 196}; -int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload, int slidenum) { - - 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 - int trans = -1; // enable transparency if term supports it - int max_lines = 0; // max lines per slide - int max_cols = 0; // max columns per line - int offset; // text offset - int stop = 0; // passed stop bits per slide +int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload, int slidenum, int nocodebg) { + + 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 + int trans = -1; // enable transparency if term supports it + int max_lines = 0; // max lines per slide + int max_lines_slide = -1; // the slide that has the most lines + int max_cols = 0; // max columns per line + int offset; // text offset + int stop = 0; // passed stop bits per slide // header line 1 is displayed at the top int bar_top = (deck->headers > 0) ? 1 : 0; @@ -93,11 +96,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa while(line && line->text) { - if (line->text->value) + if (line->text->value) { lc += url_count_inline(line->text->value); - - if (line->text->value) line->length -= url_len_inline(line->text->value); + } if(line->length > COLS) { i = line->length; @@ -141,8 +143,13 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa } max_lines = MAX(lc, max_lines); + if (lc == max_lines) { + max_lines_slide = sc; + } + slide->lines_consumed = lc; slide = slide->next; + ++sc; } // not enough lines @@ -152,7 +159,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa endwin(); // print error - fwprintf(stderr, L"Error: Terminal height (%i lines) too small. Need at least %i lines.\n", LINES, max_lines + bar_top + bar_bottom); + fwprintf(stderr, L"Error: Terminal height (%i lines) too small. Need at least %i lines for slide #%i.\n", LINES, max_lines + bar_top + bar_bottom, max_lines_slide); fwprintf(stderr, L"You may need to add additional horizontal rules (---) to split your file in shorter slides.\n"); // no reload @@ -209,39 +216,42 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa if(notrans) { if(invert) { - trans = 7; // white in 8 color mode + trans = FG_COLOR; // white in 8 color mode } else { - trans = 0; // black in 8 color mode + trans = BG_COLOR; // black in 8 color mode } } if(invert) { - init_pair(CP_WHITE, 0, trans); - init_pair(CP_BLACK, 7, 0); + init_pair(CP_WHITE, BG_COLOR, trans); + init_pair(CP_BLACK, FG_COLOR, BG_COLOR); } else { - init_pair(CP_WHITE, 7, trans); - init_pair(CP_BLACK, 0, 7); + init_pair(CP_WHITE, FG_COLOR, trans); + init_pair(CP_BLACK, BG_COLOR, FG_COLOR); } - init_pair(CP_BLUE, 4, trans); - init_pair(CP_RED, 1, trans); - init_pair(CP_YELLOW, 3, trans); + init_pair(CP_BLUE, HEADER_COLOR, trans); + init_pair(CP_RED, BOLD_COLOR, trans); + init_pair(CP_YELLOW, TITLE_COLOR, trans); } colors = 1; } - // set background color of main window + // set background color for main window if(colors) - wbkgd(stdscr, COLOR_PAIR(CP_YELLOW)); + wbkgd(stdscr, COLOR_PAIR(CP_WHITE)); - // setup main window + // setup content window WINDOW *content = newwin(LINES - bar_top - bar_bottom, COLS, 0 + bar_top, 0); + + // set background color of content window if(colors) wbkgd(content, COLOR_PAIR(CP_WHITE)); slide = deck->slide; // find slide to reload + sc = 1; while(reload > 1 && reload <= deck->slides) { slide = slide->next; sc++; @@ -262,6 +272,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa // always resize window in case terminal geometry has changed wresize(content, LINES - bar_top - bar_bottom, COLS); + // set main window text color + if(colors) + wattron(stdscr, COLOR_PAIR(CP_YELLOW)); + // setup header if(bar_top) { line = deck->header; @@ -305,16 +319,16 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa break; } - // make header + fooder visible - wrefresh(content); - wrefresh(stdscr); + // copy changed lines in main window to virtual screen + wnoutrefresh(stdscr); line = slide->line; l = stop = 0; // print lines while(line) { - add_line(content, l, (COLS - max_cols) / 2, line, max_cols, colors); + add_line(content, l + ((LINES - slide->lines_consumed - bar_top - bar_bottom) / 2), + (COLS - max_cols) / 2, line, max_cols, colors, nocodebg); // raise stop counter if we pass a line having a stop bit if(CHECK_BIT(line->bits, IS_STOP)) @@ -329,8 +343,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa } // print pandoc URL references - // only if we already printed all lines of the current slide - if(!line) { + // only if we already printed all lines of the current slide (or output is stopped) + if(!line || + stop > slide->stop) { int i, ymax; getmaxyx( content, ymax, i ); for (i = 0; i < url_get_amount(); i++) { @@ -340,8 +355,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa } } - // make content visible - wrefresh(content); + // copy changed lines in content window to virtual screen + wnoutrefresh(content); + + // compare virtual screen to physical screen and does the actual updates + doupdate(); // fade in if(fade) @@ -356,138 +374,96 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa // evaluate user input i = 0; - switch(c) { + if (evaluate_binding(prev_slide_binding, c)) { // show previous slide or stop bit - case KEY_UP: - case KEY_LEFT: - case KEY_PPAGE: - case 8: // BACKSPACE (ascii) - case 127: // BACKSPACE (xterm) - case 263: // BACKSPACE (getty) - case 'h': - case 'k': - if(stop > 1 || (stop == 1 && !line)) { - // show current slide again - // but stop one stop bit earlier - slide->stop--; - fade = false; + if(stop > 1 || (stop == 1 && !line)) { + // show current slide again + // but stop one stop bit earlier + slide->stop--; + fade = false; + } else { + if(slide->prev) { + // show previous slide + slide = slide->prev; + sc--; + //stop on first bullet point always + if(slide->stop > 0) + slide->stop = 0; } else { - if(slide->prev) { - // show previous slide - slide = slide->prev; - sc--; - //stop on first bullet point always - if(slide->stop > 0) - slide->stop = 0; - } else { - // do nothing - fade = false; - } + // do nothing + fade = false; } - break; - + } + } else if (evaluate_binding(next_slide_binding, c)) { // show next slide or stop bit - case KEY_DOWN: - case KEY_RIGHT: - case KEY_NPAGE: - case '\n': // ENTER - case ' ': // SPACE - case 'j': - case 'l': - if(stop && line) { - // show current slide again - // but stop one stop bit later (or at end of slide) - slide->stop++; - fade = false; + if(stop && line) { + // show current slide again + // but stop one stop bit later (or at end of slide) + slide->stop++; + fade = false; + } else { + if(slide->next) { + // show next slide + slide = slide->next; + sc++; } else { - if(slide->next) { - // show next slide - slide = slide->next; - sc++; - } else { - // do nothing - fade = false; - } + // do nothing + fade = false; } - break; - + } + } else if (isdigit(c) && c != '0') { // show slide n - case '9': - case '8': - case '7': - case '6': - case '5': - case '4': - case '3': - case '2': - case '1': - i = get_slide_number(c); - if(i > 0 && i <= deck->slides) { - while(sc != i) { - // search forward - if(sc < i) { - if(slide->next) { - slide = slide->next; - sc++; - } - // search backward - } else { - if(slide->prev) { - slide = slide->prev; - sc--; - } + i = get_slide_number(c); + if(i > 0 && i <= deck->slides) { + while(sc != i) { + // search forward + if(sc < i) { + if(slide->next) { + slide = slide->next; + sc++; + } + // search backward + } else { + if(slide->prev) { + slide = slide->prev; + sc--; } } - } else { - // disable fading if slide n doesn't exist - fade = false; } - break; - + } + } else if (evaluate_binding(first_slide_binding, c)) { // show first slide - case 'g': - case KEY_HOME: - slide = deck->slide; - sc = 1; - break; - + slide = deck->slide; + sc = 1; + } else if (evaluate_binding(last_slide_binding, c)) { // show last slide - case 'G': - case KEY_END: - for(i = sc; i <= deck->slides; i++) { - if(slide->next) { - slide = slide->next; - sc++; - } + for(i = sc; i <= deck->slides; i++) { + if(slide->next) { + slide = slide->next; + sc++; } - break; - + } + } else if (evaluate_binding(reload_binding, c)) { // reload - case 'r': - if(noreload == 0) { - // reload slide N - reload = sc; - slide = NULL; - } else { - // disable fading if reload is not possible - fade = false; - } - break; - - // quit - case 'q': - // do not fade out on exit - fade = false; - // do not reload - reload = 0; + if(noreload == 0) { + // reload slide N + reload = sc; slide = NULL; - break; - - default: - // disable fading on undefined key press + } else { + // disable fading if reload is not possible fade = false; - break; + } + } else if (evaluate_binding(quit_binding, c)) { + // quit + // do not fade out on exit + fade = false; + // do not reload + reload = 0; + slide = NULL; + } else { + // disable fading on undefined key press + fade = false; } // fade out @@ -509,11 +485,34 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa return reload; } -void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) { - - if(!line->text->value) { - return; +void setup_list_strings(void) +{ + const char *str; + + /* utf8 can require 6 bytes */ + if ((str = getenv("MDP_LIST_OPEN")) != NULL && strlen(str) <= 4*6) { + list_open1 = list_open2 = list_open3 = str; + } else { + if ((str = getenv("MDP_LIST_OPEN1")) != NULL && strlen(str) <= 4*6) + list_open1 = str; + if ((str = getenv("MDP_LIST_OPEN2")) != NULL && strlen(str) <= 4*6) + list_open2 = str; + if ((str = getenv("MDP_LIST_OPEN3")) != NULL && strlen(str) <= 4*6) + list_open3 = str; + } + if ((str = getenv("MDP_LIST_HEAD")) != NULL && strlen(str) <= 4*6) { + list_head1 = list_head2 = list_head3 = str; + } else { + if ((str = getenv("MDP_LIST_HEAD1")) != NULL && strlen(str) <= 4*6) + list_head1 = str; + if ((str = getenv("MDP_LIST_HEAD2")) != NULL && strlen(str) <= 4*6) + list_head2 = str; + if ((str = getenv("MDP_LIST_HEAD3")) != NULL && strlen(str) <= 4*6) + list_head3 = str; } +} + +void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors, int nocodebg) { int i; // increment int offset = 0; // text offset @@ -521,17 +520,37 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // move the cursor in position wmove(window, y, x); + if(!line->text->value) { + + // fill rest off line with spaces if we are in a code block + if(CHECK_BIT(line->bits, IS_CODE) && colors) { + if(colors && !nocodebg) + wattron(window, COLOR_PAIR(CP_BLACK)); + for(i = getcurx(window) - x; i < max_cols; i++) + wprintw(window, "%s", " "); + } + + // do nothing + return; + } + // 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)? " | " : " "); + char prompt[13 * 6]; + int pos = 0, len, cnt; + len = sizeof(prompt) - pos; + cnt = snprintf(&prompt[pos], len, "%s", CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? list_open1 : " "); + pos += (cnt > len - 1 ? len - 1 : cnt); + len = sizeof(prompt) - pos; + cnt = snprintf(&prompt[pos], len, "%s", CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? list_open2 : " "); + pos += (cnt > len - 1 ? len - 1 : cnt); + len = sizeof(prompt) - pos; if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { - strcpy(&prompt[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " | " : " "); + snprintf(&prompt[pos], len, "%s", line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? list_open3 : " "); } else { - strcpy(&prompt[8], " +- "); + snprintf(&prompt[pos], len, "%s", list_head3); offset += 2; } @@ -539,18 +558,22 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo "%s", prompt); if(!CHECK_BIT(line->bits, IS_CODE)) - inline_display(window, &line->text->value[offset], colors); + inline_display(window, &line->text->value[offset], colors, nocodebg); // 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)? " | " : " "); + char prompt[9 * 6]; + int pos = 0, len, cnt; + len = sizeof(prompt) - pos; + cnt = snprintf(&prompt[pos], len, "%s", CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? list_open1 : " "); + pos += (cnt > len - 1 ? len - 1 : cnt); + len = sizeof(prompt) - pos; if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { - strcpy(&prompt[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " | " : " "); + snprintf(&prompt[pos], len, "%s", line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? list_open2 : " "); } else { - strcpy(&prompt[4], " +- "); + snprintf(&prompt[pos], len, "%s", list_head2); offset += 2; } @@ -558,17 +581,17 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo "%s", prompt); if(!CHECK_BIT(line->bits, IS_CODE)) - inline_display(window, &line->text->value[offset], colors); + inline_display(window, &line->text->value[offset], colors, nocodebg); // IS_UNORDERED_LIST_1 } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { offset = next_nonblank(line->text, 0); - char prompt[5]; + char prompt[5 * 6]; if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { - strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " | " : " "); + strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? list_open1 : " "); } else { - strcpy(&prompt[0], " +- "); + strcpy(&prompt[0], list_head1); offset += 2; } @@ -576,19 +599,20 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo "%s", prompt); if(!CHECK_BIT(line->bits, IS_CODE)) - inline_display(window, &line->text->value[offset], colors); + inline_display(window, &line->text->value[offset], colors, nocodebg); } // IS_CODE if(CHECK_BIT(line->bits, IS_CODE)) { - if (!CHECK_BIT(line->bits, IS_TILDE_CODE)) { + if (!CHECK_BIT(line->bits, IS_TILDE_CODE) && + !CHECK_BIT(line->bits, IS_GFM_CODE)) { // set static offset for code offset = CODE_INDENT; } // reverse color for code blocks - if(colors) + if(colors && !nocodebg) wattron(window, COLOR_PAIR(CP_BLACK)); // print whole lines @@ -619,7 +643,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo offset = next_word(line->text, offset); } - inline_display(window, &line->text->value[offset], colors); + inline_display(window, &line->text->value[offset], colors, nocodebg); } else { // IS_CENTER @@ -652,7 +676,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // no line-wide markdown } else { - inline_display(window, &line->text->value[offset], colors); + inline_display(window, &line->text->value[offset], colors, nocodebg); } } } @@ -670,7 +694,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo wattroff(window, A_UNDERLINE); } -void inline_display(WINDOW *window, const wchar_t *c, const int colors) { +void inline_display(WINDOW *window, const wchar_t *c, const int colors, int nocodebg) { const static wchar_t *special = L"\\*_`!["; // list of interpreted chars const wchar_t *i = c; // iterator const wchar_t *start_link_name, *start_url; @@ -788,7 +812,7 @@ void inline_display(WINDOW *window, const wchar_t *c, const int colors) { break; // enable inline code case L'`': - if(colors) + if(colors && !nocodebg) wattron(window, COLOR_PAIR(CP_BLACK)); break; // do nothing for backslashes @@ -854,8 +878,11 @@ void fade_out(WINDOW *window, int trans, int colors, int invert) { init_pair(CP_BLACK, 16, white_ramp[i]); } - // refresh window with new color - wrefresh(window); + // refresh virtual screen with new color + wnoutrefresh(window); + + // compare virtual screen to physical screen and does the actual updates + doupdate(); // delay for our eyes to recognize the change usleep(FADE_DELAY); @@ -881,8 +908,11 @@ void fade_in(WINDOW *window, int trans, int colors, int invert) { init_pair(CP_BLACK, 16, white_ramp[i]); } - // refresh window with new color - wrefresh(window); + // refresh virtual screen with new color + wnoutrefresh(window); + + // compare virtual screen to physical screen and does the actual updates + doupdate(); // delay for our eyes to recognize the change usleep(FADE_DELAY); @@ -901,7 +931,7 @@ int int_length (int val) { int get_slide_number(char init) { int retval = init - '0'; - char c; + int c; // block for tenths of a second when using getch, ERR if no input halfdelay(GOTO_SLIDE_DELAY); while((c = getch()) != ERR) { @@ -915,3 +945,14 @@ int get_slide_number(char init) { cbreak(); // go back to cbreak return retval; } + +bool evaluate_binding(const int bindings[], char c) { + int binding; + int ind = 0; + while((binding = bindings[ind]) != 0) { + if (c == binding) return true; + ind++; + } + return false; +} +