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

diff --git a/src/viewer.c b/src/viewer.c
index 079cd3d..747329c 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -297,6 +297,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)
@@ -313,6 +314,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             // show next slide
             case KEY_DOWN:
             case KEY_RIGHT:
+            case KEY_NPAGE:
             case '\n': // ENTER
             case ' ':  // SPACE
             case 'j':
@@ -397,120 +399,118 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
 }
 
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) {
-    int i; // increment
 
-    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]);
+    if(!line->text->text) {
+        return;
+    }
 
-        } else {
+    int i; // increment
+    int offset = 0; // 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[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)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // 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)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // 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)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // 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));
 
-            // IS_H1 || IS_H2
-            if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
+        // print whole lines
+        wprintw(window,
+                "%s", &line->text->text[offset]);
 
-                // set headline color
-                if(colors)
-                    wattron(window, COLOR_PAIR(CP_BLUE));
+    // IS_H1 || IS_H2
+    } else if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
 
-                // enable underline for H1
-                if(CHECK_BIT(line->bits, IS_H1))
-                    wattron(window, A_UNDERLINE);
+        // set headline color
+        if(colors)
+            wattron(window, COLOR_PAIR(CP_BLUE));
 
-                // skip hashes
-                while(line->text->text[offset] == '#')
-                    offset = next_word(line->text, offset);
+        // enable underline for H1
+        if(CHECK_BIT(line->bits, IS_H1))
+            wattron(window, A_UNDERLINE);
 
-                // print whole lines
-                mvwprintw(window,
-                      y, x,
-                      "%s", &line->text->text[offset]);
+        // skip hashes
+        while(line->text->text[offset] == '#')
+            offset = next_word(line->text, offset);
 
-                wattroff(window, A_UNDERLINE);
+        // print whole lines
+        wprintw(window,
+                "%s", &line->text->text[offset]);
 
-            } 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", ">");
-                        }
+        wattroff(window, A_UNDERLINE);
 
-                        // find next quote or break
-                        offset++;
-                        if(line->text->text[offset] == ' ')
-                            offset = next_word(line->text, offset);
-                    }
+    } else {
+
+        // 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", ">");
                 }
 
-                inline_display(window, &line->text->text[offset], colors);
+                // find next quote or break
+                offset++;
+                if(line->text->text[offset] == ' ')
+                    offset = next_word(line->text, offset);
             }
         }
 
-        // 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);
+        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", " ");
+
+    // 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 +518,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 +589,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