X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=d106a6221929a56e98a0d6da5d711d49c91726ef;hb=f49286fb39ff984f8fdbae7a890445a3e921aebb;hp=97e62df7f9114dc354502df634c5f9a0ae66fcd3;hpb=51b2a847fc5798c5b0f56ae93f6e1355038df840;p=smdp.git

diff --git a/src/viewer.c b/src/viewer.c
index 97e62df..d106a62 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -2,7 +2,7 @@
  * Functions necessary to display a deck of slides in different color modes
  * using ncurses. Only white, red, and blue are supported, as they can be
  * faded in 256 color mode.
- * Copyright (C) 2014 Michael Goehler
+ * Copyright (C) 2016 Michael Goehler
  *
  * This file is part of mdp.
  *
@@ -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 reload, int noreload) {
+int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reload, int noreload, int slidenum) {
 
     int c = 0;          // char
     int i = 0;          // iterate
@@ -79,7 +79,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
     int bar_top = (deck->headers > 0) ? 1 : 0;
     // header line 2 is displayed at the bottom
     // anyway we display the slide number at the bottom
-    int bar_bottom = 1;
+    int bar_bottom = (slidenum || deck->headers > 1)? 1 : 0;
 
     slide_t *slide = deck->slide;
     line_t *line;
@@ -93,11 +93,10 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
 
         while(line && line->text) {
 
-            if (line->text->value)
+            if (line->text->value) {
                 lc += url_count_inline(line->text->value);
-
-            if (line->text->value)
                 line->length -= url_len_inline(line->text->value);
+            }
 
             if(line->length > COLS) {
                 i = line->length;
@@ -276,16 +275,34 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
         if(deck->headers > 1) {
             line = deck->header->next;
             offset = next_blank(line->text, 0) + 1;
-            // add text to left footer
-            mvwaddwstr(stdscr,
-                       LINES - 1, 3,
-                       &line->text->value[offset]);
+            switch(slidenum) {
+                case 0: // add text to center footer
+                    mvwaddwstr(stdscr,
+                               LINES - 1, (COLS - line->length + offset) / 2,
+                               &line->text->value[offset]);
+                    break;
+                case 1:
+                case 2: // add text to left footer
+                    mvwaddwstr(stdscr,
+                               LINES - 1, 3,
+                               &line->text->value[offset]);
+                    break;
+            }
         }
 
         // add slide number to right footer
-        mvwprintw(stdscr,
-                  LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6,
-                  "%d / %d", sc, deck->slides);
+        switch(slidenum) {
+            case 1: // show slide number only
+                mvwprintw(stdscr,
+                          LINES - 1, COLS - int_length(sc) - 3,
+                          "%d", sc);
+                break;
+            case 2: // show current slide & number of slides
+                mvwprintw(stdscr,
+                          LINES - 1, COLS - int_length(deck->slides) - int_length(sc) - 6,
+                          "%d / %d", sc, deck->slides);
+                break;
+        }
 
         // make header + fooder visible
         wrefresh(content);
@@ -353,11 +370,15 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
                     // show current slide again
                     // but stop one stop bit earlier
                     slide->stop--;
+                    fade = false;
                 } else {
                     if(slide->prev) {
                         // show previous slide
                         slide = slide->prev;
                         sc--;
+                        //stop on first bullet point always
+                        if(slide->stop > 0)
+                            slide->stop = 0;
                     } else {
                         // do nothing
                         fade = false;
@@ -377,6 +398,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
                     // show current slide again
                     // but stop one stop bit later (or at end of slide)
                     slide->stop++;
+                    fade = false;
                 } else {
                     if(slide->next) {
                         // show next slide
@@ -488,16 +510,26 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert, int reloa
 
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) {
 
-    if(!line->text->value) {
-        return;
-    }
-
     int i; // increment
     int offset = 0; // text offset
 
     // move the cursor in position
     wmove(window, y, x);
 
+    if(!line->text->value) {
+
+        // fill rest off line with spaces if we are in a code block
+        if(CHECK_BIT(line->bits, IS_CODE) && colors) {
+            if(colors)
+                wattron(window, COLOR_PAIR(CP_BLACK));
+            for(i = getcurx(window) - x; i < max_cols; i++)
+                wprintw(window, "%s", " ");
+        }
+
+        // do nothing
+        return;
+    }
+
     // IS_UNORDERED_LIST_3
     if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) {
         offset = next_nonblank(line->text, 0);
@@ -559,8 +591,10 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo
     // IS_CODE
     if(CHECK_BIT(line->bits, IS_CODE)) {
 
-        // set static offset for code
-        offset = CODE_INDENT;
+        if (!CHECK_BIT(line->bits, IS_TILDE_CODE)) {
+            // set static offset for code
+            offset = CODE_INDENT;
+        }
 
         // reverse color for code blocks
         if(colors)
@@ -713,7 +747,7 @@ void inline_display(WINDOW *window, const wchar_t *c, const int colors) {
 
                         if (*i == L'!') i++;
 
-                        if (wcschr(i, L']')[1] == L'(') {
+                        if (wcschr(i, L']')[1] == L'(' && wcschr(i, L')')) {
                             i++;
 
                             // turn higlighting and underlining on