nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add number for links with markup in body, handle them separately from markup removal

Browse Source 
Conflicts:
	notification.c
This commit is contained in:
progandy 2013-02-27 17:00:09 +01:00 committed by Sascha Kruse
parent c711606640
commit 4a7e174fe8
1 changed files with 60 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
notification.c
View File

@ -187,28 +187,71 @@ char *notification_fix_markup(char *str)
str = string_replace_all("</u>", "", str); str = string_replace_all("</u>", "", str);
str = string_replace_all("</a>", "", str); str = string_replace_all("</a>", "", str);
start = strstr(str, "<a href"); while ((start = strstr(str, "<a href")) != NULL) {
if (start != NULL) { end = strstr(start, ">");
end = strstr(str, ">");
if (end != NULL) { if (end != NULL) {
replace_buf = strndup(start, end - start + 1); replace_buf = strndup(start, end - start + 1);
str = string_replace(replace_buf, "", str); str = string_replace(replace_buf, "", str);
free(replace_buf); free(replace_buf);
} else {
break;
} }
} }
start = strstr(str, "<img src");
if (start != NULL) { while ((start = strstr(str, "<img src")) != NULL) {
end = strstr(str, "/>"); end = strstr(start, "/>");
if (end != NULL) { if (end != NULL) {
replace_buf = strndup(start, end - start + 2); replace_buf = strndup(start, end - start + 2);
str = string_replace(replace_buf, "", str); str = string_replace(replace_buf, "", str);
free(replace_buf); free(replace_buf);
} else {
break;
} }
} }
return str; return str;
} }
char *notification_extract_markup_urls(char **str_ptr) {
char *start, *end, *replace_buf, *str, *urls = NULL, *url, *index_buf;
int linkno = 1;
str = *str_ptr;
while ((start = strstr(str, "<a href")) != NULL) {
end = strstr(start, ">");
if (end != NULL) {
replace_buf = strndup(start, end - start + 1);
url = extract_urls(replace_buf);
if (url != NULL) {
str = string_replace(replace_buf, "[", str);
index_buf = g_strdup_printf("[#%d]", linkno++);
if (urls == NULL) {
urls = g_strconcat(index_buf, " ", url, NULL);
} else {
char *tmp = urls;
urls = g_strconcat(tmp, "\n", index_buf, " ", url, NULL);
free(tmp);
}
index_buf[0] = ' ';
str = string_replace("</a>", index_buf, str);
free(index_buf);
free(url);
} else {
str = string_replace(replace_buf, "", str);
str = string_replace("</a>", "", str);
}
free(replace_buf);
} else {
break;
}
}
*str_ptr = str;
return urls;
}
/* /*
* Initialize the given notification and add it to * Initialize the given notification and add it to
* the queue. Replace notification with id if id > 0. * the queue. Replace notification with id if id > 0.
@ -236,6 +279,8 @@ int notification_init(notification * n, int id)
rule_apply_all(n); rule_apply_all(n);
n->urls = notification_extract_markup_urls(&(n->body));
n->msg = string_replace("%a", n->appname, g_strdup(n->format)); n->msg = string_replace("%a", n->appname, g_strdup(n->format));
n->msg = string_replace("%s", n->summary, n->msg); n->msg = string_replace("%s", n->summary, n->msg);
if (n->icon) { if (n->icon) {
@ -326,7 +371,15 @@ int notification_init(notification * n, int id)
char *tmp = g_strconcat(n->summary, " ", n->body, NULL); char *tmp = g_strconcat(n->summary, " ", n->body, NULL);
n->urls = extract_urls(tmp); char *tmp_urls = extract_urls(tmp);
if (tmp_urls != NULL) {
if (n->urls != NULL) {
n->urls = string_append(n->urls, tmp_urls, "\n");
free(tmp_urls);
} else {
n->urls = tmp_urls;
}
}
if (n->actions) { if (n->actions) {
n->actions->dmenu_str = NULL; n->actions->dmenu_str = NULL;