X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=8d97139ffb187b6258a09cc9bc5328d958a1dd28;hb=4b8ad1b3b464836eca2e876dd418a8e8d87bd721;hp=bd533e214b97fbe85f6041631c74fdd7632c614e;hpb=35508ded3b1869a9fbe3a239825383677d1c0d75;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index bd533e2..8d97139 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -22,10 +22,10 @@ */ #include // isalnum -#include // setlocale -#include // strchr +#include // wcschr +#include // iswalnum +#include // strcpy #include // usleep - #include "viewer.h" // color ramp for fading from black to color @@ -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 ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload) { int c = 0; // char int i = 0; // iterate @@ -83,9 +83,6 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide_t *slide = deck->slide; line_t *line; - // set locale to display UTF-8 correctly in ncurses - setlocale(LC_CTYPE, ""); - // init ncurses initscr(); @@ -93,11 +90,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { lc = 0; line = slide->line; - while(line) { + while(line && line->text) { - if (line && line->text && line->text->text) + if (line->text->text) lc += url_count_inline(line->text->text); + if (line->text->text) + line->length -= url_len_inline(line->text->text); + if(line->length > COLS) { i = line->length; offset = 0; @@ -114,10 +114,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { endwin(); // print error - fprintf(stderr, "Error: Terminal width (%i columns) too small. Need at least %i columns.\n", COLS, i); - fprintf(stderr, "You may need to shorten some lines by inserting line breaks.\n"); + fwprintf(stderr, L"Error: Terminal width (%i columns) too small. Need at least %i columns.\n", COLS, i); + fwprintf(stderr, L"You may need to shorten some lines by inserting line breaks.\n"); - return 1; + // no reload + return 0; } // set max_cols @@ -150,10 +151,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { endwin(); // print error - fprintf(stderr, "Error: Terminal height (%i lines) too small. Need at least %i lines.\n", LINES, max_lines + bar_top + bar_bottom); - fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n"); + fwprintf(stderr, L"Error: Terminal height (%i lines) too small. Need at least %i lines.\n", LINES, max_lines + bar_top + bar_bottom); + fwprintf(stderr, L"You may need to add additional horizontal rules (---) to split your file in shorter slides.\n"); - return 1; + // no reload + return 0; } // disable cursor @@ -237,6 +239,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { wbkgd(content, COLOR_PAIR(CP_WHITE)); slide = deck->slide; + + // find slide to reload + while(reload > 1 && reload <= deck->slides) { + slide = slide->next; + sc++; + reload--; + } + + // reset reload indicator + reload = 0; + while(slide) { url_init(); @@ -253,9 +266,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { 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]); + mvwaddwstr(stdscr, + 0, (COLS - line->length + offset) / 2, + &line->text->text[offset]); } // setup footer @@ -263,10 +276,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { 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]); + mvwaddwstr(stdscr, + LINES - 1, 3, + &line->text->text[offset]); } + // add slide number to right footer mvwprintw(stdscr, LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6, @@ -290,7 +304,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { getmaxyx( content, ymax, i ); for (i = 0; i < url_get_amount(); i++) { mvwprintw(content, ymax - url_get_amount() - 1 + i, 3, - "[%d] %s", i, url_get_target(i)); + "[%d] ", i); + waddwstr(content, url_get_target(i)); } // make content visible @@ -345,16 +360,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { 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) { + case '9': + case '8': + case '7': + case '6': + case '5': + case '4': + case '3': + case '2': + case '1': + i = get_slide_number(c); + if(i > 0 && i <= deck->slides) { while(sc != i) { // search forward if(sc < i) { @@ -377,12 +393,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { break; // show first slide + case 'g': case KEY_HOME: slide = deck->slide; sc = 1; break; // show last slide + case 'G': case KEY_END: for(i = sc; i <= deck->slides; i++) { if(slide->next) { @@ -392,10 +410,24 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { } break; + // reload + case 'r': + if(noreload == 0) { + // reload slide N + reload = sc; + slide = NULL; + } else { + // disable fading if reload is not possible + fade = false; + } + break; + // quit case 'q': // do not fade out on exit fade = false; + // do not reload + reload = 0; slide = NULL; break; @@ -412,9 +444,16 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { url_purge(); } + // disable ncurses endwin(); - return 0; + // free ncurses memory + delwin(content); + if(reload == 0) + delwin(stdscr); + + // return reload indicator (0 means no reload) + return reload; } void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) { @@ -498,8 +537,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo wattron(window, COLOR_PAIR(CP_BLACK)); // print whole lines - wprintw(window, - "%s", &line->text->text[offset]); + waddwstr(window, &line->text->text[offset]); } if(!CHECK_BIT(line->bits, IS_UNORDERED_LIST_1) && @@ -552,8 +590,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo offset = next_word(line->text, offset); // print whole lines - wprintw(window, - "%s", &line->text->text[offset]); + waddwstr(window, &line->text->text[offset]); wattroff(window, A_UNDERLINE); @@ -575,10 +612,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo wattroff(window, A_UNDERLINE); } -void inline_display(WINDOW *window, const char *c, const int colors) { - const static char *special = "\\*_`["; // list of interpreted chars - const char *i = c; // iterator - const char *start_link_name, *start_url; +void inline_display(WINDOW *window, const wchar_t *c, const int colors) { + const static wchar_t *special = L"\\*_`!["; // list of interpreted chars + const wchar_t *i = c; // iterator + const wchar_t *start_link_name, *start_url; int length_link_name, url_num; cstack_t *stack = cstack_init(); @@ -587,29 +624,29 @@ void inline_display(WINDOW *window, const char *c, const int colors) { for(; *i; i++) { // if char is in special char list - if(strchr(special, *i)) { + if(wcschr(special, *i)) { // closing special char (or second backslash) // only if not followed by :alnum: if((stack->top)(stack, *i) && - (!isalnum((int)i[1]) || *(i + 1) == '\0' || *i == '\\')) { + (!iswalnum(i[1]) || *(i + 1) == L'\0' || *i == L'\\')) { switch(*i) { // print escaped backslash - case '\\': - wprintw(window, "%c", *i); + case L'\\': + waddnwstr(window, i, 1); break; // disable highlight - case '*': + case L'*': if(colors) wattron(window, COLOR_PAIR(CP_WHITE)); break; // disable underline - case '_': + case L'_': wattroff(window, A_UNDERLINE); break; // disable inline code - case '`': + case L'`': if(colors) wattron(window, COLOR_PAIR(CP_WHITE)); break; @@ -619,8 +656,8 @@ void inline_display(WINDOW *window, const char *c, const int colors) { (stack->pop)(stack); // treat special as regular char - } else if((stack->top)(stack, '\\')) { - wprintw(window, "%c", *i); + } else if((stack->top)(stack, L'\\')) { + waddnwstr(window, i, 1); // remove backslash from stack (stack->pop)(stack); @@ -632,13 +669,18 @@ void inline_display(WINDOW *window, const char *c, const int colors) { // and of cause after another emphasis markup //TODO this condition looks ugly if(i == c || - *(i - 1) == ' ' || - ((*(i - 1) == '_' || *(i - 1) == '*') && ((i - 1) == c || *(i - 2) == ' ')) || - *i == '\\') { + iswspace(*(i - 1)) || + ((iswspace(*(i - 1)) || *(i - 1) == L'*' || *(i - 1) == L'_') && + ((i - 1) == c || iswspace(*(i - 2)))) || + *i == L'\\') { // url in pandoc style - if (*i == '[' && strchr(i, ']')) { - if (strchr(i, ']')[1] == '(') { + if ((*i == L'[' && wcschr(i, L']')) || + (*i == L'!' && *(i + 1) == L'[' && wcschr(i, L']'))) { + + if (*i == L'!') i++; + + if (wcschr(i, L']')[1] == L'(') { i++; // turn higlighting and underlining on @@ -651,9 +693,9 @@ void inline_display(WINDOW *window, const char *c, const int colors) { // print the content of the label // the label is printed as is do { - wprintw(window, "%c", *i); + waddnwstr(window, i, 1); i++; - } while (*i != ']'); + } while (*i != L']'); length_link_name = i - 1 - start_link_name; @@ -662,11 +704,11 @@ void inline_display(WINDOW *window, const char *c, const int colors) { start_url = i; - while (*i != ')') i++; + while (*i != L')') i++; - url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0); + url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0, 0); - wprintw(window, "[%d]", url_num); + wprintw(window, " [%d]", url_num); // turn highlighting and underlining off wattroff(window, A_UNDERLINE); @@ -678,16 +720,16 @@ void inline_display(WINDOW *window, const char *c, const int colors) { } else switch(*i) { // enable highlight - case '*': + case L'*': if(colors) wattron(window, COLOR_PAIR(CP_RED)); break; // enable underline - case '_': + case L'_': wattron(window, A_UNDERLINE); break; // enable inline code - case '`': + case L'`': if(colors) wattron(window, COLOR_PAIR(CP_BLACK)); break; @@ -698,17 +740,17 @@ void inline_display(WINDOW *window, const char *c, const int colors) { (stack->push)(stack, *i); } else { - wprintw(window, "%c", *i); + waddnwstr(window, i, 1); } } } else { // remove backslash from stack - if((stack->top)(stack, '\\')) + if((stack->top)(stack, L'\\')) (stack->pop)(stack); // print regular char - wprintw(window, "%c", *i); + waddnwstr(window, i, 1); } } @@ -716,16 +758,16 @@ void inline_display(WINDOW *window, const char *c, const int colors) { while(!(stack->empty)(stack)) { switch((stack->pop)(stack)) { // disable highlight - case '*': + case L'*': if(colors) wattron(window, COLOR_PAIR(CP_WHITE)); break; // disable underline - case '_': + case L'_': wattroff(window, A_UNDERLINE); break; // disable inline code - case '`': + case L'`': if(colors) wattron(window, COLOR_PAIR(CP_WHITE)); break; @@ -798,3 +840,20 @@ int int_length (int val) { } return l; } + +int get_slide_number(char init) { + int retval = init - '0'; + char c; + // block for tenths of a second when using getch, ERR if no input + halfdelay(GOTO_SLIDE_DELAY); + while((c = getch()) != ERR) { + if (c < '0' || c > '9') { + retval = -1; + break; + } + retval = (retval * 10) + (c - '0'); + } + nocbreak(); // cancel half delay mode + cbreak(); // go back to cbreak + return retval; +}