X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=b540b1af9b5f8afe08f919b252eefdd19c5bc318;hb=e19dfe3efed8333bb4363491740239ad7cbe0483;hp=079cd3d5a13ae93b2b69216ddb0bcc391bcfa81a;hpb=32c41cac57abc7887875b82c4b1511939ee4b5f1;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 079cd3d..b540b1a 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -21,10 +21,10 @@ * */ +#include // isalnum #include // setlocale -#include #include // strchr -#include +#include // usleep #include "viewer.h" @@ -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 @@ -93,7 +93,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->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; @@ -113,11 +120,12 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { 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"); - return(1); + // no reload + return 0; } // set max_cols - max_cols = (i > max_cols) ? i : max_cols; + max_cols = MAX(i, max_cols); // iterate to next line offset = prev_blank(line->text, offset + COLS); @@ -125,16 +133,16 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { lc++; } // set max_cols one last time - max_cols = (i > max_cols) ? i : max_cols; + max_cols = MAX(i, max_cols); } else { // set max_cols - max_cols = (line->length > max_cols) ? line->length : max_cols; + max_cols = MAX(line->length, max_cols); } lc++; line = line->next; } - max_lines = (lc > max_lines) ? lc : max_lines; + max_lines = MAX(lc, max_lines); slide = slide->next; } @@ -146,10 +154,11 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { endwin(); // print error - fprintf(stderr, "Error: Terminal heigth (%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"); + 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"); - return(1); + // no reload + return 0; } // disable cursor @@ -194,7 +203,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { init_pair(CP_YELLOW, 208, trans); // enable color fading - if(!nofade) fade = 1; + if(!nofade) + fade = true; // 8 color mode } else { @@ -232,7 +242,21 @@ 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(); + // clear windows werase(content); werase(stdscr); @@ -265,6 +289,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { "%d / %d", sc, deck->slides); // make header + fooder visible + wrefresh(content); wrefresh(stdscr); line = slide->line; @@ -273,8 +298,15 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // print lines while(line) { add_line(content, l, (COLS - max_cols) / 2, line, max_cols, colors); + l += (line->length / COLS) + 1; line = line->next; - l++; + } + + int i, ymax; + 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)); } // make content visible @@ -285,7 +317,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { fade_in(content, trans, colors, invert); // re-enable fading after any undefined key press - if(COLORS == 256 && !nofade) fade = 1; + if(COLORS == 256 && !nofade) + fade = true; // wait for user input c = getch(); @@ -297,6 +330,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // show previous slide case KEY_UP: case KEY_LEFT: + case KEY_PPAGE: case 8: // BACKSPACE (ascii) case 127: // BACKSPACE (xterm) case 263: // BACKSPACE (getty) @@ -306,13 +340,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = slide->prev; sc--; } else { - fade = 0; + fade = false; } break; // show next slide case KEY_DOWN: case KEY_RIGHT: + case KEY_NPAGE: case '\n': // ENTER case ' ': // SPACE case 'j': @@ -321,21 +356,22 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = slide->next; sc++; } else { - fade = 0; + fade = false; } 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) { @@ -353,7 +389,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { } } else { // disable fading if slide n doesn't exist - fade = 0; + fade = false; } break; @@ -373,85 +409,171 @@ 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 = 0; - slide = (void*)0; + fade = false; + // do not reload + reload = 0; + slide = NULL; break; default: // disable fading on undefined key press - fade = 0; + fade = false; break; } // fade out if(fade) fade_out(content, trans, colors, 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) { + + if(!line->text->text) { + return; + } + int i; // increment + int offset = 0; // text offset - if(line->text->text) { - int offset = 0; // text offset - - // IS_UNORDERED_LIST_3 - if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) { - offset = next_nonblank(line->text, 0); - char format_s[15]; - strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); - strcpy(&format_s[4], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? " | " : " "); - strcpy(&format_s[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_UNORDERED_LIST_2 - } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { - offset = next_nonblank(line->text, 0); - char format_s[11]; - strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); - strcpy(&format_s[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_UNORDERED_LIST_1 - } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { - offset = next_nonblank(line->text, 0); - char format_s[7]; - strcpy(&format_s[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " +- %s" : " `- %s"); - mvwprintw(window, - y, x, - format_s, - &line->text->text[offset + 2]); - - // IS_CODE - } else if(CHECK_BIT(line->bits, IS_CODE)) { - - // set static offset for code - offset = CODE_INDENT; - - // reverse color for code blocks - if(colors) - wattron(window, COLOR_PAIR(CP_BLACK)); - - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + // move the cursor in position + wmove(window, y, x); + + // IS_UNORDERED_LIST_3 + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) { + offset = next_nonblank(line->text, 0); + char prompt[13]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); + strcpy(&prompt[4], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? " | " : " "); + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " | " : " "); + } else { + strcpy(&prompt[8], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + + // IS_UNORDERED_LIST_2 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { + offset = next_nonblank(line->text, 0); + char prompt[9]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " "); + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " | " : " "); + } else { + strcpy(&prompt[4], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + + // IS_UNORDERED_LIST_1 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { + offset = next_nonblank(line->text, 0); + char prompt[5]; + + if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_EXT)) { + strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " | " : " "); + } else { + strcpy(&prompt[0], " +- "); + offset += 2; + } + + wprintw(window, + "%s", prompt); + + if(!CHECK_BIT(line->bits, IS_CODE)) + inline_display(window, &line->text->text[offset], colors); + } + + // IS_CODE + if(CHECK_BIT(line->bits, IS_CODE)) { + + // set static offset for code + offset = CODE_INDENT; + + // reverse color for code blocks + if(colors) + wattron(window, COLOR_PAIR(CP_BLACK)); + + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); + } + + if(!CHECK_BIT(line->bits, IS_UNORDERED_LIST_1) && + !CHECK_BIT(line->bits, IS_UNORDERED_LIST_2) && + !CHECK_BIT(line->bits, IS_UNORDERED_LIST_3) && + !CHECK_BIT(line->bits, IS_CODE)) { + + // IS_QUOTE + if(CHECK_BIT(line->bits, IS_QUOTE)) { + while(line->text->text[offset] == '>') { + // print a reverse color block + 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] == ' ') + offset = next_word(line->text, offset); + } + inline_display(window, &line->text->text[offset], colors); } else { + // IS_CENTER + if(CHECK_BIT(line->bits, IS_CENTER)) { + if(line->length < max_cols) { + wmove(window, y, x + ((max_cols - line->length) / 2)); + } + } + // IS_H1 || IS_H2 if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { @@ -468,68 +590,52 @@ 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 - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + wprintw(window, + "%s", &line->text->text[offset]); wattroff(window, A_UNDERLINE); + // no line-wide markdown } else { - // 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 - 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] == ' ') - offset = next_word(line->text, offset); - } - } inline_display(window, &line->text->text[offset], colors); } } + } - // fill rest off line with spaces - for(i = getcurx(window) - x; i < max_cols; i++) - wprintw(window, "%s", " "); + // fill rest off line with spaces + for(i = getcurx(window) - x; i < max_cols; i++) + wprintw(window, "%s", " "); - // reset to default color - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - wattroff(window, A_UNDERLINE); - } + // reset to default color + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + wattroff(window, A_UNDERLINE); } void inline_display(WINDOW *window, const char *c, const int colors) { - const static char *special = "\\*_`"; // list of interpreted chars + const static char *special = "\\*_`!["; // list of interpreted chars + const char *i = c; // iterator + const char *start_link_name, *start_url; + int length_link_name, url_num; cstack_t *stack = cstack_init(); + // for each char in line - while(*c) { + for(; *i; i++) { // if char is in special char list - if(strchr(special, *c)) { + if(strchr(special, *i)) { // closing special char (or second backslash) - if((stack->top)(stack, *c)) { + // only if not followed by :alnum: + if((stack->top)(stack, *i) && + (!isalnum((int)i[1]) || *(i + 1) == '\0' || *i == '\\')) { - switch(*c) { + switch(*i) { // print escaped backslash case '\\': - wprintw(window, "%c", *c); + wprintw(window, "%c", *i); break; // disable highlight case '*': @@ -552,33 +658,90 @@ void inline_display(WINDOW *window, const char *c, const int colors) { // treat special as regular char } else if((stack->top)(stack, '\\')) { - wprintw(window, "%c", *c); + wprintw(window, "%c", *i); // remove backslash from stack (stack->pop)(stack); // opening special char } else { - switch(*c) { - // enable highlight - case '*': - 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 - } - // push special char to stack - (stack->push)(stack, *c); + // emphasis or code span can start after new-line or space only + // 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 == '\\') { + + // url in pandoc style + if ((*i == '[' && strchr(i, ']')) || + (*i == '!' && *(i + 1) == '[' && strchr(i, ']'))) { + + if (*i == '!') i++; + + if (strchr(i, ']')[1] == '(') { + i++; + + // turn higlighting and underlining on + if (colors) + wattron(window, COLOR_PAIR(CP_BLUE)); + wattron(window, A_UNDERLINE); + + start_link_name = i; + + // print the content of the label + // the label is printed as is + do { + wprintw(window, "%c", *i); + i++; + } while (*i != ']'); + + length_link_name = i - 1 - start_link_name; + + i++; + i++; + + start_url = i; + + while (*i != ')') i++; + + url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0); + + wprintw(window, " [%d]", url_num); + + // turn highlighting and underlining off + wattroff(window, A_UNDERLINE); + wattron(window, COLOR_PAIR(CP_WHITE)); + + } else { + wprintw(window, "["); + } + + } else switch(*i) { + // enable highlight + case '*': + 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 + } + + // push special char to stack + (stack->push)(stack, *i); + + } else { + wprintw(window, "%c", *i); + } } } else { @@ -587,10 +750,8 @@ void inline_display(WINDOW *window, const char *c, const int colors) { (stack->pop)(stack); // print regular char - wprintw(window, "%c", *c); + wprintw(window, "%c", *i); } - - c++; } // pop stack until empty to prevent formated trailing spaces @@ -679,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; +}