X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=b540b1af9b5f8afe08f919b252eefdd19c5bc318;hb=e19dfe3efed8333bb4363491740239ad7cbe0483;hp=42088a5028ff775668501e4f6937b4e75520f4ba;hpb=8689da8fc361118b05e33f3d19b269e9463040d0;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 42088a5..b540b1a 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -155,7 +155,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa // print error 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"); + fprintf(stderr, "You may need to add additional horizontal rules (---) to split your file in shorter slides.\n"); // no reload return 0; @@ -361,16 +361,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa 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) { @@ -839,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; +}