* 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:actions a ':' separated list of buttons. "hide:save:view"
#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;
char *path safe);
static bool cond_append(struct buf *b safe, char *txt safe, char *tag safe,
- int offset, 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 mark *pm = ci->mark2;
int o = ci->num;
int cp = -1;
+ int ret_pos = 0;
char *attr;
int ret;
bool ok = True;
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", attr,
- o, &cp);
+ o, &pos);
else if (is_attr("full", attr))
ok = cond_append(&b, orig ? "BRIEF" : "FULL", attr,
- o, &cp);
+ o, &pos);
else if (is_attr("extras", attr))
ok = cond_append(&b, extras ? "-" : "EXTRAS", attr,
- o, &cp);
+ o, &pos);
else
- ok = cond_append(&b, attr, attr, o, &cp);
+ 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++ = ':';
* 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, " 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;
c[max_chars] = '\0';
for (i = 0; i < 9 ; i++) {
- if (point && mark_ordered_or_same(point, ci->mark)) {
- c[map_start + i] = 0;
- break;
- }
+ 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)
-{
- /* If mark is on a button, press it... */
- struct mark *m = ci->mark;
- char *a, *e, *cmd = NULL;
- wint_t ch;
- int p;
- int b;
-
- if (!m)
- return Enoarg;
- p = get_part(ci->home, m);
- if (!is_spacer(p))
- return Efallthrough;
- ch = doc_following(ci->home, m);
- if (ch == WEOF || !isdigit(ch))
- return 1;
- b = ch - '0';
- a = pane_mark_attr(ci->focus, m, "multipart-prev:email:actions");
- if (!a)
- a = "hide";
- while (b > 0 && a) {
- a = strchr(a, ':');
- if (a)
- a += 1;
- b -= 1;
- }
- if (!a)
- return 1;
- e = strchr(a, ':');
- if (!e)
- e = a + strlen(a);
- asprintf(&cmd, "email:select:%.*s", (int)(e-a), a);
- if (!cmd)
- return Efail;
- return call(cmd, ci->focus, 0, m);
-}
-
DEF_CMD(email_select_hide)
{
int vis = 1;
hdrdoc = call_ret(pane, "doc:multipart:get-part", ci->focus, 1);
if (!headers || !hdrdoc)
return Einval;
- point = vmark_new(hdrdoc, MARK_POINT, NULL);
+ point = point_new(hdrdoc);
if (point) {
char *file;
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';
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:replace", transformed, 1, m, "01",
0, m, ",markup:func=doc:email:render-image");
* 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,
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", 1);
+ 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");
struct pane *p;
struct mark *point;
- if (ci->str == NULL ||
- strncmp(ci->str, "email:", 6) != 0)
+ if (ci->str == NULL || !strstarts(ci->str, "email:"))
return Efallthrough;
fd = open(ci->str+6, O_RDONLY);
if (fd < 0)
close(fd);
if (!p)
return Efallthrough;
- start = vmark_new(p, MARK_UNGROUPED, NULL);
+ start = mark_new(p);
if (!start) {
pane_close(p);
return Efallthrough;
attr_set_str(&p->attrs, "email:which", "spacer");
call("doc:set:autoclose", p, 1);
spacer = p;
- point = vmark_new(p, MARK_POINT, NULL);
+ 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");
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;
}
-static int email_step(struct pane *home safe, struct mark *mark safe,
- int forward, int move)
+static inline wint_t email_next(struct pane *p safe, struct mark *m safe,
+ struct doc_ref *r safe, bool bytes)
{
- struct pane *p = home;
struct email_view *evi = p->data;
+ bool move = r == &m->ref;
wint_t ret;
int n = -1;
- if (forward) {
- ret = home_call(p->parent, "doc:char", home,
- move ? 1 : 0,
- mark, evi->invis,
- move ? 0 : 1);
- n = get_part(p->parent, mark);
- if (move && is_spacer(n)) {
- /* Moving in a spacer, If after valid buttons,
- * move to end
- */
- wint_t c;
- unsigned int buttons;
- buttons = count_buttons(p, mark);
- while ((c = doc_following(p->parent, mark)) != WEOF
- && iswdigit(c) && (c - '0') >= buttons)
- doc_next(p->parent, mark);
- }
- } else {
- ret = home_call(p->parent, "doc:char", home,
- move ? -1 : 0,
- mark, evi->invis,
- move ? 0 : -1);
- n = get_part(p->parent, mark);
- 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, mark);
- wint_t c = ret & 0x1fffff;
-
- while (c != WEOF && iswdigit(c) && c - '0' >= buttons)
- c = doc_prev(p->parent, mark);
- ret = CHAR_RET(c);
- }
+ 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;
}
-DEF_CMD(email_char)
+static inline wint_t email_prev(struct pane *p safe, struct mark *m safe,
+ struct doc_ref *r safe, bool bytes)
{
- struct mark *m = ci->mark;
- struct mark *end = ci->mark2;
- int steps = ci->num;
- int forward = steps > 0;
- int ret = Einval;
+ struct email_view *evi = p->data;
+ bool move = r == &m->ref;
+ wint_t ret;
+ int n = -1;
- if (!m)
- return Enoarg;
- if (end && mark_same(m, end))
- return 1;
- if (end && (end->seq < m->seq) != (steps < 0))
- /* Can never cross 'end' */
- return Einval;
- while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
- ret = email_step(ci->home, m, forward, 1);
- steps -= forward*2 - 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;
}
- if (end)
- return 1 + (forward ? ci->num - steps : steps - ci->num);
- if (ret == CHAR_RET(WEOF) || ci->num2 == 0)
- return ret;
- if (ci->num &&(ci->num2 < 0) == forward)
- return ret;
- /* Want the 'next' char */
- return email_step(ci->home, m, ci->num2 > 0, 0);
+ return ret;
+}
+
+DEF_CMD(email_char)
+{
+ return do_char_byte(ci);
}
DEF_CMD(email_content)
{
- /* Call the multipart doc:content telling in
+ /* Call the multipart doc:content telling it
* what is invisible, marking all spacers as invisible
*/
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;
}
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);
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, "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);
"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-html-w3m");
-
- call("global-load-module", ed, 0, NULL, "lib-pdf-to-text");
- call("global-load-module", ed, 0, NULL, "lib-doc-to-text");
- call("global-load-module", ed, 0, NULL, "lib-ical-to-text");
}
git / edlib.git / blobdiff