X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=viewer.c;h=14018da550fb64e0731994975c07cb08a508cb8d;hb=d2546ae4a3dc3424f9357aea800880b0dd49486f;hp=d31fa71b607611c906b41b919b20e740f136dfd9;hpb=0f870f29388a36d32ec9ffaabe9ffe03edc038c0;p=smdp.git
diff --git a/viewer.c b/viewer.c
index d31fa71..14018da 100644
--- a/viewer.c
+++ b/viewer.c
@@ -1,3 +1,27 @@
+/*
+ * 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) 2014 Michael Goehler
+ *
+ * This file is part of mdp.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#include // setlocale
#include
#include
#include // strchr
@@ -5,14 +29,15 @@
#include "include/viewer.h"
+// color ramp for fading from black to color
static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,
237, 238, 239, 240, 241, 242,
244, 245, 246, 247, 248, 249,
250, 251, 252, 253, 254, 255 };
static short blue_ramp[24] = { 16, 17, 17, 18, 18, 19,
- 19, 20, 20, 21, 27, 32,
- 33, 38, 39, 44, 45, 45,
+ 19, 20, 20, 21, 27, 33,
+ 32, 39, 38, 45, 44, 44,
81, 81, 51, 51, 123, 123 };
static short red_ramp[24] = { 16, 52, 52, 53, 53, 89,
@@ -20,10 +45,28 @@ static short red_ramp[24] = { 16, 52, 52, 53, 53, 89,
163, 163, 164, 164, 200, 200,
201, 201, 207, 207, 213, 213 };
-int ncurses_display(deck_t *deck, int notrans, int nofade) {
+// color ramp for fading from white to color
+static short white_ramp_invert[24] = { 15, 255, 254, 254, 252, 251,
+ 250, 249, 248, 247, 246, 245,
+ 243, 242, 241, 240, 239, 238,
+ 237, 236, 235, 234, 233, 232};
+
+static short blue_ramp_invert[24] = { 15, 231, 231, 195, 195, 159,
+ 159, 123, 123, 87, 51, 44,
+ 45, 38, 39, 32, 33, 33,
+ 26, 26, 27, 27, 21, 21};
+
+static short red_ramp_invert[24] = { 15, 231, 231, 224, 224, 225,
+ 225, 218, 218, 219, 212, 213,
+ 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 c = 0; // char
+ int i = 0; // iterate
int l = 0; // line number
+ 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
@@ -33,8 +76,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
// header line 1 is displayed at the top
int bar_top = (deck->headers > 0) ? 1 : 0;
- // header line 2 and 3 are displayed at the bottom
- int bar_bottom = (deck->headers > 1) ? 1 : 0;
+ // header line 2 is displayed at the bottom
+ // anyway we display the slide number at the bottom
+ int bar_bottom = 1;
slide_t *slide = deck->slide;
line_t *line;
@@ -51,8 +95,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
slide = slide->next;
}
- // replace stdin with current tty if markdown input was piped
- freopen("/dev/tty", "rw", stdin);
+ // set locale to display UTF-8 correctly in ncurses
+ setlocale(LC_CTYPE, "");
// init ncurses
initscr();
@@ -60,15 +104,22 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
if((max_cols > COLS) ||
(max_lines + bar_top + bar_bottom + 2 > LINES)) {
- fprintf(stderr, "Error: Terminal size %ix%i to small. Need at least %ix%i.\n",
- COLS, LINES, max_cols, max_lines + bar_top + bar_bottom + 2);
+ // 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");
+
return(1);
}
- // replace stdin with current tty if markdown input was piped
- freopen("/dev/tty", "rw", stdin);
-
// disable cursor
curs_set(0);
@@ -86,21 +137,51 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
start_color();
use_default_colors();
- if(notrans) trans = 0; // 0 is black
-
+ // 256 color mode
if(COLORS == 256) {
- // 256 color mode
- init_pair(CP_WHITE, 255, trans);
- init_pair(CP_BLUE, 123, trans);
- init_pair(CP_RED, 213, trans);
+
+ if(notrans) {
+ if(invert) {
+ trans = 15; // white in 256 color mode
+ } else {
+ trans = 16; // black in 256 color mode
+ }
+ }
+
+ if(invert) {
+ init_pair(CP_WHITE, 232, trans);
+ init_pair(CP_BLUE, 21, trans);
+ init_pair(CP_RED, 196, trans);
+ init_pair(CP_BLACK, 15, 232);
+ } else {
+ init_pair(CP_WHITE, 255, trans);
+ init_pair(CP_BLUE, 123, trans);
+ init_pair(CP_RED, 213, trans);
+ init_pair(CP_BLACK, 16, 255);
+ }
init_pair(CP_YELLOW, 208, trans);
// enable color fading
if(!nofade) fade = 1;
+
+ // 8 color mode
} else {
- // 8 color mode
- init_pair(CP_WHITE, 7, trans);
+ if(notrans) {
+ if(invert) {
+ trans = 7; // white in 8 color mode
+ } else {
+ trans = 0; // black in 8 color mode
+ }
+ }
+
+ if(invert) {
+ init_pair(CP_WHITE, 0, trans);
+ init_pair(CP_BLACK, 7, 0);
+ } else {
+ init_pair(CP_WHITE, 7, trans);
+ init_pair(CP_BLACK, 0, 7);
+ }
init_pair(CP_BLUE, 4, trans);
init_pair(CP_RED, 1, trans);
init_pair(CP_YELLOW, 3, trans);
@@ -113,38 +194,6 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
if(colors)
wbkgd(stdscr, COLOR_PAIR(CP_YELLOW));
- // setup header
- if(bar_top) {
- line = deck->header;
- offset = next_blank(line->text, 0) + 1;
- // add text to header
- mvwprintw(stdscr,
- 0, (COLS - line->length + offset) / 2,
- "%s", &line->text->text[offset]);
- }
-
- // setup footer
- if(bar_bottom) {
- line = deck->header->next;
- offset = next_blank(line->text, 0) + 1;
- // add text to left footer
- mvwprintw(stdscr,
- LINES - 1, 3,
- "%s", &line->text->text[offset]);
-
- if(deck->headers > 2) {
- line = deck->header->next->next;
- offset = next_blank(line->text, 0) + 1;
- // add text to right footer
- mvwprintw(stdscr,
- LINES - 1, COLS - line->length + offset - 3,
- "%s", &line->text->text[offset]);
- }
- }
-
- // make header + fooder visible
- wrefresh(stdscr);
-
// setup main window
WINDOW *content = newwin(LINES - bar_top - bar_bottom, COLS, 0 + bar_top, 0);
if(colors)
@@ -152,15 +201,46 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
slide = deck->slide;
while(slide) {
- // clear main window
+ // clear windows
werase(content);
+ werase(stdscr);
+
+ // always resize window in case terminal geometry has changed
+ wresize(content, LINES - bar_top - bar_bottom, COLS);
+
+ // setup header
+ if(bar_top) {
+ line = deck->header;
+ offset = next_blank(line->text, 0) + 1;
+ // add text to header
+ mvwprintw(stdscr,
+ 0, (COLS - line->length + offset) / 2,
+ "%s", &line->text->text[offset]);
+ }
+
+ // setup footer
+ if(deck->headers > 1) {
+ line = deck->header->next;
+ offset = next_blank(line->text, 0) + 1;
+ // add text to left footer
+ mvwprintw(stdscr,
+ LINES - 1, 3,
+ "%s", &line->text->text[offset]);
+ }
+ // add slide number to right footer
+ mvwprintw(stdscr,
+ LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6,
+ "%d / %d", sc, deck->slides);
+
+ // make header + fooder visible
+ wrefresh(stdscr);
line = slide->line;
l = 0;
// print lines
while(line) {
- add_line(content, l, (COLS - max_cols) / 2, line, max_cols);
+ add_line(content, l, (COLS - max_cols) / 2, line, max_cols, colors);
line = line->next;
l++;
}
@@ -170,7 +250,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
// fade in
if(fade)
- fade_in(content, trans, colors);
+ fade_in(content, trans, colors, invert);
// re-enable fading after any undefined key press
if(COLORS == 256 && !nofade) fade = 1;
@@ -179,6 +259,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
c = getch();
// evaluate user input
+ i = 0;
switch(c) {
// show previous slide
@@ -189,8 +270,12 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
case 263: // BACKSPACE (getty)
case 'h':
case 'k':
- if(slide->prev)
+ if(slide->prev) {
slide = slide->prev;
+ sc--;
+ } else {
+ fade = 0;
+ }
break;
// show next slide
@@ -200,8 +285,60 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
case ' ': // SPACE
case 'j':
case 'l':
- if(slide->next)
+ if(slide->next) {
slide = slide->next;
+ sc++;
+ } else {
+ fade = 0;
+ }
+ break;
+
+ // show slide n
+ case '9': i++;
+ case '8': i++;
+ case '7': i++;
+ case '6': i++;
+ case '5': i++;
+ case '4': i++;
+ case '3': i++;
+ case '2': i++;
+ case '1': i++;
+ if(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 = 0;
+ }
+ break;
+
+ // show first slide
+ case KEY_HOME:
+ slide = deck->slide;
+ sc = 1;
+ break;
+
+ // show last slide
+ case KEY_END:
+ for(i = sc; i <= deck->slides; i++) {
+ if(slide->next) {
+ slide = slide->next;
+ sc++;
+ }
+ }
break;
// quit
@@ -219,7 +356,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
// fade out
if(fade)
- fade_out(content, trans, colors);
+ fade_out(content, trans, colors, invert);
}
endwin();
@@ -227,15 +364,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
return(0);
}
-void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
+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
+ char *special = "\\*_`"; // list of interpreted chars
cstack_t *stack = cstack_init();
if(line->text->text) {
int offset = 0; // text offset
- offset = next_nonblank(line->text, 0);
// IS_CODE
if(CHECK_BIT(line->bits, IS_CODE)) {
@@ -244,29 +380,22 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
offset = CODE_INDENT;
// reverse color for code blocks
- wattron(window, A_REVERSE);
+ if(colors)
+ wattron(window, COLOR_PAIR(CP_BLACK));
// print whole lines
mvwprintw(window,
y, x,
"%s", &line->text->text[offset]);
- // IS_QUOTE
- } else if(CHECK_BIT(line->bits, IS_QUOTE)) {
- //TODO replace greater sign with color block
-
- //FIXME remove dummy print code
- mvwprintw(window,
- y, x,
- "%s", &line->text->text[offset]);
-
} else {
- // IF_H1 || IF_H2
+ // IS_H1 || IS_H2
if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
// set headline color
- wattron(window, COLOR_PAIR(CP_BLUE));
+ if(colors)
+ wattron(window, COLOR_PAIR(CP_BLUE));
// enable underline for H1
if(CHECK_BIT(line->bits, IS_H1))
@@ -287,15 +416,35 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
// 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);
+ }
+ }
+
// for each char in line
- c = line->text->text;
+ 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(is_attron(stack, *c)) {
+ if((stack->top)(stack, *c)) {
switch(*c) {
// print escaped backslash
@@ -304,19 +453,25 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
break;
// disable highlight
case '*':
- wattron(window, COLOR_PAIR(CP_WHITE));
+ 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);
// treat special as regular char
- } else if(is_attron(stack, '\\')) {
+ } else if((stack->top)(stack, '\\')) {
wprintw(window, "%c", *c);
// remove backslash from stack
@@ -327,12 +482,18 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
switch(*c) {
// enable highlight
case '*':
- wattron(window, COLOR_PAIR(CP_RED));
+ 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
}
@@ -341,6 +502,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
}
} else {
+ // remove backslash from stack
+ if((stack->top)(stack, '\\'))
+ (stack->pop)(stack);
+
// print regular char
wprintw(window, "%c", *c);
}
@@ -348,7 +513,26 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
c++;
}
- //TODO pop stack until empty
+ // 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
+ }
+ }
}
}
@@ -357,53 +541,73 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
wprintw(window, "%s", " ");
// reset to default color
- wattron(window, COLOR_PAIR(CP_WHITE));
+ if(colors)
+ wattron(window, COLOR_PAIR(CP_WHITE));
wattroff(window, A_UNDERLINE);
- wattroff(window, A_REVERSE);
}
(stack->delete)(stack);
}
-int is_attron(cstack_t *stack, char c) {
- // test if char is on top of stack
- if(stack->head >= 0) {
- if((stack->top)(stack) == c) {
- return 1;
- }
- }
- return 0;
-}
-
-void fade_out(WINDOW *window, int trans, int colors) {
+void fade_out(WINDOW *window, int trans, int colors, int invert) {
int i; // increment
- if(colors) {
+ if(colors && COLORS == 256) {
for(i = 22; i >= 0; i--) {
- // darken color pairs
- init_pair(CP_WHITE, white_ramp[i], trans);
- init_pair(CP_BLUE, blue_ramp[i], trans);
- init_pair(CP_RED, red_ramp[i], trans);
+
+ // dim color pairs
+ if(invert) {
+ init_pair(CP_WHITE, white_ramp_invert[i], trans);
+ init_pair(CP_BLUE, blue_ramp_invert[i], trans);
+ init_pair(CP_RED, red_ramp_invert[i], trans);
+ init_pair(CP_BLACK, 15, white_ramp_invert[i]);
+ } else {
+ init_pair(CP_WHITE, white_ramp[i], trans);
+ init_pair(CP_BLUE, blue_ramp[i], trans);
+ init_pair(CP_RED, red_ramp[i], trans);
+ init_pair(CP_BLACK, 16, white_ramp[i]);
+ }
+
// refresh window with new color
wrefresh(window);
+
// delay for our eyes to recognize the change
usleep(FADE_DELAY);
}
}
}
-void fade_in(WINDOW *window, int trans, int colors) {
+void fade_in(WINDOW *window, int trans, int colors, int invert) {
int i; // increment
- if(colors) {
+ if(colors && COLORS == 256) {
for(i = 0; i <= 23; i++) {
- // lighten color pairs
- init_pair(CP_WHITE, white_ramp[i], trans);
- init_pair(CP_BLUE, blue_ramp[i], trans);
- init_pair(CP_RED, red_ramp[i], trans);
+
+ // brighten color pairs
+ if(invert) {
+ init_pair(CP_WHITE, white_ramp_invert[i], trans);
+ init_pair(CP_BLUE, blue_ramp_invert[i], trans);
+ init_pair(CP_RED, red_ramp_invert[i], trans);
+ init_pair(CP_BLACK, 15, white_ramp_invert[i]);
+ } else {
+ init_pair(CP_WHITE, white_ramp[i], trans);
+ init_pair(CP_BLUE, blue_ramp[i], trans);
+ init_pair(CP_RED, red_ramp[i], trans);
+ init_pair(CP_BLACK, 16, white_ramp[i]);
+ }
+
// refresh window with new color
wrefresh(window);
+
// delay for our eyes to recognize the change
usleep(FADE_DELAY);
}
}
}
+int int_length (int val) {
+ int l = 1;
+ while(val > 9) {
+ l++;
+ val /= 10;
+ }
+ return l;
+}