X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fviewer.c;h=50646d7da8bea261e62e31117d6d7819e412d8cb;hb=96f4804a413b591d74505eacfa621604b56f6d5f;hp=bd533e214b97fbe85f6041631c74fdd7632c614e;hpb=35508ded3b1869a9fbe3a239825383677d1c0d75;p=smdp.git

diff --git a/src/viewer.c b/src/viewer.c
index bd533e2..50646d7 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -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;
@@ -412,8 +415,13 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         url_purge();
     }
 
+    // disable ncurses
     endwin();
 
+    // free ncurses memory
+    delwin(content);
+    delwin(stdscr);
+
     return 0;
 }
 
@@ -576,7 +584,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo
 }
 
 void inline_display(WINDOW *window, const char *c, const int colors) {
-    const static char *special = "\\*_`["; // list of interpreted chars
+    const static char *special = "\\*_`!["; // list of interpreted chars
     const char *i = c; // iterator
     const char *start_link_name, *start_url;
     int length_link_name, url_num;
@@ -637,7 +645,11 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
                    *i == '\\') {
 
                     // url in pandoc style
-                    if (*i == '[' && strchr(i, ']')) {
+                    if ((*i == '[' && strchr(i, ']')) ||
+                        (*i == '!' && *(i + 1) == '[' && strchr(i, ']'))) {
+
+                        if (*i == '!') i++;
+
                         if (strchr(i, ']')[1] == '(') {
                             i++;
 
@@ -666,7 +678,7 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
 
                             url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0);
 
-                            wprintw(window, "[%d]", url_num);
+                            wprintw(window, " [%d]", url_num);
 
                             // turn highlighting and underlining off
                             wattroff(window, A_UNDERLINE);