X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=13874d87443dd50e0e5da6269a77bbc18ad552e1;hb=7daedc8abf4e8b3d5a76f5169aba522e53eec2cc;hp=1b2e6b9bf5ced4e6d5905c4fae06d69d5e92268d;hpb=58e6310354246773a7aecf1b4612eee088a4596b;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 1b2e6b9..13874d8 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -60,7 +60,7 @@ static short red_ramp_invert[24] = { 15, 231, 231, 224, 224, 225, 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 reload, int noreload) { +int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload, int slidenum) { int c = 0; // char int i = 0; // iterate @@ -79,7 +79,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa int bar_top = (deck->headers > 0) ? 1 : 0; // header line 2 is displayed at the bottom // anyway we display the slide number at the bottom - int bar_bottom = 1; + int bar_bottom = (slidenum || deck->headers > 1)? 1 : 0; slide_t *slide = deck->slide; line_t *line; @@ -276,16 +276,34 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa if(deck->headers > 1) { line = deck->header->next; offset = next_blank(line->text, 0) + 1; - // add text to left footer - mvwaddwstr(stdscr, - LINES - 1, 3, - &line->text->value[offset]); + switch(slidenum) { + case 0: // add text to center footer + mvwaddwstr(stdscr, + LINES - 1, (COLS - line->length + offset) / 2, + &line->text->value[offset]); + break; + case 1: + case 2: // add text to left footer + mvwaddwstr(stdscr, + LINES - 1, 3, + &line->text->value[offset]); + break; + } } // add slide number to right footer - mvwprintw(stdscr, - LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6, - "%d / %d", sc, deck->slides); + switch(slidenum) { + case 1: // show slide number only + mvwprintw(stdscr, + LINES - 1, COLS - int_length(sc) - 3, + "%d", sc); + break; + case 2: // show current slide & number of slides + mvwprintw(stdscr, + LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6, + "%d / %d", sc, deck->slides); + break; + } // make header + fooder visible wrefresh(content);