X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=viewer.c;h=14018da550fb64e0731994975c07cb08a508cb8d;hb=31f91305483a4efa430fe1ce181f62921c77e39f;hp=7f1fb851677c32b8f80ff78e7192f45cfeb761fc;hpb=2d18e220e78d631bebef54e1cfa6bc3f5a1ddb3f;p=smdp.git diff --git a/viewer.c b/viewer.c index 7f1fb85..14018da 100644 --- a/viewer.c +++ b/viewer.c @@ -4,7 +4,7 @@ * faded in 256 color mode. * Copyright (C) 2014 Michael Goehler * - * This file is part of mpd. + * 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 @@ -29,14 +29,15 @@ #include "include/viewer.h" +// color ramp for fading from black to color static short white_ramp[24] = { 16, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 }; static short blue_ramp[24] = { 16, 17, 17, 18, 18, 19, - 19, 20, 20, 21, 27, 32, - 33, 38, 39, 44, 45, 45, + 19, 20, 20, 21, 27, 33, + 32, 39, 38, 45, 44, 44, 81, 81, 51, 51, 123, 123 }; static short red_ramp[24] = { 16, 52, 52, 53, 53, 89, @@ -44,7 +45,23 @@ static short red_ramp[24] = { 16, 52, 52, 53, 53, 89, 163, 163, 164, 164, 200, 200, 201, 201, 207, 207, 213, 213 }; -int ncurses_display(deck_t *deck, int notrans, int nofade) { +// color ramp for fading from white to color +static short white_ramp_invert[24] = { 15, 255, 254, 254, 252, 251, + 250, 249, 248, 247, 246, 245, + 243, 242, 241, 240, 239, 238, + 237, 236, 235, 234, 233, 232}; + +static short blue_ramp_invert[24] = { 15, 231, 231, 195, 195, 159, + 159, 123, 123, 87, 51, 44, + 45, 38, 39, 32, 33, 33, + 26, 26, 27, 27, 21, 21}; + +static short red_ramp_invert[24] = { 15, 231, 231, 224, 224, 225, + 225, 218, 218, 219, 212, 213, + 206, 207, 201, 200, 199, 199, + 198, 198, 197, 197, 196, 196}; + +int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { int c = 0; // char int i = 0; // iterate @@ -81,24 +98,28 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { // 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); - // init ncurses initscr(); 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", - COLS, LINES, max_cols, max_lines + bar_top + bar_bottom + 2); + // disable ncurses endwin(); + + // print error + 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); + + // print hint to solve it + if(max_lines + bar_top + bar_bottom + 2 > LINES) + fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n"); + if(max_cols > COLS) + fprintf(stderr, "Automatic line wrapping is not supported jet. You may need to shorten some lines by inserting line breaks.\n"); + return(1); } - // replace stdin with current tty if markdown input was piped - freopen("/dev/tty", "rw", stdin); - // disable cursor curs_set(0); @@ -116,21 +137,51 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { start_color(); use_default_colors(); - if(notrans) trans = 0; // 0 is black - + // 256 color mode if(COLORS == 256) { - // 256 color mode - init_pair(CP_WHITE, 255, trans); - init_pair(CP_BLUE, 123, trans); - init_pair(CP_RED, 213, trans); + + if(notrans) { + if(invert) { + trans = 15; // white in 256 color mode + } else { + trans = 16; // black in 256 color mode + } + } + + if(invert) { + init_pair(CP_WHITE, 232, trans); + init_pair(CP_BLUE, 21, trans); + init_pair(CP_RED, 196, trans); + init_pair(CP_BLACK, 15, 232); + } else { + init_pair(CP_WHITE, 255, trans); + init_pair(CP_BLUE, 123, trans); + init_pair(CP_RED, 213, trans); + init_pair(CP_BLACK, 16, 255); + } init_pair(CP_YELLOW, 208, trans); // enable color fading if(!nofade) fade = 1; + + // 8 color mode } else { - // 8 color mode - init_pair(CP_WHITE, 7, trans); + if(notrans) { + if(invert) { + trans = 7; // white in 8 color mode + } else { + trans = 0; // black in 8 color mode + } + } + + if(invert) { + init_pair(CP_WHITE, 0, trans); + init_pair(CP_BLACK, 7, 0); + } else { + init_pair(CP_WHITE, 7, trans); + init_pair(CP_BLACK, 0, 7); + } init_pair(CP_BLUE, 4, trans); init_pair(CP_RED, 1, trans); init_pair(CP_YELLOW, 3, trans); @@ -189,7 +240,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { // 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++; } @@ -199,7 +250,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { // fade in if(fade) - fade_in(content, trans, colors); + fade_in(content, trans, colors, invert); // re-enable fading after any undefined key press if(COLORS == 256 && !nofade) fade = 1; @@ -222,6 +273,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { if(slide->prev) { slide = slide->prev; sc--; + } else { + fade = 0; } break; @@ -235,6 +288,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { if(slide->next) { slide = slide->next; sc++; + } else { + fade = 0; } break; @@ -301,7 +356,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { // fade out if(fade) - fade_out(content, trans, colors); + fade_out(content, trans, colors, invert); } endwin(); @@ -309,15 +364,14 @@ 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 + 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); // IS_CODE if(CHECK_BIT(line->bits, IS_CODE)) { @@ -326,7 +380,8 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { offset = CODE_INDENT; // reverse color for code blocks - wattron(window, A_REVERSE); + if(colors) + wattron(window, COLOR_PAIR(CP_BLACK)); // print whole lines mvwprintw(window, @@ -339,7 +394,8 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { 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)) @@ -364,10 +420,15 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { 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", " "); + if(colors) { + wattron(window, COLOR_PAIR(CP_BLACK)); + wprintw(window, "%s", " "); + wattron(window, COLOR_PAIR(CP_WHITE)); + wprintw(window, "%s", " "); + } else { + wprintw(window, "%s", ">"); + } + // find next quote or break offset++; if(line->text->text[offset] == ' ') @@ -392,12 +453,18 @@ 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 '_': wattroff(window, A_UNDERLINE); break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; } // remove top special char from stack @@ -415,12 +482,18 @@ 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 '_': wattron(window, A_UNDERLINE); break; + // enable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_BLACK)); + break; // do nothing for backslashes } @@ -429,6 +502,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { } } else { + // remove backslash from stack + if((stack->top)(stack, '\\')) + (stack->pop)(stack); + // print regular char wprintw(window, "%c", *c); } @@ -439,17 +516,21 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { // 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)); + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); break; // disable underline case '_': wattroff(window, A_UNDERLINE); break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // do nothing for backslashes } } } @@ -460,40 +541,62 @@ 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); } (stack->delete)(stack); } -void fade_out(WINDOW *window, int trans, int colors) { +void fade_out(WINDOW *window, int trans, int colors, int invert) { int i; // increment - if(colors) { + if(colors && COLORS == 256) { for(i = 22; i >= 0; i--) { - // darken color pairs - init_pair(CP_WHITE, white_ramp[i], trans); - init_pair(CP_BLUE, blue_ramp[i], trans); - init_pair(CP_RED, red_ramp[i], trans); + + // dim color pairs + if(invert) { + init_pair(CP_WHITE, white_ramp_invert[i], trans); + init_pair(CP_BLUE, blue_ramp_invert[i], trans); + init_pair(CP_RED, red_ramp_invert[i], trans); + init_pair(CP_BLACK, 15, white_ramp_invert[i]); + } else { + init_pair(CP_WHITE, white_ramp[i], trans); + init_pair(CP_BLUE, blue_ramp[i], trans); + init_pair(CP_RED, red_ramp[i], trans); + init_pair(CP_BLACK, 16, white_ramp[i]); + } + // refresh window with new color wrefresh(window); + // delay for our eyes to recognize the change usleep(FADE_DELAY); } } } -void fade_in(WINDOW *window, int trans, int colors) { +void fade_in(WINDOW *window, int trans, int colors, int invert) { int i; // increment - if(colors) { + if(colors && COLORS == 256) { for(i = 0; i <= 23; i++) { - // lighten color pairs - init_pair(CP_WHITE, white_ramp[i], trans); - init_pair(CP_BLUE, blue_ramp[i], trans); - init_pair(CP_RED, red_ramp[i], trans); + + // brighten color pairs + if(invert) { + init_pair(CP_WHITE, white_ramp_invert[i], trans); + init_pair(CP_BLUE, blue_ramp_invert[i], trans); + init_pair(CP_RED, red_ramp_invert[i], trans); + init_pair(CP_BLACK, 15, white_ramp_invert[i]); + } else { + init_pair(CP_WHITE, white_ramp[i], trans); + init_pair(CP_BLUE, blue_ramp[i], trans); + init_pair(CP_RED, red_ramp[i], trans); + init_pair(CP_BLACK, 16, white_ramp[i]); + } + // refresh window with new color wrefresh(window); + // delay for our eyes to recognize the change usleep(FADE_DELAY); }