* 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.
*
#include <wctype.h> // iswalnum
#include <string.h> // strcpy
#include <unistd.h> // usleep
+#include <stdlib.h> // getenv
#include "viewer.h"
// color ramp for fading from black to color
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
+// 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 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;
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;
}
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
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
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++;
// 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;
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))
}
// 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++) {
}
}
- // 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)
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
// 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;
}
"%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;
}
"%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;
}
"%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
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
// no line-wide markdown
} else {
- inline_display(window, &line->text->value[offset], colors);
+ inline_display(window, &line->text->value[offset], colors, nocodebg);
}
}
}
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;
break;
// enable inline code
case L'`':
- if(colors)
+ if(colors && !nocodebg)
wattron(window, COLOR_PAIR(CP_BLACK));
break;
// do nothing for backslashes
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);
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);
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) {
