rewrote Makefile + copyright and license infos

[smdp.git] / viewer.c

diff --git a/viewer.c b/viewer.c
index 2d64b4e..f262ea2 100644 (file)
--- a/viewer.c
+++ b/viewer.c
@@ -1,9 +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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include <ncurses.h>
 #include <stdlib.h>
 #include <string.h> // strchr
 #include <unistd.h>
 
-#include "include/parser.h"
 #include "include/viewer.h"
 
 static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,
@@ -296,7 +318,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) {
                     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
@@ -317,7 +339,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
@@ -366,16 +388,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) {