X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=3e391b194add2d91f037b5ef0d05f0f47421e7c8;hb=6d627bac82f84e39beda51981ddf3a6ddabbbe78;hp=fa2ea1074272fab58ca71df64f76342bb9045b7b;hpb=707f128bcec13b4efab5b534ec108f09dbe3f6c2;p=smdp.git

diff --git a/src/viewer.c b/src/viewer.c
index fa2ea10..3e391b1 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -60,7 +60,7 @@ static short red_ramp_invert[24]   = { 15, 231, 231, 224, 224, 225,
                                       206, 207, 201, 200, 199, 199,
                                       198, 198, 197, 197, 196, 196};
 
-int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
+int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload) {
 
     int c = 0;          // char
     int i = 0;          // iterate
@@ -93,11 +93,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         lc = 0;
         line = slide->line;
 
-        while(line) {
+        while(line && line->text) {
 
-            if (line && line->text && line->text->text)
+            if (line->text->text)
                 lc += url_count_inline(line->text->text);
 
+            if (line->text->text)
+                line->length -= url_len_inline(line->text->text);
+
             if(line->length > COLS) {
                 i = line->length;
                 offset = 0;
@@ -117,7 +120,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                         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;
+                        // no reload
+                        return 0;
                     }
 
                     // set max_cols
@@ -151,9 +155,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
 
         // 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");
 
-        return 1;
+        // no reload
+        return 0;
     }
 
     // disable cursor
@@ -237,6 +242,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         wbkgd(content, COLOR_PAIR(CP_WHITE));
 
     slide = deck->slide;
+
+    // find slide to reload
+    while(reload > 1 && reload <= deck->slides) {
+        slide = slide->next;
+        sc++;
+        reload--;
+    }
+
+    // reset reload indicator
+    reload = 0;
+
     while(slide) {
 
         url_init();
@@ -345,16 +361,17 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                 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) {
@@ -377,12 +394,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                 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) {
@@ -392,10 +411,24 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                 }
                 break;
 
+            // reload
+            case 'r':
+                if(noreload == 0) {
+                    // reload slide N
+                    reload = sc;
+                    slide = NULL;
+                } else {
+                    // disable fading if reload is not possible
+                    fade = false;
+                }
+                break;
+
             // quit
             case 'q':
                 // do not fade out on exit
                 fade = false;
+                // do not reload
+                reload = 0;
                 slide = NULL;
                 break;
 
@@ -412,9 +445,16 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         url_purge();
     }
 
+    // disable ncurses
     endwin();
 
-    return 0;
+    // free ncurses memory
+    delwin(content);
+    if(reload == 0)
+        delwin(stdscr);
+
+    // return reload indicator (0 means no reload)
+    return reload;
 }
 
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) {
@@ -802,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;
+}