#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include "mutt.h"
#include "alias.h"
+#include "crypt.h"
#include "mutt_idna.h"
#include "attach.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
#include "buffy.h"
-#include "remailer.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
#define CHECK_COUNT \
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
- HDR_MIX,
HDR_CRYPT,
HDR_CRYPTINFO,
#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));
+ ((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 (stdscr, HDR_CRYPT, SW, " Security: ");
else if (msg->security & APPLICATION_SMIME)
- mvaddstr (HDR_CRYPT, SW, " S/MIME: ");
+ mvwaddstr (stdscr, HDR_CRYPT, SW, " S/MIME: ");
else if (msg->security & APPLICATION_PGP)
- mvaddstr (HDR_CRYPT, SW, " PGP: ");
+ mvwaddstr (stdscr, HDR_CRYPT, SW, " PGP: ");
if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
- addstr (_("Sign, Encrypt"));
+ waddstr (stdscr, _("Sign, Encrypt"));
else if (msg->security & ENCRYPT)
- addstr (_("Encrypt"));
+ waddstr (stdscr, _("Encrypt"));
else if (msg->security & SIGN)
- addstr (_("Sign"));
+ waddstr (stdscr, _("Sign"));
else
- addstr (_("Clear"));
+ waddstr (stdscr, _("Clear"));
if ((msg->security & APPLICATION_PGP)
&& (msg->security & (ENCRYPT | SIGN))) {
if ((msg->security & INLINE))
- addstr (_(" (inline)"));
+ waddstr (stdscr, _(" (inline)"));
else
- addstr (_(" (PGP/MIME)"));
+ waddstr (stdscr, _(" (PGP/MIME)"));
}
- clrtoeol ();
+ wclrtoeol (stdscr);
- move (HDR_CRYPTINFO, SW);
- clrtoeol ();
+ wmove (stdscr, HDR_CRYPTINFO, SW);
+ wclrtoeol (stdscr);
if (msg->security & APPLICATION_PGP && msg->security & SIGN)
- printw ("%s%s", _(" sign as: "),
+ wprintw (stdscr, "%s%s", _(" sign as: "),
PgpSignAs ? PgpSignAs : _("<default>"));
if (msg->security & APPLICATION_SMIME && msg->security & SIGN) {
- printw ("%s%s", _(" sign as: "),
+ wprintw (stdscr, "%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 (stdscr, HDR_CRYPTINFO, SW + 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]);
+ mvwprintw (stdscr, line, SW, TITLE_FMT, Prompts[line - 1]);
mutt_paddstr (W, buf);
}
draw_envelope_addr (HDR_BCC, msg->env->bcc);
#ifdef USE_NNTP
} else {
- mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]);
+ mvwprintw (stdscr, 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]);
+ mvwprintw (stdscr, 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]);
+ mvwprintw (stdscr, HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
mutt_paddstr (W, NONULL (msg->env->subject));
draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
- mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mvwprintw (stdscr, HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
- redraw_mix_line (msg->chain);
SETCOLOR (MT_COLOR_STATUS);
- mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
+ mvwaddstr (stdscr, HDR_ATTACH - 1, SW, _("-- Attachments"));
BKGDSET (MT_COLOR_STATUS);
- clrtoeol ();
+ wclrtoeol (stdscr);
BKGDSET (MT_COLOR_NORMAL);
SETCOLOR (MT_COLOR_NORMAL);
/* 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);
+ wmove (stdscr, line, HDR_XOFFSET + SW);
mutt_paddstr (W, buf);
return 0;
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 */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
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);
p_delete(&msg->env->newsgroups);
m_strrtrim(buf);
msg->env->newsgroups = m_strdup(skipspaces(buf));
- move (HDR_TO, HDR_XOFFSET);
- clrtoeol ();
+ wmove (stdscr, HDR_TO, HDR_XOFFSET);
+ wclrtoeol (stdscr);
if (msg->env->newsgroups)
- printw ("%-*.*s", W, W, msg->env->newsgroups);
+ wprintw (stdscr, "%-*.*s", W, W, msg->env->newsgroups);
}
}
break;
p_delete(&msg->env->followup_to);
m_strrtrim(buf);
msg->env->followup_to = m_strdup(skipspaces(buf));
- move (HDR_CC, HDR_XOFFSET);
- clrtoeol ();
+ wmove (stdscr, HDR_CC, HDR_XOFFSET);
+ wclrtoeol (stdscr);
if (msg->env->followup_to)
- printw ("%-*.*s", W, W, msg->env->followup_to);
+ wprintw (stdscr, "%-*.*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);
- }
- }
- break;
#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (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 (stdscr, HDR_SUBJECT, HDR_XOFFSET + SW);
+ wclrtoeol (stdscr);
if (msg->env->subject)
mutt_paddstr (W, msg->env->subject);
}
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);
+ wmove (stdscr, HDR_FCC, HDR_XOFFSET + SW);
mutt_paddstr (W, fcc);
fccSet = 1;
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
- case OP_COMPOSE_ATTACH_KEY:
- if (idxlen == idxmax) {
- p_realloc(&idx, idxmax += 5);
- menu->data = idx;
- }
-
- idx[idxlen] = p_new(ATTACHPTR, 1);
- if ((idx[idxlen]->content =
- crypt_pgp_make_key_attachment (NULL)) != NULL) {
- update_idx (menu, idx, idxlen++);
- menu->redraw |= REDRAW_INDEX;
- }
- else
- p_delete(&idx[idxlen]);
-
- menu->redraw |= REDRAW_STATUS;
-
- if (option (OPTNEEDREDRAW)) {
- menu->redraw = REDRAW_FULL;
- unset_option (OPTNEEDREDRAW);
- }
-
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
case OP_COMPOSE_ATTACH_FILE:
{
- char *prompt, **files;
+ const char *prompt;
+ char **files;
int error, numfiles;
fname[0] = 0;
case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
#endif
{
- char *prompt;
+ const char *prompt;
HEADER *h;
fname[0] = 0;
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)
}
msg->security = 0;
}
- msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu (msg, &menu->redraw, 0);
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
}
msg->security = 0;
}
- msg->security = crypt_smime_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu(msg, &menu->redraw, 1);
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 */
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);
+ wmove (stdscr, option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW);
+ wprintw (stdscr, "%-*.*s", COLS-SW, COLS-SW, buf);
SETCOLOR (MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
}
projects / apps / madmutt.git / blobdiff