X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=viewer.c;h=cede3017a728d70c8fee09064a9949da46b895d4;hb=dc94acea21cc5a3bb8db286c5c67c1ddb40ab652;hp=14acefd1c04b05ea61599bc9ca38f8aa4323d75e;hpb=cbcab1e9d36dee41eb493409507510d8354546c1;p=smdp.git diff --git a/viewer.c b/viewer.c index 14acefd..cede301 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 @@ -47,7 +47,9 @@ static short red_ramp[24] = { 16, 52, 52, 53, 53, 89, int ncurses_display(deck_t *deck, int notrans, int nofade) { int c = 0; // char + int i = 0; // iterate int l = 0; // line number + int sc = 1; // slide count int colors = 0; // amount of colors supported int fade = 0; // disable color fading by default int trans = -1; // enable transparency if term supports it @@ -57,8 +59,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { // header line 1 is displayed at the top int bar_top = (deck->headers > 0) ? 1 : 0; - // header line 2 and 3 are displayed at the bottom - int bar_bottom = (deck->headers > 1) ? 1 : 0; + // header line 2 is displayed at the bottom + // anyway we display the slide number at the bottom + int bar_bottom = 1; slide_t *slide = deck->slide; line_t *line; @@ -113,9 +116,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { start_color(); use_default_colors(); - if(notrans) trans = 0; // 0 is black + if(notrans) trans = 0; // black in 8 color mode if(COLORS == 256) { + if(notrans) trans = 16; // black in 256 color mode + // 256 color mode init_pair(CP_WHITE, 255, trans); init_pair(CP_BLUE, 123, trans); @@ -140,38 +145,6 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { if(colors) wbkgd(stdscr, COLOR_PAIR(CP_YELLOW)); - // setup header - if(bar_top) { - line = deck->header; - offset = next_blank(line->text, 0) + 1; - // add text to header - mvwprintw(stdscr, - 0, (COLS - line->length + offset) / 2, - "%s", &line->text->text[offset]); - } - - // setup footer - if(bar_bottom) { - line = deck->header->next; - offset = next_blank(line->text, 0) + 1; - // add text to left footer - mvwprintw(stdscr, - LINES - 1, 3, - "%s", &line->text->text[offset]); - - if(deck->headers > 2) { - line = deck->header->next->next; - offset = next_blank(line->text, 0) + 1; - // add text to right footer - mvwprintw(stdscr, - LINES - 1, COLS - line->length + offset - 3, - "%s", &line->text->text[offset]); - } - } - - // make header + fooder visible - wrefresh(stdscr); - // setup main window WINDOW *content = newwin(LINES - bar_top - bar_bottom, COLS, 0 + bar_top, 0); if(colors) @@ -179,8 +152,39 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { slide = deck->slide; while(slide) { - // clear main window + // clear windows werase(content); + werase(stdscr); + + // always resize window in case terminal geometry has changed + wresize(content, LINES - bar_top - bar_bottom, COLS); + + // setup header + if(bar_top) { + line = deck->header; + offset = next_blank(line->text, 0) + 1; + // add text to header + mvwprintw(stdscr, + 0, (COLS - line->length + offset) / 2, + "%s", &line->text->text[offset]); + } + + // setup footer + if(deck->headers > 1) { + line = deck->header->next; + offset = next_blank(line->text, 0) + 1; + // add text to left footer + mvwprintw(stdscr, + LINES - 1, 3, + "%s", &line->text->text[offset]); + } + // add slide number to right footer + mvwprintw(stdscr, + LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6, + "%d / %d", sc, deck->slides); + + // make header + fooder visible + wrefresh(stdscr); line = slide->line; l = 0; @@ -206,6 +210,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { c = getch(); // evaluate user input + i = 0; switch(c) { // show previous slide @@ -216,8 +221,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { case 263: // BACKSPACE (getty) case 'h': case 'k': - if(slide->prev) + if(slide->prev) { slide = slide->prev; + sc--; + } break; // show next slide @@ -227,8 +234,58 @@ int ncurses_display(deck_t *deck, int notrans, int nofade) { case ' ': // SPACE case 'j': case 'l': - if(slide->next) + if(slide->next) { slide = slide->next; + sc++; + } + break; + + // show slide n + case '9': i++; + case '8': i++; + case '7': i++; + case '6': i++; + case '5': i++; + case '4': i++; + case '3': i++; + case '2': i++; + case '1': i++; + if(i <= deck->slides) { + while(sc != i) { + // search forward + if(sc < i) { + if(slide->next) { + slide = slide->next; + sc++; + } + // search backward + } else { + if(slide->prev) { + slide = slide->prev; + sc--; + } + } + } + } else { + // disable fading if slide n doesn't exist + fade = 0; + } + break; + + // show first slide + case KEY_HOME: + slide = deck->slide; + sc = 1; + break; + + // show last slide + case KEY_END: + for(i = sc; i <= deck->slides; i++) { + if(slide->next) { + slide = slide->next; + sc++; + } + } break; // quit @@ -262,7 +319,6 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols) { if(line->text->text) { int offset = 0; // text offset - offset = next_nonblank(line->text, 0); // IS_CODE if(CHECK_BIT(line->bits, IS_CODE)) { @@ -278,18 +334,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 @@ -314,8 +361,23 @@ 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)) { + while(line->text->text[offset] == '>') { + // print a reverse color block + wattron(window, A_REVERSE); + wprintw(window, "%s", " "); + wattroff(window, A_REVERSE); + wprintw(window, "%s", " "); + // find next quote or break + offset++; + if(line->text->text[offset] == ' ') + offset = next_word(line->text, offset); + } + } + // for each char in line - c = line->text->text; + c = &line->text->text[offset]; while(*c) { // if char is in special char list @@ -375,7 +437,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; + } + } } } @@ -424,3 +501,11 @@ void fade_in(WINDOW *window, int trans, int colors) { } } +int int_length (int val) { + int l = 1; + while(val > 9) { + l++; + val /= 10; + } + return l; +}