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);
+ return 1;
}
// 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);
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;
}
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, "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);
+ return 1;
}
// disable cursor
init_pair(CP_YELLOW, 208, trans);
// enable color fading
- if(!nofade) fade = 1;
+ if(!nofade)
+ fade = true;
// 8 color mode
} else {
// 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++;
}
// make content visible
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();
// show previous slide
case KEY_UP:
case KEY_LEFT:
+ case KEY_PPAGE:
case 8: // BACKSPACE (ascii)
case 127: // BACKSPACE (xterm)
case 263: // BACKSPACE (getty)
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':
slide = slide->next;
sc++;
} else {
- fade = 0;
+ fade = false;
}
break;
}
} else {
// disable fading if slide n doesn't exist
- fade = 0;
+ fade = false;
}
break;
// quit
case 'q':
// do not fade out on exit
- fade = 0;
- slide = (void*)0;
+ fade = false;
+ slide = NULL;
break;
default:
// disable fading on undefined key press
- fade = 0;
+ fade = false;
break;
}
endwin();
- return(0);
+ return 0;
}
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
-
- // 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]);
+ if(!line->text->text) {
+ return;
+ }
+
+ 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[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)) {
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);
- }
- }
-
- // 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;
- }
+ inline_display(window, &line->text->text[offset], colors);
+ }
+ }
+ }
- // remove top special char from stack
- (stack->pop)(stack);
+ // fill rest off line with spaces
+ for(i = getcurx(window) - x; i < max_cols; i++)
+ wprintw(window, "%s", " ");
- // treat special as regular char
- } else if((stack->top)(stack, '\\')) {
- wprintw(window, "%c", *c);
+ // reset to default color
+ if(colors)
+ wattron(window, COLOR_PAIR(CP_WHITE));
+ wattroff(window, A_UNDERLINE);
+}
- // remove backslash from stack
- (stack->pop)(stack);
+void inline_display(WINDOW *window, const char *c, const int colors) {
+ const static char *special = "\\*_`"; // list of interpreted chars
+ cstack_t *stack = cstack_init();
- // 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
- }
+ // for each char in line
+ for(; *c; c++) {
- // push special char to stack
- (stack->push)(stack, *c);
- }
+ // if char is in special char list
+ if(strchr(special, *c)) {
- } else {
- // remove backslash from stack
- if((stack->top)(stack, '\\'))
- (stack->pop)(stack);
+ // closing special char (or second backslash)
+ if((stack->top)(stack, *c)) {
- // print regular char
+ switch(*c) {
+ // print escaped backslash
+ case '\\':
wprintw(window, "%c", *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;
}
- // 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
- }
+ // remove top special char from stack
+ (stack->pop)(stack);
+
+ // treat special as regular char
+ } else if((stack->top)(stack, '\\')) {
+ wprintw(window, "%c", *c);
+
+ // 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);
}
- }
- // 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);
