X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=viewer.c;h=f262ea2ab5ef1d2c3964425fd96122915944c2f9;hb=3da34e1957b3484506b5f0f79f84f64a4cff2f1b;hp=6dac23bfb21449b5aa1181d6e3dbd575aac5d48e;hpb=605e481f95b0544e26e842fa861eeb601aafdd0f;p=smdp.git
diff --git a/viewer.c b/viewer.c
index 6dac23b..f262ea2 100644
--- a/viewer.c
+++ b/viewer.c
@@ -1,8 +1,31 @@
+/*
+ * 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 mpd.
+ *
+ * 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
#include
+#include // strchr
#include
-#include "include/parser.h"
#include "include/viewer.h"
static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,
@@ -160,7 +183,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
// print lines
while(line) {
- add_line(content, l, (COLS - max_cols) / 2, line);
+ add_line(content, l, (COLS - max_cols) / 2, line, max_cols);
line = line->next;
l++;
}
@@ -172,6 +195,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
if(fade)
fade_in(content, trans, colors);
+ // re-enable fading after any undefined key press
+ if(COLORS == 256 && !nofade) fade = 1;
+
// wait for user input
c = getch();
@@ -207,6 +233,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
fade = 0;
slide = (void*)0;
break;
+
+ default:
+ // disable fading on undefined key press
+ fade = 0;
+ break;
}
// fade out
@@ -219,15 +250,142 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
return(0);
}
-void add_line(WINDOW *window, int y, int x, line_t *line) {
+void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
+ int i = 0; // increment
+ char *c; // char pointer for iteration
+ 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);
- // print line to window
- mvwprintw(window,
- y, x,
- "%s", &line->text->text[offset]);
+
+ // IS_CODE
+ if(CHECK_BIT(line->bits, IS_CODE)) {
+
+ // set static offset for code
+ offset = CODE_INDENT;
+
+ // reverse color for code blocks
+ wattron(window, A_REVERSE);
+
+ // 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
+ if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
+
+ // set headline color
+ wattron(window, COLOR_PAIR(CP_BLUE));
+
+ // enable underline for H1
+ if(CHECK_BIT(line->bits, IS_H1))
+ wattron(window, A_UNDERLINE);
+
+ // skip hashes
+ while(line->text->text[offset] == '#')
+ offset = next_word(line->text, offset);
+
+ // print whole lines
+ mvwprintw(window,
+ y, x,
+ "%s", &line->text->text[offset]);
+
+ wattroff(window, A_UNDERLINE);
+
+ } else {
+ // move the cursor in position
+ wmove(window, y, x);
+
+ // for each char in line
+ c = line->text->text;
+ while(*c) {
+
+ // if char is in special char list
+ if(strchr(special, *c)) {
+
+ // closing special char (or second backslash)
+ if((stack->top)(stack, *c)) {
+
+ switch(*c) {
+ // print escaped backslash
+ case '\\':
+ wprintw(window, "%c", *c);
+ break;
+ // disable highlight
+ case '*':
+ wattron(window, COLOR_PAIR(CP_WHITE));
+ break;
+ // disable underline
+ case '_':
+ wattroff(window, A_UNDERLINE);
+ break;
+ }
+
+ // remove top special char from stack
+ (stack->pop)(stack);
+
+ // treat special as regular char
+ } else if((stack->top)(stack, '\\')) {
+ wprintw(window, "%c", *c);
+
+ // remove backslash from stack
+ (stack->pop)(stack);
+
+ // opening special char
+ } else {
+ switch(*c) {
+ // enable highlight
+ case '*':
+ wattron(window, COLOR_PAIR(CP_RED));
+ break;
+ // enable underline
+ case '_':
+ wattron(window, A_UNDERLINE);
+ break;
+ // do nothing for backslashes
+ }
+
+ // push special char to stack
+ (stack->push)(stack, *c);
+ }
+
+ } else {
+ // print regular char
+ wprintw(window, "%c", *c);
+ }
+
+ c++;
+ }
+
+ //TODO pop stack until empty
+ }
+ }
+
+ // fill rest off line with spaces
+ for(i = getcurx(window) - x; i < max_cols; i++)
+ wprintw(window, "%s", " ");
+
+ // reset to default color
+ wattron(window, COLOR_PAIR(CP_WHITE));
+ wattroff(window, A_UNDERLINE);
+ wattroff(window, A_REVERSE);
}
+
+ (stack->delete)(stack);
}
void fade_out(WINDOW *window, int trans, int colors) {