X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=viewer.c;h=f262ea2ab5ef1d2c3964425fd96122915944c2f9;hb=3da34e1957b3484506b5f0f79f84f64a4cff2f1b;hp=d31fa71b607611c906b41b919b20e740f136dfd9;hpb=0f870f29388a36d32ec9ffaabe9ffe03edc038c0;p=smdp.git diff --git a/viewer.c b/viewer.c index d31fa71..f262ea2 100644 --- a/viewer.c +++ b/viewer.c @@ -1,3 +1,26 @@ +/* + * 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 @@ -295,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 @@ -316,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 @@ -365,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) {