X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=3e391b194add2d91f037b5ef0d05f0f47421e7c8;hb=6d627bac82f84e39beda51981ddf3a6ddabbbe78;hp=211557edc1114d92b133a3e4fe6e42b1126381e3;hpb=aa1840c42fc305339cf02b45ea3039ca50f6d6e2;p=smdp.git diff --git a/src/viewer.c b/src/viewer.c index 211557e..3e391b1 100644 --- a/src/viewer.c +++ b/src/viewer.c @@ -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) { @@ -393,12 +394,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa break; // show first slide + case 'g': case KEY_HOME: slide = deck->slide; sc = 1; break; // show last slide + case 'G': case KEY_END: for(i = sc; i <= deck->slides; i++) { if(slide->next) { @@ -839,3 +842,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; +}