X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=13ff6f6466eb3f13ea871fa2e2f63e3c3cb22cfb;hb=5f369c826ac0ca4989892b3691f66d0ac73679f3;hp=079cd3d5a13ae93b2b69216ddb0bcc391bcfa81a;hpb=32c41cac57abc7887875b82c4b1511939ee4b5f1;p=smdp.git

diff --git a/src/viewer.c b/src/viewer.c
index 079cd3d..13ff6f6 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -113,11 +113,11 @@ 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);
+                        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);
@@ -125,16 +125,16 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                     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;
     }
@@ -146,10 +146,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         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
@@ -194,7 +194,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             init_pair(CP_YELLOW, 208, trans);
 
             // enable color fading
-            if(!nofade) fade = 1;
+            if(!nofade)
+                fade = true;
 
         // 8 color mode
         } else {
@@ -273,8 +274,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         // 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
@@ -285,7 +286,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             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();
@@ -297,6 +299,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             // show previous slide
             case KEY_UP:
             case KEY_LEFT:
+            case KEY_PPAGE:
             case 8:   // BACKSPACE (ascii)
             case 127: // BACKSPACE (xterm)
             case 263: // BACKSPACE (getty)
@@ -306,13 +309,14 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                     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':
@@ -321,7 +325,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                     slide = slide->next;
                     sc++;
                 } else {
-                    fade = 0;
+                    fade = false;
                 }
                 break;
 
@@ -353,7 +357,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
                     }
                 } else {
                     // disable fading if slide n doesn't exist
-                    fade = 0;
+                    fade = false;
                 }
                 break;
 
@@ -376,13 +380,13 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             // 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;
         }
 
@@ -393,65 +397,128 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
 
     endwin();
 
-    return(0);
+    return 0;
 }
 
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) {
+
+    if(!line->text->text) {
+        return;
+    }
+
     int i; // increment
+    int offset = 0; // text offset
 
-    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]);
+    // 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)) {
 
@@ -468,49 +535,27 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo
                     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);
-                    }
-                }
 
                 inline_display(window, &line->text->text[offset], colors);
             }
         }
+    }
 
-        // fill rest off line with spaces
-        for(i = getcurx(window) - x; i < max_cols; i++)
-            wprintw(window, "%s", " ");
+    // fill rest off line with spaces
+    for(i = getcurx(window) - x; i < max_cols; i++)
+        wprintw(window, "%s", " ");
 
-        // reset to default color
-        if(colors)
-            wattron(window, COLOR_PAIR(CP_WHITE));
-        wattroff(window, A_UNDERLINE);
-    }
+    // reset to default color
+    if(colors)
+        wattron(window, COLOR_PAIR(CP_WHITE));
+    wattroff(window, A_UNDERLINE);
 }
 
 void inline_display(WINDOW *window, const char *c, const int colors) {
@@ -518,7 +563,7 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
     cstack_t *stack = cstack_init();
 
     // for each char in line
-    while(*c) {
+    for(; *c; c++) {
 
         // if char is in special char list
         if(strchr(special, *c)) {
@@ -589,8 +634,6 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
             // print regular char
             wprintw(window, "%c", *c);
         }
-
-        c++;
     }
 
     // pop stack until empty to prevent formated trailing spaces