#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include "sort.h"
#include "charset.h"
#include "buffy.h"
-#include "remailer.h"
-
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
#define CHECK_COUNT \
if (idxlen == 0) { \
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
- HDR_MIX,
HDR_CRYPT,
HDR_CRYPTINFO,
-#ifdef USE_NNTP
- HDR_NEWSGROUPS,
- HDR_FOLLOWUPTO,
- HDR_XCOMMENTTO,
-#endif
-
-#ifndef USE_NNTP
- HDR_ATTACH = (HDR_FCC + 5) /* where to start printing the attachments */
-#else
HDR_ATTACH = (HDR_FCC + 7)
-#endif
};
#define HDR_XOFFSET 14
#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */
-#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-#define W (COLS - HDR_XOFFSET - SW)
+#define W (getmaxx(main_w) - HDR_XOFFSET)
static const char *Prompts[] = {
"From: ",
"Subject: ",
"Reply-To: ",
"Fcc: ",
-#ifdef USE_NNTP
- "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
-#endif
};
-static struct mapping_t ComposeHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"To", OP_COMPOSE_EDIT_TO},
- {"CC", OP_COMPOSE_EDIT_CC},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t ComposeNewsHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"Newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-#endif
-
-
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
- m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
- ((ATTACHPTR **)menu->data)[num],
- M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+ m_strformat(b, blen, getmaxx(main_w), AttachFormat, mutt_attach_fmt,
+ ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
}
static void redraw_crypt_lines (HEADER * msg)
int off = 0;
if (!msg->security)
- mvaddstr (HDR_CRYPT, SW, " Security: ");
+ mvwaddstr (main_w, HDR_CRYPT, 0, " Security: ");
else if (msg->security & APPLICATION_SMIME)
- mvaddstr (HDR_CRYPT, SW, " S/MIME: ");
+ mvwaddstr (main_w, HDR_CRYPT, 0, " S/MIME: ");
else if (msg->security & APPLICATION_PGP)
- mvaddstr (HDR_CRYPT, SW, " PGP: ");
+ mvwaddstr (main_w, HDR_CRYPT, 0, " PGP: ");
if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
- addstr (_("Sign, Encrypt"));
+ waddstr (main_w, _("Sign, Encrypt"));
else if (msg->security & ENCRYPT)
- addstr (_("Encrypt"));
+ waddstr (main_w, _("Encrypt"));
else if (msg->security & SIGN)
- addstr (_("Sign"));
+ waddstr (main_w, _("Sign"));
else
- addstr (_("Clear"));
+ waddstr (main_w, _("Clear"));
if ((msg->security & APPLICATION_PGP)
&& (msg->security & (ENCRYPT | SIGN))) {
if ((msg->security & INLINE))
- addstr (_(" (inline)"));
+ waddstr (main_w, _(" (inline)"));
else
- addstr (_(" (PGP/MIME)"));
+ waddstr (main_w, _(" (PGP/MIME)"));
}
- clrtoeol ();
+ wclrtoeol (main_w);
- move (HDR_CRYPTINFO, SW);
- clrtoeol ();
+ wmove (main_w, HDR_CRYPTINFO, 0);
+ wclrtoeol (main_w);
if (msg->security & APPLICATION_PGP && msg->security & SIGN)
- printw ("%s%s", _(" sign as: "),
+ wprintw (main_w, "%s%s", _(" sign as: "),
PgpSignAs ? PgpSignAs : _("<default>"));
if (msg->security & APPLICATION_SMIME && msg->security & SIGN) {
- printw ("%s%s", _(" sign as: "),
+ wprintw (main_w, "%s%s", _(" sign as: "),
SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
}
if ((msg->security & APPLICATION_SMIME)
&& (msg->security & ENCRYPT)
&& SmimeCryptAlg && *SmimeCryptAlg) {
- mvprintw (HDR_CRYPTINFO, SW + 40, "%s%s", _("Encrypt with: "),
+ mvwprintw (main_w, HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
NONULL (SmimeCryptAlg));
off = 20;
}
}
-static void redraw_mix_line (string_list_t * chain)
-{
- int c;
- const char *t;
-
- mvaddstr (HDR_MIX, SW, " Mix: ");
-
- if (!chain) {
- addstr ("<no chain defined>");
- clrtoeol ();
- return;
- }
-
- for (c = 12; chain; chain = chain->next) {
- t = chain->data;
- if (t && t[0] == '0' && t[1] == '\0')
- t = "<random>";
-
- if (c + m_strlen(t) + 2 >= COLS - SW)
- break;
-
- addstr (NONULL (t));
- if (chain->next)
- addstr (", ");
-
- c += m_strlen(t) + 2;
- }
-}
-
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
int i, r;
buf[0] = 0;
rfc822_addrcat(buf, sizeof (buf), addr, 1);
- mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
- mutt_paddstr (W, buf);
+ mvwprintw (main_w, line, 0, TITLE_FMT, Prompts[line - 1]);
+ mutt_paddstr (main_w, W, buf);
}
static void draw_envelope (HEADER * msg, char *fcc)
{
draw_envelope_addr (HDR_FROM, msg->env->from);
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- draw_envelope_addr (HDR_TO, msg->env->to);
- draw_envelope_addr (HDR_CC, msg->env->cc);
- draw_envelope_addr (HDR_BCC, msg->env->bcc);
-#ifdef USE_NNTP
- } else {
- mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]);
- mutt_paddstr (W, NONULL (msg->env->newsgroups));
- mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->followup_to));
- if (option (OPTXCOMMENTTO)) {
- mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->x_comment_to));
- }
- }
-#endif
- mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
- mutt_paddstr (W, NONULL (msg->env->subject));
+ draw_envelope_addr (HDR_TO, msg->env->to);
+ draw_envelope_addr (HDR_CC, msg->env->cc);
+ draw_envelope_addr (HDR_BCC, msg->env->bcc);
+ mvwprintw (main_w, HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+ mutt_paddstr (main_w, W, NONULL (msg->env->subject));
draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
- mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
- mutt_paddstr (W, fcc);
+ mvwprintw (main_w, HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mutt_paddstr (main_w, W, fcc);
redraw_crypt_lines (msg);
- redraw_mix_line (msg->chain);
- SETCOLOR (MT_COLOR_STATUS);
- mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
- BKGDSET (MT_COLOR_STATUS);
- clrtoeol ();
+ SETCOLOR(main_w, MT_COLOR_STATUS);
+ mvwaddstr (main_w, HDR_ATTACH - 1, 0, _("-- Attachments"));
+ BKGDSET(main_w, MT_COLOR_STATUS);
+ wclrtoeol (main_w);
- BKGDSET (MT_COLOR_NORMAL);
- SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET(main_w, MT_COLOR_NORMAL);
+ SETCOLOR(main_w, MT_COLOR_NORMAL);
}
static int edit_address_list (int line, address_t ** addr)
/* redraw the expanded list so the user can see the result */
buf[0] = 0;
rfc822_addrcat(buf, sizeof (buf), *addr, 1);
- move (line, HDR_XOFFSET + SW);
- mutt_paddstr (W, buf);
+ wmove (main_w, line, HDR_XOFFSET);
+ mutt_paddstr (main_w, W, buf);
return 0;
}
idx[x] = idx[x + 1];
menu->max = --(*idxlen);
- return (0);
+ return 0;
}
static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
+ snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
break;
case 'l': /* approx length of current message in bytes */
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version());
+ m_strcpy(buf, buflen, madmutt_version);
break;
case 0:
*buf = 0;
- return (src);
+ return src;
default:
*buf = 0;
if (flags & M_FORMAT_OPTIONAL)
compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
- return (src);
+ return src;
}
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
- m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0);
+ m_strformat(buf, buflen, getmaxx(main_w), p, compose_format_str, menu, 0);
}
/* return values:
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
int oldSort, oldSortAux;
struct stat st;
-#ifdef USE_NNTP
- int news = 0; /* is it a news article ? */
-
- if (option (OPTNEWSSEND))
- news++;
-#endif
-
mutt_attach_init (msg->content);
idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1);
menu->make_entry = snd_entry;
menu->tag = mutt_tag_attach;
menu->data = idx;
-#ifdef USE_NNTP
- if (news)
- menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
- ComposeNewsHelp);
- else
-#endif
- menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
- ComposeHelp);
- if (option (OPTMBOXPANE))
- buffy_check (0);
while (loop) {
-#ifdef USE_NNTP
- unset_option (OPTNEWS); /* for any case */
-#endif
switch (op = mutt_menuLoop (menu)) {
case OP_REDRAW:
draw_envelope (msg, fcc);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_TO:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_BCC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_CC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
- break;
-#ifdef USE_NNTP
- case OP_COMPOSE_EDIT_NEWSGROUPS:
- if (news) {
- if (msg->env->newsgroups)
- m_strcpy(buf, sizeof(buf), msg->env->newsgroups);
- else
- buf[0] = 0;
- if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->newsgroups);
- m_strrtrim(buf);
- msg->env->newsgroups = m_strdup(skipspaces(buf));
- move (HDR_TO, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->newsgroups)
- printw ("%-*.*s", W, W, msg->env->newsgroups);
- }
- }
- break;
-
- case OP_COMPOSE_EDIT_FOLLOWUP_TO:
- if (news) {
- buf[0] = 0;
- if (msg->env->followup_to)
- m_strcpy(buf, sizeof(buf), msg->env->followup_to);
- if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->followup_to);
- m_strrtrim(buf);
- msg->env->followup_to = m_strdup(skipspaces(buf));
- move (HDR_CC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->followup_to)
- printw ("%-*.*s", W, W, msg->env->followup_to);
- }
- }
- break;
-
- case OP_COMPOSE_EDIT_X_COMMENT_TO:
- if (news && option (OPTXCOMMENTTO)) {
- buf[0] = 0;
- if (msg->env->x_comment_to)
- m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
- if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->x_comment_to);
- msg->env->x_comment_to = m_strdup(buf);
- move (HDR_BCC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->x_comment_to)
- printw ("%-*.*s", W, W, msg->env->x_comment_to);
- }
- }
+ menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
m_strcpy(buf, sizeof(buf), msg->env->subject);
buf[0] = 0;
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) {
m_strreplace(&msg->env->subject, buf);
- move (HDR_SUBJECT, HDR_XOFFSET + SW);
- clrtoeol ();
+ wmove (main_w, HDR_SUBJECT, HDR_XOFFSET);
+ wclrtoeol (main_w);
if (msg->env->subject)
- mutt_paddstr (W, msg->env->subject);
+ mutt_paddstr (main_w, W, msg->env->subject);
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0) {
m_strcpy(fcc, _POSIX_PATH_MAX, buf);
mutt_pretty_mailbox (fcc);
- move (HDR_FCC, HDR_XOFFSET + SW);
- mutt_paddstr (W, fcc);
+ wmove (main_w, HDR_FCC, HDR_XOFFSET);
+ mutt_paddstr (main_w, W, fcc);
fccSet = 1;
}
MAYBE_REDRAW (menu->redraw);
case OP_COMPOSE_ATTACH_FILE:
{
- char *prompt, **files;
+ const char *prompt;
+ char **files;
int error, numfiles;
fname[0] = 0;
break;
case OP_COMPOSE_ATTACH_MESSAGE:
-#ifdef USE_NNTP
- case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
-#endif
{
- char *prompt;
+ const char *prompt;
HEADER *h;
fname[0] = 0;
prompt = _("Open mailbox to attach message from");
-#ifdef USE_NNTP
- unset_option (OPTNEWS);
- if (op == OP_COMPOSE_ATTACH_NEWS_MESSAGE) {
- if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
- break;
-
- prompt = _("Open newsgroup to attach message from");
- set_option (OPTNEWS);
- }
-#endif
if (Context)
-#ifdef USE_NNTP
- if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP))
-#endif
{
m_strcpy(fname, sizeof(fname), NONULL(Context->path));
mutt_pretty_mailbox (fname);
== -1 || !fname[0])
break;
-#ifdef USE_NNTP
- if (option (OPTNEWS))
- nntp_expand_path (fname, sizeof (fname),
- &CurrentNewsSrv->conn->account);
- else
-#endif
- mutt_expand_path (fname, sizeof (fname));
- if (mx_get_magic (fname) != M_IMAP)
- if (mx_get_magic (fname) != M_POP)
-#ifdef USE_NNTP
- if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
-#endif
+ mutt_expand_path (fname, sizeof (fname));
+ if (mx_get_magic (fname) != M_IMAP && mx_get_magic (fname) != M_POP) {
/* check to make sure the file exists and is readable */
- if (access (fname, R_OK) == -1) {
- mutt_perror (fname);
- break;
- }
+ if (access (fname, R_OK) == -1) {
+ mutt_perror (fname);
+ break;
+ }
+ }
menu->redraw = REDRAW_FULL;
mx_close_mailbox (ctx, NULL);
p_delete(&ctx);
mutt_error _("No messages in that folder.");
-
break;
}
update_idx (menu, idx, idxlen++);
else {
mutt_error _("Unable to attach!");
-
p_delete(&idx[idxlen]);
}
}
/* Restore old $sort and $sort_aux */
Sort = oldSort;
SortAux = oldSortAux;
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_DELETE:
break;
}
- if (msg->chain && mix_check_message (msg) != 0)
- break;
-
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
_("Save a copy of this message?"))) == -1)
int itype;
FILE *fp;
- CLEARLINE (LINES - 1);
fname[0] = 0;
if (mutt_get_field (_("New file: "), fname, sizeof (fname), M_FILE)
!= 0 || !fname[0])
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
- if (mutt_write_fcc (NONULL (fname), msg, NULL, 1, NULL) < 0)
+ if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0)
msg->content = mutt_remove_multipart (msg->content);
else
mutt_message _("Message written.");
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
- case OP_COMPOSE_MIX:
- mix_make_chain (&msg->chain, &menu->redraw);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
}
/* Draw formated compose status line */
if (menu->redraw & REDRAW_STATUS) {
compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
- CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
- SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW);
- printw ("%-*.*s", COLS-SW, COLS-SW, buf);
- SETCOLOR (MT_COLOR_NORMAL);
+ CLEARLINE(main_w, 0);
+ SETCOLOR(main_w, MT_COLOR_STATUS);
+ mvwprintw (main_w, 0, 0, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
+ SETCOLOR(main_w, MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
}
}
p_delete(&idx);
- return (r);
+ return r;
}