X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=50646d7da8bea261e62e31117d6d7819e412d8cb;hb=96f4804a413b591d74505eacfa621604b56f6d5f;hp=df66fd58c5b1c4d58d45088f2ec9b79e28fcf942;hpb=51259296e35b24a168e96f0b2fbad5df12d9b6cc;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index df66fd5..50646d7 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -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; @@ -234,6 +241,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { slide = deck->slide; while(slide) { + + url_init(); + // clear windows werase(content); werase(stdscr); @@ -279,6 +289,13 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { line = line->next; } + 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 wrefresh(content); @@ -394,10 +411,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // fade out if(fade) fade_out(content, trans, colors, invert); + + url_purge(); } + // disable ncurses endwin(); + // free ncurses memory + delwin(content); + delwin(stdscr); + return 0; } @@ -560,8 +584,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo } 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(); @@ -612,12 +638,57 @@ void inline_display(WINDOW *window, const char *c, const int colors) { // emphasis or code span can start after new-line or space only // and of cause after another emphasis markup - if(*(i - 1) == ' ' || - ((*(i - 1) == '_' || *(i - 1) == '*') && (*(i - 2) == ' ' || (i - 1) == c)) || - *i == '\\' || - i == c) { + //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, "["); + } - switch(*i) { + } else switch(*i) { // enable highlight case '*': if(colors)