From: Simon Doppler <dopsi.dev@gmail.com>
Date: Mon, 24 Nov 2014 19:59:03 +0000 (+0100)
Subject: Added link support
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=a677643e62d4f4011593096ce25ca27c7d1c0be5;p=smdp.git
Added link support
---
diff --git a/include/url.h b/include/url.h
new file mode 100644
index 0000000..33a270b
--- /dev/null
+++ b/include/url.h
@@ -0,0 +1,14 @@
+#ifndef URL_H
+#define URL_H
+
+// init the url module
+void url_init(void);
+
+int url_add(const char * link_name, int link_name_length, const char * target, int target_length, int x, int y);
+char * url_get_target(int index);
+char * url_get_name(int index);
+int url_get_amount(void);
+void url_purge(void);
+void url_dump(void);
+
+#endif // URL_H
diff --git a/sample.md b/sample.md
index a679ba2..762537d 100644
--- a/sample.md
+++ b/sample.md
@@ -173,6 +173,15 @@ becomes
-------------------------------------------------
+-> # Supported markdown formatting's <-
+
+URL in John MacFarlane's Pandoc style are supported :
+
+[GitHub repository for mdp](https://github.com/visit1985/mdp)
+[Google](google.com)
+
+-------------------------------------------------
+
-> ## More information about markdown <-
can be found on
diff --git a/src/url.c b/src/url.c
new file mode 100644
index 0000000..7ccfa10
--- /dev/null
+++ b/src/url.c
@@ -0,0 +1,141 @@
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "url.h"
+
+typedef struct Url {
+ char * link_name;
+ char * target;
+ int x;
+ int y;
+ struct Url * next;
+} Url_t;
+
+static void url_del_elem(Url_t * elem);
+static void url_print(Url_t * u);
+
+static Url_t *list;
+static int index_max;
+static int init_ok;
+
+void url_init(void) {
+ list = NULL;
+ index_max = 0;
+ init_ok = 1;
+}
+
+int url_add(const char * link_name, int link_name_length, const char * target, int target_length, int x, int y) {
+ if (!init_ok) return -1;
+
+ Url_t *tmp = NULL;
+ int i = 0;
+
+ if (list) {
+ tmp = list;
+ while (tmp->next) {
+ tmp = tmp->next;
+ i++;
+ }
+ tmp->next = malloc(sizeof(Url_t));
+ assert(tmp->next);
+ tmp = tmp->next;
+ } else {
+ list = malloc(sizeof(Url_t));
+ tmp = list;
+ assert(tmp);
+ }
+
+ tmp -> link_name = calloc(link_name_length, sizeof(char));
+ assert(tmp->link_name);
+ strncpy(tmp->link_name, link_name, link_name_length);
+
+ tmp->target = calloc(target_length, sizeof(char));
+ assert(tmp->target);
+ strncpy(tmp->target, target, target_length);
+
+ tmp->x = x;
+ tmp->y = y;
+ tmp->next = NULL;
+
+ index_max++;
+
+ return index_max-1;
+}
+
+
+char * url_get_target(int index) {
+ Url_t * tmp = list;
+
+ while (index > 0 && tmp && tmp->next) {
+ tmp = tmp->next;
+ index --;
+ }
+
+ if (!index) {
+ return tmp->target;
+ } else return NULL;
+}
+
+char * url_get_name(int index) {
+ Url_t * tmp = list;
+
+ while (index > 0 && tmp && tmp->next) {
+ tmp = tmp->next;
+ index --;
+ }
+
+ if (!index) {
+ return tmp->link_name;
+ } else return NULL;
+}
+
+void url_purge() {
+ url_del_elem(list);
+ list = NULL;
+ index_max = 0;
+ init_ok = 0;
+}
+
+static void url_del_elem(Url_t *elem) {
+ if (!elem) return;
+
+ if (elem->next) {
+ url_del_elem(elem->next);
+ elem->next = NULL;
+ }
+
+ if (elem->target) {
+ free(elem->target);
+ elem->target = NULL;
+ }
+
+ if (elem->link_name) {
+ free(elem->link_name);
+ elem->link_name = NULL;
+ }
+
+ free(elem);
+}
+
+void url_dump(void) {
+ if (!list) return;
+
+ Url_t *tmp = list;
+
+ while (tmp) {
+ url_print(tmp);
+ if (tmp->next)
+ tmp = tmp->next;
+ else break;
+ }
+}
+
+static void url_print(Url_t * u) {
+ printf("Url_t @ %p\n", u);
+}
+
+int url_get_amount(void) {
+ return index_max;
+}
diff --git a/src/viewer.c b/src/viewer.c
index b9dcbf7..593d9d3 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -27,6 +27,7 @@
#include <unistd.h> // usleep
#include "viewer.h"
+#include "url.h"
// color ramp for fading from black to color
static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,
@@ -234,6 +235,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
slide = deck->slide;
while(slide) {
+
+ url_init();
+
// clear windows
werase(content);
werase(stdscr);
@@ -278,6 +282,13 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
l += (line->length / COLS) + 1;
line = line->next;
}
+
+ int i, ymax;
+ getmaxyx( content, ymax, i );
+ for (i = 0; i < url_get_amount(); i++) {
+ mvwprintw(content, ymax - url_get_amount() - 1 + i, 3,
+ "[%d] %s", i, url_get_target(i));
+ }
// make content visible
wrefresh(content);
@@ -394,6 +405,8 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
// fade out
if(fade)
fade_out(content, trans, colors, invert);
+
+ url_purge();
}
endwin();
@@ -560,8 +573,10 @@ 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;
cstack_t *stack = cstack_init();
@@ -618,7 +633,41 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
((*(i - 1) == '_' || *(i - 1) == '*') && ((i - 1) == c || *(i - 2) == ' ')) ||
*i == '\\') {
- switch(*i) {
+ if (*i == '[' && strchr(i, ']')) {
+
+ if (strchr(i, ']')[1] == '(') {// url in pandoc style
+ i++;
+ // turn higlighting and underlining on
+ if (colors)
+ wattron(window, COLOR_PAIR(CP_BLUE));
+ wattron(window, A_UNDERLINE);
+
+ start_link_name = i;
+
+ // print the content of the label
+ // the label is printed as is
+ do {
+ wprintw(window, "%c", *i);
+ i++;
+ } while (*i != ']');
+
+ length_link_name = i - 1 - start_link_name;
+
+ i++;
+ i++;
+
+ start_url = i;
+
+ while (*i != ')') i++;
+
+ url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0);
+
+ wprintw(window, "[%d]", url_num);
+ // turn highlighting and undelining off
+ wattroff(window, A_UNDERLINE);
+ wattron(window, COLOR_PAIR(CP_WHITE));
+ } else wprintw(window, "[");
+ } else switch(*i) {
// enable highlight
case '*':
if(colors)