X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=viewer.c;h=a97e44dc4bdb185d93aff60784571934d5deffd7;hb=d1a7b3c065e6f6d4839cc6107284f3e715d6f7ab;hp=4e91b71390c6cec4b109c61b5dee5bb008beb68e;hpb=b416f18295f7edcb5474396a6b26a59fd5ddb1f5;p=smdp.git
diff --git a/viewer.c b/viewer.c
index 4e91b71..a97e44d 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
@@ -23,7 +47,9 @@ static short red_ramp[24] = { 16, 52, 52, 53, 53, 89,
int ncurses_display(deck_t *deck, int notrans, int nofade) {
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 +59,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 +78,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,7 +87,7 @@ 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",
+ 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);
endwin();
return(1);
@@ -86,9 +113,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
start_color();
use_default_colors();
- if(notrans) trans = 0; // 0 is black
+ if(notrans) trans = 0; // black in 8 color mode
if(COLORS == 256) {
+ if(notrans) trans = 16; // black in 256 color mode
+
// 256 color mode
init_pair(CP_WHITE, 255, trans);
init_pair(CP_BLUE, 123, trans);
@@ -113,38 +142,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 +149,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++;
}
@@ -179,6 +207,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 +218,10 @@ 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--;
+ }
break;
// show next slide
@@ -200,8 +231,58 @@ 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++;
+ }
+ 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
@@ -227,7 +308,7 @@ 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
@@ -235,7 +316,6 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
if(line->text->text) {
int offset = 0; // text offset
- offset = next_nonblank(line->text, 0);
// IS_CODE
if(CHECK_BIT(line->bits, IS_CODE)) {
@@ -251,22 +331,14 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
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,8 +359,23 @@ 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
+ wattron(window, A_REVERSE);
+ wprintw(window, "%s", " ");
+ wattroff(window, A_REVERSE);
+ 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
@@ -304,7 +391,8 @@ 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 '_':
@@ -327,7 +415,8 @@ 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 '_':
@@ -348,7 +437,21 @@ 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;
+ // do nothing for backslashes
+ }
+ }
}
}
@@ -357,7 +460,8 @@ 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);
}
@@ -397,3 +501,11 @@ void fade_in(WINDOW *window, int trans, int colors) {
}
}
+int int_length (int val) {
+ int l = 1;
+ while(val > 9) {
+ l++;
+ val /= 10;
+ }
+ return l;
+}