/*
- * Copyright Neil Brown ©2016-2020 <neil@brown.name>
+ * Copyright Neil Brown ©2016-2023 <neil@brown.name>
* May be distributed under terms of GPLv2 - see file:COPYING
*
* doc-email: Present an email message as its intended content, with
* etc).
*
* The middle part has attributes set on the document which can be
- * accessed form the spacer using "multipart-prev:"
+ * accessed from the spacer using "multipart-prev:"
* - email:path identify the part in the nexted multipart struture
* e.g. "header", "body", "body,multipart/mixed:0,mulitpart/alternate:1"
- * - email:action a ':' separated list of buttons. "hide:save:view"
+ * - email:actions a ':' separated list of buttons. "hide:save:view"
* - email:content-type the MIME type of the content. "image/png"
*
*/
#include <wctype.h>
#include <ctype.h>
#include <stdio.h>
+
+#define PANE_DATA_TYPE struct email_view
+#define DOC_NEXT email_next
+#define DOC_PREV email_prev
#include "core.h"
#include "misc.h"
+struct email_view {
+ int parts;
+ char *invis;
+};
+
+#include "core-pane.h"
+
static inline bool is_orig(int p)
{
return p >= 0 && p % 3 == 0;
return p - p % 3;
}
-struct email_info {
- struct pane *email safe;
- struct pane *spacer safe;
-};
-
-static bool handle_content(struct pane *p safe, char *type, char *xfer,
+static bool handle_content(struct pane *p safe,
+ char *type, char *xfer, char *disp,
struct mark *start safe, struct mark *end safe,
struct pane *mp safe, struct pane *spacer safe,
char *path safe);
+static bool handle_rfc822(struct pane *email safe,
+ struct mark *start safe, struct mark *end safe,
+ struct pane *mp safe, struct pane *spacer safe,
+ char *path safe);
static bool cond_append(struct buf *b safe, char *txt safe, char *tag safe,
- int offset, struct mark *m safe, int *cp safe)
+ int offset, int *pos safe)
{
- char *tagf = "active-tag:email-";
+ char *tagf = "action-activate:email-";
int prelen = 1 + strlen(tagf) + strlen(tag) + 1 + 1;
int postlen = 1 + 3;
int len = prelen + strlen(txt) + postlen;
- if (offset != NO_NUMERIC && offset >= 0 && offset <= b->len + len)
+ if (offset >= 0 && offset <= b->len + len)
return False;
buf_concat(b, "<");
buf_concat(b, tagf);
buf_concat(b, tag);
buf_concat(b, ">[");
- if (*cp == 0)
- return False;
- if (*cp > 0)
- *cp -= 1;
+ *pos = b->len;
buf_concat(b, txt);
buf_concat(b, "]</>");
return True;
{
struct buf b;
int visible = 1;
+ int orig = 0;
+ int extras = 0;
struct mark *m = ci->mark;
struct mark *pm = ci->mark2;
int o = ci->num;
int cp = -1;
+ int ret_pos = 0;
char *attr;
int ret;
bool ok = True;
*/
cp = 0;
pm = mark_dup(pm);
- while (pm->seq > m->seq && !mark_same(pm, m)) {
+ while (!mark_ordered_or_same(pm, m)) {
doc_prev(ci->focus, pm);
cp += 1;
}
attr = pane_mark_attr(ci->focus, m, "email:visible");
if (attr && strcmp(attr, "none") == 0)
visible = 0;
+ if (attr && strcmp(attr, "orig") == 0)
+ orig = 1;
+ attr = attr_find(ci->home->attrs, "email:extra-headers");
+ extras = attr && *attr;
+
attr = pane_mark_attr(ci->home, m, "multipart-prev:email:actions");
if (!attr)
attr = "hide";
while (ok && attr && *attr) {
+ int pos = 0;
+ char *a = strchr(attr, ':');
+ if (a)
+ *a = 0;
if (is_attr("hide", attr))
- ok = cond_append(&b, visible ? "HIDE" : "SHOW", "1",
- o, m, &cp);
- else if (is_attr("save", attr))
- ok = cond_append(&b, "Save", "2", o, m, &cp);
- else if (is_attr("open", attr))
- ok = cond_append(&b, "Open", "3", o, m, &cp);
- attr = strchr(attr, ':');
+ ok = cond_append(&b, visible ? "HIDE" : "SHOW", attr,
+ o, &pos);
+ else if (is_attr("full", attr))
+ ok = cond_append(&b, orig ? "BRIEF" : "FULL", attr,
+ o, &pos);
+ else if (is_attr("extras", attr))
+ ok = cond_append(&b, extras ? "-" : "EXTRAS", attr,
+ o, &pos);
+ else
+ ok = cond_append(&b, attr, attr, o, &pos);
+ if (ok)
+ doc_next(ci->focus, m);
+ if (cp >= 0) {
+ cp -= 1;
+ ret_pos = pos;
+ }
+ attr = a;
if (attr)
- attr += 1;
+ *attr++ = ':';
}
/* end of line, only display if we haven't reached
* the cursor or offset
* if cp > 0, we haven't reached cursor yet, so don't stop
* if cp == 0, this is cursor pos, so stop.
*/
- if (ok && cp != 0 && ((o < 0 || o == NO_NUMERIC))) {
+ if (ok && o < 0) {
wint_t wch;
buf_concat(&b, "</>");
attr = pane_mark_attr(ci->focus, m,
buf_concat(&b, " ");
buf_concat(&b, attr);
}
+ attr = pane_mark_attr(ci->focus, m,
+ "multipart-prev:email:charset");
+ if (attr) {
+ buf_concat(&b, " ");
+ buf_concat(&b, attr);
+ }
+ attr = pane_mark_attr(ci->focus, m,
+ "multipart-prev:email:filename");
+ if (attr) {
+ buf_concat(&b, " file=");
+ buf_concat(&b, attr);
+ }
+ if (cp >= 0)
+ ret_pos = b.len;
buf_concat(&b, "\n");
+ if (cp >= 1)
+ ret_pos = b.len;
while ((wch = doc_next(ci->focus, m)) &&
wch != '\n' && wch != WEOF)
;
}
- ret = comm_call(ci->comm2, "callback:render", ci->focus, 0, NULL,
+ ret = comm_call(ci->comm2, "callback:render", ci->focus, ret_pos, NULL,
buf_final(&b));
free(b.b);
return ret;
char *c = NULL;
int p;
int ret;
+ int retlen = 0;
+ int i;
+ struct xy scale;
+ struct mark *point = ci->mark2;
+ int max_chars = ci->num;
+ int map_start;
if (!ci->mark)
return Enoarg;
p = get_part(ci->home, ci->mark);
- doc_next(ci->focus, ci->mark);
- asprintf(&c, "<image:comm:doc:multipart-%d-doc:get-bytes>\n", to_orig(p));
+ scale = pane_scale(ci->focus);
+ if (scale.x < 1)
+ scale.x = 1;
+ asprintf(&c, "<image:comm:doc:multipart-%d-doc:get-bytes,width:%d,height:%d,noupscale,map:RccRccRcc>\n",
+ to_orig(p),
+ ci->focus->w * 1000 / scale.x,
+ ci->focus->h * 750 / scale.x);
+ if (!c)
+ return Efail;
+ map_start = strlen(c) - 2 - 9;
+ if (max_chars >= 0 && max_chars < (int)strlen(c))
+ c[max_chars] = '\0';
+
+ for (i = 0; i < 9 ; i++) {
+ if (point && mark_ordered_or_same(point, ci->mark))
+ retlen = map_start + i;
+ if (max_chars >= 0 && map_start + i >= max_chars)
+ break;
+ doc_next(ci->focus, ci->mark);
+ }
+
ret = comm_call(ci->comm2, "callback:render", ci->focus,
- 0, NULL, c);
+ retlen, NULL, c);
free(c);
return ret;
}
-DEF_CMD(email_select)
+DEF_CMD(email_select_hide)
{
- /* If mark is on a button, press it... */
+ int vis = 1;
+ char *a;
struct mark *m = ci->mark;
+
+ if (!m)
+ return Enoarg;
+
+ a = pane_mark_attr(ci->focus, m, "email:visible");
+ if (a && strcmp(a, "none") == 0)
+ vis = 0;
+ call("doc:set-attr", ci->focus, 1, m, "email:visible", 0, NULL,
+ vis ? "none" : "preferred");
+ return 1;
+}
+
+DEF_CMD(email_select_full)
+{
+ int want_orig = 1;
char *a;
- int r = 0;
+ struct mark *m = ci->mark;
if (!m)
return Enoarg;
- a = pane_mark_attr(ci->focus, m, "markup:func");
- if (!a || strcmp(a, "doc:email:render-spacer") != 0)
- return Efallthrough;
- a = pane_mark_attr(ci->focus, m, "multipart-prev:email:actions");
- if (!a)
- a = "hide";
- while (r > 0 && a) {
- a = strchr(a, ':');
- if (a)
- a += 1;
- r -= 1;
- }
- if (a && is_attr("hide", a)) {
- int vis = 1;
- a = pane_mark_attr(ci->focus, m, "email:visible");
- if (a && strcmp(a, "none") == 0)
- vis = 0;
- call("doc:set-attr", ci->focus, 1, m, "email:visible", 0, NULL,
- vis ? "none" : "preferred");
+
+ a = pane_mark_attr(ci->focus, m, "email:visible");
+ if (a && strcmp(a, "orig") == 0)
+ want_orig = 0;
+ call("doc:set-attr", ci->focus, 1, m, "email:visible", 0, NULL,
+ want_orig ? "orig" : "transformed");
+ return 1;
+}
+
+DEF_CMD(email_select_extras)
+{
+ char *a = attr_find(ci->home->attrs, "email:extra-headers");
+ struct mark *m = ci->mark;
+ struct mark *point;
+ struct pane *hdrdoc, *headers;
+
+ if (!m)
+ return Enoarg;
+ if (a && *a)
+ return 1;
+ headers = call_ret(pane, "doc:multipart:get-part", ci->focus, 0);
+ hdrdoc = call_ret(pane, "doc:multipart:get-part", ci->focus, 1);
+ if (!headers || !hdrdoc)
+ return Einval;
+ point = point_new(hdrdoc);
+ if (point) {
+ char *file;
+
+ call("doc:set-ref", hdrdoc, 0, point);
+ home_call(headers, "get-header", hdrdoc, 0, point, "Message-ID", 1);
+ home_call(headers, "get-header", hdrdoc, 0, point, "In-Reply-To", 1);
+ home_call(headers, "get-header", hdrdoc, 0, point, "References", 1, NULL, "list");
+ file = pane_attr_get(headers, "filename");
+ if (file) {
+ call("doc:replace", hdrdoc, 1, point, "Filename: ",
+ 0, point, ",render:rfc822header=9");
+ call("doc:replace", hdrdoc, 1, point, file, 0, point);
+ call("doc:replace", hdrdoc, 1, point, "\n", 0, point);
+ }
}
+ mark_free(point);
+
+ attr_set_str(&ci->home->attrs, "email:extra-headers", "done");
+ call("doc:set-attr", ci->focus, 1, m, "email:visible", 0, NULL,
+ "transformed");
return 1;
}
DEF_LOOKUP_CMD(email_view_handle, email_view_map);
-static char tspecials[] = "()<>@,;:\\\"/[]?=";
+static const char tspecials[] = "()<>@,;:\\\"/[]?=";
static int lws(char c) {
return c == ' ' || c == '\t' || c == '\r' || c == '\n';
return strncasecmp(tok, match, len) == 0;
}
-static bool handle_text(struct pane *p safe, char *type, char *xfer,
+static bool handle_text(struct pane *p safe, char *type, char *xfer, char *disp,
struct mark *start safe, struct mark *end safe,
struct pane *mp safe, struct pane *spacer safe,
char *path)
{
struct pane *h, *transformed = NULL;
int need_charset = 0;
- char *charset;
+ char *charset = NULL;
char *major, *minor = NULL;
int majlen, minlen;
char *ctype = NULL;
+ char *fname = NULL;
h = call_ret(pane, "attach-crop", p, 0, start, NULL, 0, end);
if (!h)
need_charset = 1;
}
}
+ if (xfer && xlen == 4 &&
+ strncasecmp(xfer, "8bit", 6) == 0)
+ need_charset = 2; // only if not utf-8
}
- if (type && need_charset &&
- (charset = get_822_attr(type, "charset")) != NULL) {
+ if (type)
+ charset = get_822_attr(type, "charset");
+ if (need_charset && !charset && strncasecmp(type, "text/", 5) == 0)
+ /* We really do need a charset, as the doc might
+ * only provide bytes, not chars.
+ */
+ charset = "utf-8";
+ if (type && need_charset && charset != NULL &&
+ !(need_charset == 2 && strcasecmp(charset, "utf-8") == 0)) {
char *c = NULL, *cp;
struct pane *hx = NULL;
+ charset = strsave(h, charset);
asprintf(&c, "attach-charset-%s", charset);
for (cp = c; cp && *cp; cp++)
if (isupper(*cp))
if (c)
hx = call_ret(pane, c, h);
free(c);
+ if (!hx)
+ /* windows-1251 is safer than utf-8 as the latter
+ * rejects some byte sequences, and iso-8859-* has
+ * lots of control characters.
+ */
+ hx = call_ret(pane, "attach-charset-windows-1251", h);
if (hx)
h = hx;
- }
+ } else
+ charset = NULL;
+ if (type && (fname = get_822_attr(type, "name")))
+ fname = strsave(h, fname);
+ if (disp && !fname &&
+ (fname = get_822_attr(disp, "filename")))
+ fname = strsave(h, fname);
major = get_822_token(&type, &majlen);
if (major) {
minor = get_822_token(&type, &minlen);
asprintf(&ctype, "%1.*s/%1.*s", majlen, major, minlen, minor);
else
asprintf(&ctype, "%1.*s", majlen, major);
- if (ctype && strcmp(ctype, "text/html") == 0)
- transformed = call_ret(pane, "html-to-text", h);
- if (ctype && strcmp(ctype, "application/pdf") == 0)
- transformed = call_ret(pane, "pdf-to-text", h);
- if (ctype && strncmp(ctype, "image/", 6) == 0) {
+ if (ctype && strcasecmp(ctype, "text/html") == 0) {
+ transformed = call_ret(pane, "html-to-text-w3m", h, 1);
+ if (!transformed)
+ transformed = call_ret(pane, "html-to-text", h, 1);
+ }
+ if (ctype && strcasecmp(ctype, "text/calendar") == 0)
+ transformed = call_ret(pane, "ical-to-text", h, 1);
+ if (ctype && strcasecmp(ctype, "application/pdf") == 0)
+ transformed = call_ret(pane, "pdf-to-text", h, 1);
+ if (ctype && strcasecmp(ctype, "application/octet-stream") == 0 &&
+ fname && strcasestr(fname, ".pdf") != NULL)
+ transformed = call_ret(pane, "pdf-to-text", h, 1);
+ if (major && strncasecmp(major, "application", majlen) == 0 &&
+ fname && (strcasestr(fname, ".docx") != NULL ||
+ strcasestr(fname, ".doc") != NULL ||
+ strcasestr(fname, ".odt") != NULL))
+ transformed = call_ret(pane, "doc-to-text", h, 1, NULL, fname);
+
+ if (ctype && strncasecmp(ctype, "image/", 6) == 0) {
struct mark *m;
transformed = call_ret(pane, "doc:from-text", h,
- 0, NULL, NULL, 0, NULL, "\n");
+ 0, NULL, NULL, 0, NULL,
+ "");
if (transformed) {
- m = vmark_new(transformed, MARK_UNGROUPED, NULL);
+ m = mark_new(transformed);
call("doc:set-ref", transformed, 1, m);
- call("doc:set-attr", transformed, 1, m, "markup:func", 0,
- NULL, "doc:email:render-image");
+ call("doc:replace", transformed, 1, m, "01",
+ 0, m, ",markup:func=doc:email:render-image");
+ call("doc:replace", transformed, 1, m, "\n01",
+ 0, m, ",markup:not_eol=1");
+ call("doc:replace", transformed, 1, m, "\n01\n",
+ 0, m, ",markup:not_eol=1");
mark_free(m);
}
}
free(ctype);
} else
attr_set_str(&h->attrs, "email:content-type", "text/plain");
- if (major && tok_matches(major, majlen, "text"))
- attr_set_str(&transformed->attrs, "email:actions", "hide:save");
- else
- attr_set_str(&transformed->attrs, "email:actions", "hide:open");
+ attr_set_str(&transformed->attrs, "email:actions", "hide:save");
attr_set_str(&transformed->attrs, "email:path", path);
attr_set_str(&transformed->attrs, "email:which", "transformed");
+ if (charset)
+ attr_set_str(&transformed->attrs, "email:charset", charset);
+ if (fname)
+ attr_set_str(&transformed->attrs, "email:filename", fname);
+ if (disp)
+ attr_set_str(&transformed->attrs,
+ "email:content-disposition", disp);
attr_set_str(&h->attrs, "email:which", "orig");
home_call(mp, "multipart-add", h);
* Return 1 if a terminal boundary is found (trailing --)
* Return -1 if nothing is found.
*/
-#define is_lws(c) ({int __c2 = c; __c2 == ' ' || __c2 == '\t' || is_eol(__c2); })
+#define is_lws(c) ({int _c2 = c; _c2 == ' ' || _c2 == '\t' || is_eol(_c2); })
static int find_boundary(struct pane *p safe,
struct mark *start safe, struct mark *end safe,
struct mark *pos,
/* FIXME need a way to say "just display the text" */
return True;
- found_end = find_boundary (p, start, end, NULL, boundary);
+ found_end = find_boundary(p, start, end, NULL, boundary);
if (found_end != 0)
return True;
tok = get_822_token(&type, &len);
struct pane *hdr = call_ret(pane, "attach-rfc822header", p,
0, start, NULL,
0, part_end);
- char *ptype, *pxfer;
+ char *ptype, *pxfer, *pdisp;
if (!hdr)
break;
0, NULL, "cmd");
call("get-header", hdr, 0, NULL, "content-transfer-encoding",
0, NULL, "cmd");
+ call("get-header", hdr, 0, NULL, "content-disposition",
+ 0, NULL, "cmd");
ptype = attr_find(hdr->attrs, "rfc822-content-type");
pxfer = attr_find(hdr->attrs,
"rfc822-content-transfer-encoding");
+ pdisp = attr_find(hdr->attrs,
+ "rfc822-content-disposition");
pane_close(hdr);
len, tok, partnum);
partnum++;
- handle_content(p, ptype, pxfer, start, part_end, mp, spacer,
- newpath ?:"");
+ if (part_end->seq < start->seq)
+ mark_to_mark(part_end, start);
+ handle_content(p, ptype, pxfer, pdisp, start, part_end, mp,
+ spacer, newpath ?:"");
free(newpath);
mark_to_mark(start, pos);
}
return True;
}
-static bool handle_content(struct pane *p safe, char *type, char *xfer,
+static bool handle_content(struct pane *p safe,
+ char *type, char *xfer, char *disp,
struct mark *start safe, struct mark *end safe,
struct pane *mp safe, struct pane *spacer safe,
char *path safe)
char *major, *minor = NULL;
int mjlen, mnlen;
+ if (mark_ordered_or_same(end, start))
+ return True;
+
if (!type)
type = "text/plain";
hdr = type;
if (minor && minor[0] == '/')
minor = get_822_token(&hdr, &mnlen);
}
- if (major == NULL ||
- tok_matches(major, mjlen, "text"))
- return handle_text(p, type, xfer, start, end,
- mp, spacer, path);
if (tok_matches(major, mjlen, "multipart"))
return handle_multipart(p, type, start, end, mp, spacer, path);
+ if (tok_matches(major, mjlen, "message") && tok_matches(minor, mnlen, "rfc822"))
+ return handle_rfc822(p, start, end, mp, spacer, path);
+
+ if (tok_matches(major, mjlen, "text") && tok_matches(minor, mnlen, "rfc822-headers"))
+ return handle_rfc822(p, start, end, mp, spacer, path);
+
+ if (major == NULL ||
+ tok_matches(major, mjlen, "text"))
+ return handle_text(p, type, xfer, disp, start, end,
+ mp, spacer, path);
+
/* default to plain text until we get a better default */
- return handle_text(p, type, xfer, start, end, mp, spacer, path);
+ return handle_text(p, type, xfer, disp, start, end, mp, spacer, path);
}
-DEF_CMD(open_email)
+static bool handle_rfc822(struct pane *email safe,
+ struct mark *start safe, struct mark *end safe,
+ struct pane *mp safe, struct pane *spacer safe,
+ char *path safe)
{
- int fd;
- struct email_info *ei;
- struct mark *start, *end;
- struct pane *p, *h2;
+ struct pane *h2, *h3;
+ struct pane *hdrdoc = NULL;
+ struct mark *point = NULL;
+ struct mark *hdr_start;
+ char *xfer = NULL, *type = NULL, *disp = NULL;
char *mime;
- char *xfer = NULL, *type = NULL;
- struct pane *hdrdoc;
- struct mark *point;
+ char *newpath = NULL;
- if (ci->str == NULL ||
- strncmp(ci->str, "email:", 6) != 0)
- return Efallthrough;
- fd = open(ci->str+6, O_RDONLY);
- p = call_ret(pane, "doc:open", ci->focus, fd, NULL, ci->str + 6, 1);
- if (!p)
- return Efallthrough;
- start = vmark_new(p, MARK_UNGROUPED, NULL);
- if (!start)
- return Efallthrough;
- end = mark_dup(start);
- call("doc:set-ref", p, 0, end);
-
- alloc(ei, pane);
- ei->email = p;
- h2 = call_ret(pane, "attach-rfc822header", p, 0, start, NULL, 0, end);
+ hdr_start = mark_dup(start);
+ h2 = call_ret(pane, "attach-rfc822header", email, 0, start, NULL, 0, end);
if (!h2)
goto out;
attr_set_str(&h2->attrs, "email:which", "orig");
- p = call_ret(pane, "doc:from-text", p, 0, NULL, NULL, 0, NULL,
- "0123456789\n");
- if (!p) {
- pane_close(h2);
- goto out;
- }
- attr_set_str(&p->attrs, "email:which", "spacer");
- ei->spacer = p;
- point = vmark_new(p, MARK_POINT, NULL);
- call("doc:set-ref", p, 1, point);
- call("doc:set-attr", p, 1, point, "markup:func", 0,
- NULL, "doc:email:render-spacer");
- mark_free(point);
- hdrdoc = call_ret(pane, "attach-doc-text", ci->focus);
+ hdrdoc = call_ret(pane, "doc:from-text", email, 0, NULL, NULL, 0, NULL, "");
if (!hdrdoc)
goto out;
call("doc:set:autoclose", hdrdoc, 1);
- point = vmark_new(hdrdoc, MARK_POINT, NULL);
+ point = point_new(hdrdoc);
if (!point)
goto out;
/* copy some headers to the header temp document */
- home_call(h2, "get-header", hdrdoc, 0, point, "From");
- home_call(h2, "get-header", hdrdoc, 0, point, "Date");
- home_call(h2, "get-header", hdrdoc, 0, point, "Subject", 0, NULL, "text");
- home_call(h2, "get-header", hdrdoc, 0, point, "To", 0, NULL, "list");
- home_call(h2, "get-header", hdrdoc, 0, point, "Cc", 0, NULL, "list");
+ home_call(h2, "get-header", hdrdoc, 0, point, "From", 1, NULL, "list");
+ home_call(h2, "get-header", hdrdoc, 0, point, "Date", 1);
+ home_call(h2, "get-header", hdrdoc, 0, point, "Subject", 1, NULL, "text");
+ home_call(h2, "get-header", hdrdoc, 0, point, "To", 1, NULL, "list");
+ home_call(h2, "get-header", hdrdoc, 0, point, "Cc", 1, NULL, "list");
+ home_call(h2, "get-header", hdrdoc, 0, point, "Reply-To", 1, NULL, "list");
/* copy some headers into attributes for later analysis */
call("get-header", h2, 0, NULL, "MIME-Version", 0, NULL, "cmd");
call("get-header", h2, 0, NULL, "content-type", 0, NULL, "cmd");
call("get-header", h2, 0, NULL, "content-transfer-encoding",
0, NULL, "cmd");
+ call("get-header", h2, 0, NULL, "content-disposition",
+ 0, NULL, "cmd");
mime = attr_find(h2->attrs, "rfc822-mime-version");
if (mime)
mime = get_822_word(mime);
- if (mime && strcmp(mime, "1.0") == 0) {
+ /* Some email doesn't contain MIME-Type, but is still mime... */
+ if (!mime || strcmp(mime, "1.0") == 0) {
type = attr_find(h2->attrs, "rfc822-content-type");
xfer = attr_find(h2->attrs, "rfc822-content-transfer-encoding");
+ disp = attr_find(h2->attrs, "rfc822-content-disposition");
}
- p = call_ret(pane, "attach-doc-multipart", ci->home);
- if (!p)
- goto out;
- call("doc:set:autoclose", p, 1);
- attr_set_str(&hdrdoc->attrs, "email:actions", "hide");
+ newpath = NULL;
+ asprintf(&newpath, "%s%sheaders", path, path[0] ? ",":"");
+ attr_set_str(&hdrdoc->attrs, "email:actions", "hide:extras:full");
attr_set_str(&hdrdoc->attrs, "email:which", "transformed");
attr_set_str(&hdrdoc->attrs, "email:content-type", "text/rfc822-headers");
- attr_set_str(&hdrdoc->attrs, "email:path", "headers");
+ attr_set_str(&hdrdoc->attrs, "email:path", newpath);
attr_set_str(&hdrdoc->attrs, "email:is_transformed", "yes");
- home_call(p, "multipart-add", h2);
- home_call(p, "multipart-add", hdrdoc);
- home_call(p, "multipart-add", ei->spacer);
+ h3 = call_ret(pane, "attach-crop", h2, 0, hdr_start, NULL, 0, start);
+ if (!h3)
+ h3 = h2;
+ home_call(mp, "multipart-add", h3);
+ home_call(mp, "multipart-add", hdrdoc);
+ home_call(mp, "multipart-add", spacer);
+ free(newpath);
- if (!handle_content(ei->email, type, xfer, start, end,
- p, ei->spacer, "body"))
+ newpath = NULL;
+ asprintf(&newpath, "%s%sbody", path, path[0] ? ",":"");
+ if (!handle_content(email, type, xfer, disp, start, end,
+ mp, spacer, newpath?:""))
goto out;
+ free(newpath);
+ return True;
+out:
+ free(newpath);
+ if (h2)
+ pane_close(h2);
+ if (point)
+ mark_free(point);
+ if (hdrdoc)
+ pane_close(hdrdoc);
+ return False;
+}
- mark_free(start);
- mark_free(end);
+DEF_CMD(open_email)
+{
+ int fd;
+ struct pane *email = NULL;
+ struct pane *spacer = NULL;
+ struct mark *start, *end;
+ struct pane *p;
+ struct mark *point;
+
+ if (ci->str == NULL || !strstarts(ci->str, "email:"))
+ return Efallthrough;
+ fd = open(ci->str+6, O_RDONLY);
+ if (fd < 0)
+ return Efallthrough;
+ p = call_ret(pane, "doc:open", ci->focus, fd, NULL, ci->str + 6, 1);
+ close(fd);
+ if (!p)
+ return Efallthrough;
+ start = mark_new(p);
+ if (!start) {
+ pane_close(p);
+ return Efallthrough;
+ }
+ end = mark_dup(start);
+ call("doc:set-ref", p, 0, end);
+
+ call("doc:set:autoclose", p, 1);
+ email = p;
+
+ /* create spacer doc to be attached between each part */
+ p = call_ret(pane, "doc:from-text", p, 0, NULL, NULL, 0, NULL,
+ "0123456789\n");
+ if (!p)
+ goto out;
+
+ attr_set_str(&p->attrs, "email:which", "spacer");
+ call("doc:set:autoclose", p, 1);
+ spacer = p;
+ point = point_new(p);
+ call("doc:set-ref", p, 1, point);
+ call("doc:set-attr", p, 1, point, "markup:func", 0,
+ NULL, "doc:email:render-spacer");
+ mark_free(point);
+
+ /* Create the multipart in which all the parts are assembled. */
+ p = call_ret(pane, "attach-doc-multipart", ci->home);
+ if (!p)
+ goto out;
+ call("doc:set:autoclose", p, 1);
attr_set_str(&p->attrs, "render-default", "text");
attr_set_str(&p->attrs, "filename", ci->str+6);
attr_set_str(&p->attrs, "doc-type", "email");
+
+ if (!handle_rfc822(email, start, end, p, spacer, ""))
+ goto out;
+ mark_free(start);
+ mark_free(end);
+
return comm_call(ci->comm2, "callback:attach", p);
out:
mark_free(start);
mark_free(end);
- free(ei);
- // FIXME free stuff
+ if (spacer)
+ pane_close(spacer);
+ pane_close(email);
return Efail;
}
-struct email_view {
- int parts;
- char *invis safe;
-};
-
-DEF_CMD(email_view_free)
+DEF_CMD_CLOSED(email_view_close)
{
struct email_view *evi = ci->home->data;
free(evi->invis);
- unalloc(evi, pane);
+ evi->invis = NULL;
return 1;
}
return cnt;
}
-DEF_CMD(email_step)
+static inline wint_t email_next(struct pane *p safe, struct mark *m safe,
+ struct doc_ref *r safe, bool bytes)
{
- struct pane *p = ci->home;
struct email_view *evi = p->data;
+ bool move = r == &m->ref;
wint_t ret;
int n = -1;
- if (!ci->mark)
- return Enoarg;
- if (ci->num) {
- ret = home_call(p->parent, ci->key, ci->focus,
- ci->num, ci->mark, evi->invis,
- ci->num2);
- n = get_part(p->parent, ci->mark);
- if (ci->num2 && is_spacer(n)) {
- /* Moving in a spacer, If after valid buttons,
- * move to end
- */
- wint_t c;
- unsigned int buttons;
- buttons = count_buttons(p, ci->mark);
- while ((c = doc_following(p->parent, ci->mark)) != WEOF
- && iswdigit(c) && (c - '0') >= buttons)
- doc_next(p->parent, ci->mark);
- }
- } else {
- ret = home_call(p->parent, ci->key, ci->focus,
- ci->num, ci->mark, evi->invis, 1);
- n = get_part(p->parent, ci->mark);
- if (is_spacer(n) && ci->num2 &&
- ret != CHAR_RET(WEOF) && iswdigit(ret & 0x1fffff)) {
- /* Just stepped back over the 9 at the end of a spacer,
- * Maybe step further if there aren't 10 buttons.
- */
- unsigned int buttons = count_buttons(p, ci->mark);
- wint_t c = ret & 0x1fffff;
+ ret = home_call(p->parent, "doc:char", p,
+ move ? 1 : 0,
+ m, evi->invis,
+ move ? 0 : 1);
+ n = get_part(p->parent, m);
+ if (move && is_spacer(n)) {
+ /* Moving in a spacer. IF after valid buttons,
+ * move to end.
+ */
+ wint_t c;
+ unsigned int buttons = count_buttons(p, m);
+ while ((c = doc_following(p->parent, m)) != WEOF &&
+ iswdigit(c) && (c-'0') >= buttons)
+ doc_next(p->parent, m);
+ }
+ return ret;
+}
- while (c != WEOF && iswdigit(c) && c - '0' >= buttons)
- c = doc_prev(p->parent, ci->mark);
- ret = CHAR_RET(c);
- }
+static inline wint_t email_prev(struct pane *p safe, struct mark *m safe,
+ struct doc_ref *r safe, bool bytes)
+{
+ struct email_view *evi = p->data;
+ bool move = r == &m->ref;
+ wint_t ret;
+ int n = -1;
+
+ ret = home_call(p->parent, "doc:char", p,
+ move ? -1 : 0,
+ m, evi->invis,
+ move ? 0 : -1);
+ n = get_part(p->parent, m);
+ if (is_spacer(n) && move &&
+ ret != CHAR_RET(WEOF) && iswdigit(ret & 0x1fffff)) {
+ /* Just stepped back over the 9 at the end of a spacer,
+ * Maybe step further if there aren't 10 buttons.
+ */
+ unsigned int buttons = count_buttons(p, m);
+ wint_t c = ret & 0x1fffff;
+
+ while (c != WEOF && iswdigit(c) && c - '0' >= buttons)
+ c = doc_prev(p->parent, m);
+ ret = c;
}
return ret;
}
+DEF_CMD(email_char)
+{
+ return do_char_byte(ci);
+}
+
+DEF_CMD(email_content)
+{
+ /* Call the multipart doc:content telling it
+ * what is invisible, marking all spacers as invisible
+ */
+ struct pane *p = ci->home;
+ struct email_view *evi = p->data;
+ char *invis2 = strsave(p, evi->invis);
+ int i;
+
+ for (i = 0; invis2 && invis2[i]; i++)
+ if (is_spacer(i))
+ invis2[i] = 'i';
+ return home_call(p->parent, ci->key, p,
+ ci->num, ci->mark, invis2,
+ ci->num2, ci->mark2, ci->str2,
+ ci->x, ci->y, ci->comm2);
+}
+
DEF_CMD(email_set_ref)
{
struct pane *p = ci->home;
if (!ci->mark)
return Enoarg;
- home_call(p->parent, ci->key, ci->focus, ci->num, ci->mark, evi->invis);
+ home_call_comm(p->parent, ci->key, ci->focus, ci->comm2,
+ ci->num, ci->mark, evi->invis);
+ return 1;
+}
+
+DEF_CMD(email_step_part)
+{
+ struct pane *p = ci->home;
+ struct email_view *evi = p->data;
+
+ if (!ci->mark)
+ return Enoarg;
+ home_call(p->parent, "doc:step-part", ci->focus, ci->num, ci->mark, evi->invis);
return 1;
}
p = to_orig(p);
if (p < 0 || p >= evi->parts)
v = "none";
+ else if (!evi->invis)
+ v = "none";
else if (evi->invis[p] != 'i')
v = "orig";
else if (evi->invis[p+1] != 'i')
return comm_call(ci->comm2, "callback", ci->focus, 0, ci->mark,
v, 0, NULL, ci->str);
}
+ if (strcmp(ci->str, "email:image") == 0) {
+ char im[100];
+
+ p = get_part(ci->home->parent, ci->mark);
+ sprintf(im, "comm:doc:multipart-%d-doc:get-bytes", to_orig(p));
+ return comm_call(ci->comm2, "cb", ci->focus, 0, ci->mark,
+ im, 0, NULL, ci->str);
+ }
return Efallthrough;
}
p = get_part(ci->home->parent, ci->mark);
/* only parts can be invisible, not separators */
p = to_orig(p);
- if (p < 0 || p >= evi->parts)
+ if (p < 0 || p >= evi->parts || !evi->invis)
return Efail;
m1 = mark_dup(ci->mark);
mark_free(m1);
mark_free(m2);
+ if (w && strcmp(w, "transformed") == 0) {
+ /* If the transformation was delayed, tell it
+ * to start now.
+ */
+ struct pane *part =
+ call_ret(pane, "doc:multipart:get-part",
+ ci->home->parent, p+1);
+ if (part)
+ call("doc:notify:convert-now", part);
+ }
+
return 1;
}
return Efallthrough;
DEF_CMD(attach_email_view)
{
- struct pane *p;
+ struct pane *p, *p2;
struct email_view *evi;
struct mark *m;
- int n;
+ int n, i;
- m = vmark_new(ci->focus, MARK_UNGROUPED, NULL);
+ m = mark_new(ci->focus);
if (!m)
return Efail;
call("doc:set-ref", ci->focus, 0, m);
if (n <= 0 || n > 1000 )
return Einval;
- alloc(evi, pane);
+ p = pane_register(ci->focus, 0, &email_view_handle.c);
+ if (!p)
+ return Efail;
+ evi = p->data;
evi->parts = n;
evi->invis = calloc(n+1, sizeof(char));
- memset(evi->invis, 'v', n);
- p = pane_register(ci->focus, 0, &email_view_handle.c, evi);
- if (!p) {
- free(evi);
- return Efail;
+ for (i = 0; i < n; i++) {
+ if (is_spacer(i))
+ /* Spacers must be visible */
+ evi->invis[i] = 'v';
+ else if (is_orig(i) && i < 2*3)
+ /* Headers and first part can be visible */
+ evi->invis[i] = 'v';
+ else
+ /* Everything else default to invisible */
+ evi->invis[i] = 'i';
}
+ p2 = call_ret(pane, "attach-line-count", p);
+ if (p2)
+ p = p2;
attr_set_str(&p->attrs, "render-hide-CR", "yes");
return comm_call(ci->comm2, "callback:attach", p);
}
static void email_init_map(void)
{
email_view_map = key_alloc();
- key_add(email_view_map, "Free", &email_view_free);
- key_add(email_view_map, "doc:step", &email_step);
+ key_add(email_view_map, "Close", &email_view_close);
+ key_add(email_view_map, "doc:char", &email_char);
+ key_add(email_view_map, "doc:content", &email_content);
+ key_add(email_view_map, "doc:content-bytes", &email_content);
key_add(email_view_map, "doc:set-ref", &email_set_ref);
+ key_add(email_view_map, "doc:get-boundary", &email_set_ref);
+ key_add(email_view_map, "doc:email-step-part", &email_step_part);
key_add(email_view_map, "doc:set-attr", &email_view_set_attr);
key_add(email_view_map, "doc:get-attr", &email_view_get_attr);
key_add(email_view_map, "doc:email:render-spacer", &email_spacer);
key_add(email_view_map, "doc:email:render-image", &email_image);
- key_add(email_view_map, "doc:email:select", &email_select);
+ key_add(email_view_map, "email:select:hide", &email_select_hide);
+ key_add(email_view_map, "email:select:full", &email_select_full);
+ key_add(email_view_map, "email:select:extras", &email_select_extras);
}
void edlib_init(struct pane *ed safe)
"open-doc-email");
call_comm("global-set-command", ed, &attach_email_view, 0, NULL,
"attach-email-view");
-
- call("global-load-module", ed, 0, NULL, "lib-html-to-text");
- call("global-load-module", ed, 0, NULL, "lib-pdf-to-text");
}
git / edlib.git / blobdiff