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();
slide = slide->prev;
sc--;
} else {
- fade = 0;
+ fade = false;
}
break;
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;
+ 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) {
// 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)? "+- " : "`- ");
+ 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)? " | " : " ");
+ strcpy(&prompt[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " +- " : " `- ");
wprintw(window,
"%s", prompt);
// 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)? "+- " : "`- ");
+ char prompt[9];
+ strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " | " : " ");
+ strcpy(&prompt[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " +- " : " `- ");
wprintw(window,
"%s", prompt);
// 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)? "+- " : "`- ");
+ char prompt[5];
+ strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " +- " : " `- ");
wprintw(window,
"%s", prompt);