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;
}
int c;
const char *t;
- mvaddstr (HDR_MIX, SW, " Mix: ");
+ mvwaddstr (stdscr, HDR_MIX, SW, " Mix: ");
if (!chain) {
- addstr ("<no chain defined>");
- clrtoeol ();
+ waddstr (stdscr, "<no chain defined>");
+ wclrtoeol (stdscr);
return;
}
if (c + m_strlen(t) + 2 >= COLS - SW)
break;
- addstr (NONULL (t));
+ waddstr (stdscr, NONULL (t));
if (chain->next)
- addstr (", ");
+ waddstr (stdscr, ", ");
c += m_strlen(t) + 2;
}
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));
}
#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;
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;
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;
}
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;
}