X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=747329cb288599cab7245c7d079ccaec65700737;hb=43aa3385fb0e78b302a9191789d59115402035f8;hp=528f4d4c3b740ab9080409d1a8b3eb7ad432c707;hpb=4f50d67b15ad1af1c9d14f5daec25c3fa14750f5;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 528f4d4..747329c 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -65,6 +65,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { int c = 0; // char int i = 0; // iterate int l = 0; // line number + int lc = 0; // line count int sc = 1; // slide count int colors = 0; // amount of colors supported int fade = 0; // disable color fading by default @@ -82,39 +83,71 @@ 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(); + while(slide) { - // set max_lines if line count exceeded - max_lines = (slide->lines > max_lines) ? slide->lines : max_lines; + lc = 0; line = slide->line; + while(line) { - // set max_cols if length exceeded - max_cols = (line->length > max_cols) ? line->length : max_cols; + if(line->length > COLS) { + i = line->length; + offset = 0; + while(i > COLS) { + + i = prev_blank(line->text, offset + COLS) - offset; + + // single word is > COLS + if(!i) { + // calculate min_width + i = next_blank(line->text, offset + COLS) - offset; + + // disable ncurses + 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"); + + return(1); + } + + // set max_cols + max_cols = (i > max_cols) ? i : max_cols; + + // iterate to next line + offset = prev_blank(line->text, offset + COLS); + i = line->length - offset; + lc++; + } + // set max_cols one last time + max_cols = (i > max_cols) ? i : max_cols; + } else { + // set max_cols + max_cols = (line->length > max_cols) ? line->length : max_cols; + } + lc++; line = line->next; } - slide = slide->next; - } - // set locale to display UTF-8 correctly in ncurses - setlocale(LC_CTYPE, ""); + max_lines = (lc > max_lines) ? lc : max_lines; - // init ncurses - initscr(); + slide = slide->next; + } - if((max_cols > COLS) || - (max_lines + bar_top + bar_bottom + 2 > LINES)) { + // not enough lines + if(max_lines + bar_top + bar_bottom > LINES) { // disable ncurses endwin(); // print error - fprintf(stderr, "Error: Terminal size %ix%i too small. Need at least %ix%i.\n", - COLS, LINES, max_cols, max_lines + bar_top + bar_bottom + 2); - - // print hint to solve it - if(max_lines + bar_top + bar_bottom + 2 > LINES) - fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n"); - if(max_cols > COLS) - fprintf(stderr, "Automatic line wrapping is not supported yet. You may need to shorten some lines by inserting line breaks.\n"); + 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"); return(1); } @@ -264,6 +297,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) @@ -280,6 +314,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { // show next slide case KEY_DOWN: case KEY_RIGHT: + case KEY_NPAGE: case '\n': // ENTER case ' ': // SPACE case 'j': @@ -364,185 +399,217 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) { } void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) { - int i = 0; // increment - char *c; // char pointer for iteration - char *special = "\\*_`"; // list of interpreted chars - cstack_t *stack = cstack_init(); - if(line->text->text) { - int offset = 0; // text offset + if(!line->text->text) { + return; + } - // IS_CODE - if(CHECK_BIT(line->bits, IS_CODE)) { + int i; // increment + int offset = 0; // 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[10]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "| " : " "); + strcpy(&prompt[3], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? "| " : " "); + strcpy(&prompt[6], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // IS_UNORDERED_LIST_2 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) { + offset = next_nonblank(line->text, 0); + char prompt[7]; + strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "| " : " "); + strcpy(&prompt[3], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // IS_UNORDERED_LIST_1 + } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) { + offset = next_nonblank(line->text, 0); + char prompt[4]; + strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? "+- " : "`- "); + wprintw(window, + "%s", prompt); + + inline_display(window, &line->text->text[offset + 2], colors); + + // 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)); - // set static offset for code - offset = CODE_INDENT; + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); - // reverse color for code blocks - if(colors) - wattron(window, COLOR_PAIR(CP_BLACK)); + // IS_H1 || IS_H2 + } else if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + // set headline color + if(colors) + wattron(window, COLOR_PAIR(CP_BLUE)); - } else { + // enable underline for H1 + if(CHECK_BIT(line->bits, IS_H1)) + wattron(window, A_UNDERLINE); - // IS_H1 || IS_H2 - if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) { + // skip hashes + while(line->text->text[offset] == '#') + offset = next_word(line->text, offset); - // set headline color - if(colors) - wattron(window, COLOR_PAIR(CP_BLUE)); + // print whole lines + wprintw(window, + "%s", &line->text->text[offset]); - // enable underline for H1 - if(CHECK_BIT(line->bits, IS_H1)) - wattron(window, A_UNDERLINE); + wattroff(window, A_UNDERLINE); - // skip hashes - while(line->text->text[offset] == '#') - offset = next_word(line->text, offset); + } else { + + // 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", ">"); + } - // print whole lines - mvwprintw(window, - y, x, - "%s", &line->text->text[offset]); + // find next quote or break + offset++; + if(line->text->text[offset] == ' ') + offset = next_word(line->text, offset); + } + } - wattroff(window, A_UNDERLINE); + inline_display(window, &line->text->text[offset], colors); + } - } 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", ">"); - } + // fill rest off line with spaces + for(i = getcurx(window) - x; i < max_cols; i++) + wprintw(window, "%s", " "); - // find next quote or break - offset++; - if(line->text->text[offset] == ' ') - offset = next_word(line->text, offset); - } - } + // reset to default color + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + wattroff(window, A_UNDERLINE); +} - // for each char in line - c = &line->text->text[offset]; - while(*c) { - - // if char is in special char list - if(strchr(special, *c)) { - - // closing special char (or second backslash) - if((stack->top)(stack, *c)) { - - switch(*c) { - // print escaped backslash - case '\\': - wprintw(window, "%c", *c); - break; - // disable highlight - case '*': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - // disable underline - case '_': - wattroff(window, A_UNDERLINE); - break; - // disable inline code - case '`': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - } +void inline_display(WINDOW *window, const char *c, const int colors) { + const static char *special = "\\*_`"; // list of interpreted chars + cstack_t *stack = cstack_init(); - // remove top special char from stack - (stack->pop)(stack); + // for each char in line + for(; *c; c++) { - // treat special as regular char - } else if((stack->top)(stack, '\\')) { - wprintw(window, "%c", *c); + // if char is in special char list + if(strchr(special, *c)) { - // remove backslash from stack - (stack->pop)(stack); + // closing special char (or second backslash) + if((stack->top)(stack, *c)) { - // 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 - } + switch(*c) { + // print escaped backslash + case '\\': + wprintw(window, "%c", *c); + break; + // disable highlight + case '*': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // disable underline + case '_': + wattroff(window, A_UNDERLINE); + break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + } - // push special char to stack - (stack->push)(stack, *c); - } + // remove top special char from stack + (stack->pop)(stack); - } else { - // remove backslash from stack - if((stack->top)(stack, '\\')) - (stack->pop)(stack); + // treat special as regular char + } else if((stack->top)(stack, '\\')) { + wprintw(window, "%c", *c); - // print regular char - wprintw(window, "%c", *c); - } + // remove backslash from stack + (stack->pop)(stack); - c++; + // 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 } - // pop stack until empty to prevent formated trailing spaces - while(!(stack->empty)(stack)) { - switch((stack->pop)(stack)) { - // disable highlight - case '*': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - // disable underline - case '_': - wattroff(window, A_UNDERLINE); - break; - // disable inline code - case '`': - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - break; - // do nothing for backslashes - } - } + // push special char to stack + (stack->push)(stack, *c); } - } - // fill rest off line with spaces - for(i = getcurx(window) - x; i < max_cols; i++) - wprintw(window, "%s", " "); + } else { + // remove backslash from stack + if((stack->top)(stack, '\\')) + (stack->pop)(stack); - // reset to default color - if(colors) - wattron(window, COLOR_PAIR(CP_WHITE)); - wattroff(window, A_UNDERLINE); + // print regular char + wprintw(window, "%c", *c); + } + } + + // pop stack until empty to prevent formated trailing spaces + while(!(stack->empty)(stack)) { + switch((stack->pop)(stack)) { + // disable highlight + case '*': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // disable underline + case '_': + wattroff(window, A_UNDERLINE); + break; + // disable inline code + case '`': + if(colors) + wattron(window, COLOR_PAIR(CP_WHITE)); + break; + // do nothing for backslashes + } } (stack->delete)(stack);