X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=2cf5911b2e112a5f9a1d97d2763aded3d7cdecff;hb=75c55236b8382936bb41b4d1b11376b0e4a39c3d;hp=43a0733df2a360f7cacd2902acf53be1662bc038;hpb=b17ed569c4a9c22ef75bd6ffaf4a50a9bb8ec379;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 43a0733..2cf5911 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,6 +26,7 @@ #include // iswalnum #include // strcpy #include // usleep +#include // getenv #include "viewer.h" // color ramp for fading from black to color @@ -60,20 +61,33 @@ static short red_ramp_invert[24] = { 15, 231, 231, 224, 224, 225, 206, 207, 201, 200, 199, 199, 198, 198, 197, 197, 196, 196}; +// unordered list characters +// +// override via env vars: +// export MDP_LIST_OPEN1=" " MDP_LIST_OPEN2=" " MDP_LIST_OPEN3=" " +// export MDP_LIST_HEAD1=" ■ " MDP_LIST_HEAD2=" ● " MDP_LIST_HEAD3=" ▫ " +static const char *list_open1 = " | "; +static const char *list_open2 = " | "; +static const char *list_open3 = " | "; +static const char *list_head1 = " +- "; +static const char *list_head2 = " +- "; +static const char *list_head3 = " +- "; + 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 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; @@ -140,8 +154,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 @@ -151,7 +170,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 @@ -229,18 +248,21 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa 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++; @@ -261,6 +283,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; @@ -304,16 +330,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); // raise stop counter if we pass a line having a stop bit if(CHECK_BIT(line->bits, IS_STOP)) @@ -328,8 +354,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++) { @@ -339,8 +366,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) @@ -508,6 +538,33 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa return reload; } +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 i; // increment @@ -520,7 +577,8 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // fill rest off line with spaces if we are in a code block if(CHECK_BIT(line->bits, IS_CODE) && colors) { - wattron(window, COLOR_PAIR(CP_BLACK)); + if(colors) + wattron(window, COLOR_PAIR(CP_BLACK)); for(i = getcurx(window) - x; i < max_cols; i++) wprintw(window, "%s", " "); } @@ -532,14 +590,20 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // 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; } @@ -552,13 +616,17 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // 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; } @@ -571,12 +639,12 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // 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; } @@ -590,7 +658,8 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // 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; } @@ -862,8 +931,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); @@ -889,8 +961,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); @@ -909,7 +984,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) {