cleanup inline formating stack + fixed quote style

[smdp.git] / viewer.c

diff --git a/viewer.c b/viewer.c
index d31fa71..82d8d99 100644 (file)
--- 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 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <locale.h> // setlocale
 #include <ncurses.h>
 #include <stdlib.h>
 #include <string.h> // strchr
@@ -51,6 +75,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
         slide = slide->next;
     }
 
+    // set locale to display UTF-8 correctly in ncurses
+    setlocale(LC_CTYPE, "");
+
     // replace stdin with current tty if markdown input was piped
     freopen("/dev/tty", "rw", stdin);
 
@@ -124,6 +151,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) {
     }
 
     // setup footer
+    //TODO display slide number in footer
     if(bar_bottom) {
         line = deck->header->next;
         offset = next_blank(line->text, 0) + 1;
@@ -251,18 +279,9 @@ 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
@@ -287,15 +306,25 @@ 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)) {
+                    // print a reverse color block
+                    wattron(window, A_REVERSE);
+                    wprintw(window, "%s", " ");
+                    wattroff(window, A_REVERSE);
+                    wprintw(window, "%s", " ");
+                    offset += 2;
+                }
+
                 // 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
@@ -316,7 +345,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
                             (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
@@ -348,7 +377,22 @@ 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)) {
+                        case '\\':
+                            wprintw(window, "%c", '\\');
+                            break;
+                        // disable highlight
+                        case '*':
+                            wattron(window, COLOR_PAIR(CP_WHITE));
+                            break;
+                        // disable underline
+                        case '_':
+                            wattroff(window, A_UNDERLINE);
+                            break;
+                    }
+                }
             }
         }
 
@@ -365,16 +409,6 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
     (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) {
     int i; // increment
     if(colors) {