use a img:// prefix rather than IMG:
the old one is still available for compatibility reasons of course
This commit is contained in:
parent
8da0dba45b
commit
c71743a326
|
@ -156,11 +156,13 @@ int parsemarkup(int index) {
|
||||||
|
|
||||||
// parse image markup
|
// parse image markup
|
||||||
#if USEIMAGE
|
#if USEIMAGE
|
||||||
if(!strncmp("IMG:", items[index].text, strlen("IMG:"))) {
|
if (!strncmp("IMG:", items[index].text, strlen("IMG:")) || !strncmp("img://", items[index].text, strlen("img://"))) {
|
||||||
if(!(items[index].image = malloc(strlen(items[index].text)+1)))
|
if(!(items[index].image = malloc(strlen(items[index].text)+1)))
|
||||||
fprintf(stderr, "spmenu: cannot malloc %lu bytes\n", strlen(items[index].text));
|
fprintf(stderr, "spmenu: cannot malloc %lu bytes\n", strlen(items[index].text));
|
||||||
if(sscanf(items[index].text, "IMG:%[^\t]", items[index].image)) {
|
if (sscanf(items[index].text, "IMG:%[^\t]", items[index].image)) {
|
||||||
items[index].text += strlen("IMG:")+strlen(items[index].image)+1;
|
items[index].text += strlen("IMG:")+strlen(items[index].image)+1;
|
||||||
|
} else if (sscanf(items[index].text, "img://%[^\t]", items[index].image)) {
|
||||||
|
items[index].text += strlen("img://")+strlen(items[index].image)+1;
|
||||||
} else {
|
} else {
|
||||||
free(items[index].image);
|
free(items[index].image);
|
||||||
items[index].image = NULL;
|
items[index].image = NULL;
|
||||||
|
@ -180,11 +182,13 @@ int parsemarkup(int index) {
|
||||||
#else // remove the data, just for convenience
|
#else // remove the data, just for convenience
|
||||||
char *data;
|
char *data;
|
||||||
|
|
||||||
if(!strncmp("IMG:", items[index].text, strlen("IMG:"))) {
|
if (!strncmp("IMG:", items[index].text, strlen("IMG:")) || !strncmp("img://", items[index].text, strlen("img://"))) {
|
||||||
if(!(data = malloc(strlen(items[index].text)+1)))
|
if(!(data = malloc(strlen(items[index].text)+1)))
|
||||||
fprintf(stderr, "spmenu: cannot malloc %lu bytes\n", strlen(items[index].text));
|
fprintf(stderr, "spmenu: cannot malloc %lu bytes\n", strlen(items[index].text));
|
||||||
if(sscanf(items[index].text, "IMG:%[^\t]", data)) {
|
if(sscanf(items[index].text, "IMG:%[^\t]", data)) {
|
||||||
items[index].text += strlen("IMG:")+strlen(data)+1;
|
items[index].text += strlen("IMG:")+strlen(data)+1;
|
||||||
|
} else if(sscanf(items[index].text, "img://%[^\t]", data)) {
|
||||||
|
items[index].text += strlen("img://")+strlen(data)+1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue