X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=0e8204f55a7d2013a6caab0f85c26c9e33fc10e2;hb=2ee89b63451a530c88ad705d6a99ea19e993f3a5;hp=bd8cd137a8a955451a466e9925dd77c0d7240548;hpb=c8f46dfa8f411b643907bc4c372bf788140f26f3;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index bd8cd13..0e8204f 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -276,17 +276,26 @@ 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 switch(slidenum) { case 1: // show slide number only mvwprintw(stdscr, - LINES - 1, COLS - int_length(sc) - 6, + LINES - 1, COLS - int_length(sc) - 3, "%d", sc); break; case 2: // show current slide & number of slides @@ -362,11 +371,15 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa // show current slide again // but stop one stop bit earlier slide->stop--; + fade = false; } else { if(slide->prev) { // show previous slide slide = slide->prev; sc--; + //stop on first bullet point always + if(slide->stop > 0) + slide->stop = 0; } else { // do nothing fade = false; @@ -386,6 +399,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa // show current slide again // but stop one stop bit later (or at end of slide) slide->stop++; + fade = false; } else { if(slide->next) { // show next slide @@ -568,8 +582,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo // IS_CODE if(CHECK_BIT(line->bits, IS_CODE)) { - // set static offset for code - offset = CODE_INDENT; + if (!CHECK_BIT(line->bits, IS_TILDE_CODE)) { + // set static offset for code + offset = CODE_INDENT; + } // reverse color for code blocks if(colors)