#include <lib-sys/unix.h>
#include <lib-lua/lib-lua.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
buf);
#define extra_space (15 + 7 + 2)
- if (m_strwidth(prompt) > COLS - extra_space) {
- mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
- prompt, sizeof(prompt), 0);
+ if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+ mutt_format_string(prompt, sizeof(prompt), 0,
+ getmaxx(main_w) - extra_space, 0, 0, prompt,
+ sizeof(prompt), 0);
m_strcat(prompt, sizeof(prompt), "...?");
} else {
m_strcat(prompt, sizeof(prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
}
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
rc = mutt_bounce_message (NULL, h, adr);
address_list_wipe(&adr);
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
}
-static void pipe_set_flags (int decode, int print, int *cmflags, int *chflags)
+static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
{
+ int cmflags = 0;
+ int chflags = CH_FROM;
+
if (decode) {
- *cmflags |= M_CM_DECODE | M_CM_CHARCONV;
- *chflags |= CH_DECODE | CH_REORDER;
+ cmflags |= M_CM_DECODE | M_CM_CHARCONV;
+ chflags |= CH_DECODE | CH_REORDER;
- if (option (OPTWEED)) {
- *chflags |= CH_WEED;
- *cmflags |= M_CM_WEED;
+ if (option(OPTWEED)) {
+ chflags |= CH_WEED;
+ cmflags |= M_CM_WEED;
}
}
if (print)
- *cmflags |= M_CM_PRINTING;
-
-}
-
-static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
-{
- int cmflags = 0;
- int chflags = CH_FROM;
-
- pipe_set_flags (decode, print, &cmflags, &chflags);
+ cmflags |= M_CM_PRINTING;
if (decode && h->security & ENCRYPT) {
endwin ();
mutt_copy_message (fp, Context, h, cmflags, chflags);
}
-
/* the following code is shared between printing and piping */
-
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
int split, const char *sep)
{
if (!buf[0])
m_strcpy(buf, sizeof(buf), mod_core.shell);
if (buf[0]) {
- CLEARLINE (LINES - 1);
+ CLEARLINE(main_w, LINES - 1);
mutt_endwin (NULL);
fflush (stdout);
if (mutt_system (buf) != 0 || option (OPTWAITKEY))
}
-static int _mutt_check_traditional_pgp (HEADER * h, int *redraw)
-{
- MESSAGE *msg;
- int rv = 0;
-
- h->security |= PGP_TRADITIONAL_CHECKED;
-
- mutt_parse_mime_message (Context, h);
- if ((msg = mx_open_message (Context, h->msgno)) == NULL)
- return 0;
- if (crypt_pgp_check_traditional (msg->fp, h->content, 0)) {
- h->security = crypt_query (h->content);
- *redraw |= REDRAW_FULL;
- rv = 1;
- }
-
- h->security |= PGP_TRADITIONAL_CHECKED;
- mx_close_message (&msg);
- return rv;
-}
-
-int mutt_check_traditional_pgp (HEADER * h, int *redraw)
-{
- int i;
- int rv = 0;
-
- if (h && !(h->security & PGP_TRADITIONAL_CHECKED))
- rv = _mutt_check_traditional_pgp (h, redraw);
- else {
- for (i = 0; i < Context->vcount; i++)
- if (Context->hdrs[Context->v2r[i]]->tagged &&
- !(Context->hdrs[Context->v2r[i]]->
- security & PGP_TRADITIONAL_CHECKED))
- rv =
- _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw)
- || rv;
- }
- return rv;
-}