X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=5e47cbe89c8cd7b519d60a7528eb959c3d11d0a7;hp=6fa6ad3ee9d1926eed566c141e61f7347c431506;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997 diff --git a/compose.c b/compose.c index 6fa6ad3..5e47cbe 100644 --- a/compose.c +++ b/compose.c @@ -16,8 +16,7 @@ #include #include -#include -#include +#include #include #include @@ -30,11 +29,6 @@ #include "sort.h" #include "charset.h" #include "buffy.h" -#include "remailer.h" - -#ifdef USE_NNTP -#include "nntp.h" -#endif #define CHECK_COUNT \ if (idxlen == 0) { \ @@ -50,28 +44,16 @@ enum { 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: ", @@ -81,13 +63,10 @@ static const char *Prompts[] = { "Subject: ", "Reply-To: ", "Fcc: ", -#ifdef USE_NNTP - "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " -#endif }; static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { - m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt, + m_strformat(b, blen, getmaxx(main_w), AttachFormat, mutt_attach_fmt, ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE); } @@ -96,79 +75,50 @@ static void redraw_crypt_lines (HEADER * msg) int off = 0; if (!msg->security) - mvwaddstr (stdscr, HDR_CRYPT, SW, " Security: "); + mvwaddstr (main_w, HDR_CRYPT, 0, " Security: "); else if (msg->security & APPLICATION_SMIME) - mvwaddstr (stdscr, HDR_CRYPT, SW, " S/MIME: "); + mvwaddstr (main_w, HDR_CRYPT, 0, " S/MIME: "); else if (msg->security & APPLICATION_PGP) - mvwaddstr (stdscr, HDR_CRYPT, SW, " PGP: "); + mvwaddstr (main_w, HDR_CRYPT, 0, " PGP: "); if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN)) - waddstr (stdscr, _("Sign, Encrypt")); + waddstr (main_w, _("Sign, Encrypt")); else if (msg->security & ENCRYPT) - waddstr (stdscr, _("Encrypt")); + waddstr (main_w, _("Encrypt")); else if (msg->security & SIGN) - waddstr (stdscr, _("Sign")); + waddstr (main_w, _("Sign")); else - waddstr (stdscr, _("Clear")); + waddstr (main_w, _("Clear")); if ((msg->security & APPLICATION_PGP) && (msg->security & (ENCRYPT | SIGN))) { if ((msg->security & INLINE)) - waddstr (stdscr, _(" (inline)")); + waddstr (main_w, _(" (inline)")); else - waddstr (stdscr, _(" (PGP/MIME)")); + waddstr (main_w, _(" (PGP/MIME)")); } - wclrtoeol (stdscr); + wclrtoeol (main_w); - wmove (stdscr, HDR_CRYPTINFO, SW); - wclrtoeol (stdscr); + wmove (main_w, HDR_CRYPTINFO, 0); + wclrtoeol (main_w); if (msg->security & APPLICATION_PGP && msg->security & SIGN) - wprintw (stdscr, "%s%s", _(" sign as: "), + wprintw (main_w, "%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); if (msg->security & APPLICATION_SMIME && msg->security & SIGN) { - wprintw (stdscr, "%s%s", _(" sign as: "), + wprintw (main_w, "%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("")); } if ((msg->security & APPLICATION_SMIME) && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { - mvwprintw (stdscr, 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; - - mvwaddstr (stdscr, HDR_MIX, SW, " Mix: "); - - if (!chain) { - waddstr (stdscr, ""); - wclrtoeol (stdscr); - return; - } - - for (c = 12; chain; chain = chain->next) { - t = chain->data; - if (t && t[0] == '0' && t[1] == '\0') - t = ""; - - if (c + m_strlen(t) + 2 >= COLS - SW) - break; - - waddstr (stdscr, NONULL (t)); - if (chain->next) - waddstr (stdscr, ", "); - - c += m_strlen(t) + 2; - } -} - static int check_attachments (ATTACHPTR ** idx, short idxlen) { int i, r; @@ -204,43 +154,31 @@ static void draw_envelope_addr (int line, address_t * addr) buf[0] = 0; rfc822_addrcat(buf, sizeof (buf), addr, 1); - mvwprintw (stdscr, 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 { - mvwprintw (stdscr, HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]); - mutt_paddstr (W, NONULL (msg->env->newsgroups)); - mvwprintw (stdscr, HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]); - mutt_paddstr (W, NONULL (msg->env->followup_to)); - } -#endif - mvwprintw (stdscr, 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); - mvwprintw (stdscr, 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); - mvwaddstr (stdscr, HDR_ATTACH - 1, SW, _("-- Attachments")); - BKGDSET (MT_COLOR_STATUS); - wclrtoeol (stdscr); + 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) @@ -270,8 +208,8 @@ 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); - wmove (stdscr, line, HDR_XOFFSET + SW); - mutt_paddstr (W, buf); + wmove (main_w, line, HDR_XOFFSET); + mutt_paddstr (main_w, W, buf); return 0; } @@ -306,7 +244,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x) idx[x] = idx[x + 1]; menu->max = --(*idxlen); - return (0); + return 0; } static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) @@ -405,12 +343,12 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, 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; @@ -420,13 +358,13 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, 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: @@ -457,13 +395,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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); @@ -475,12 +406,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->tag = mutt_tag_attach; menu->data = idx; - 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); @@ -492,74 +418,17 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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)); - wmove (stdscr, HDR_TO, HDR_XOFFSET); - wclrtoeol (stdscr); - if (msg->env->newsgroups) - wprintw (stdscr, "%-*.*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)); - wmove (stdscr, HDR_CC, HDR_XOFFSET); - wclrtoeol (stdscr); - if (msg->env->followup_to) - wprintw (stdscr, "%-*.*s", W, W, msg->env->followup_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); @@ -567,10 +436,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { m_strreplace(&msg->env->subject, buf); - wmove (stdscr, HDR_SUBJECT, HDR_XOFFSET + SW); - wclrtoeol (stdscr); + 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; @@ -583,8 +452,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0) { m_strcpy(fcc, _POSIX_PATH_MAX, buf); mutt_pretty_mailbox (fcc); - wmove (stdscr, 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); @@ -680,9 +549,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ break; case OP_COMPOSE_ATTACH_MESSAGE: -#ifdef USE_NNTP - case OP_COMPOSE_ATTACH_NEWS_MESSAGE: -#endif { const char *prompt; HEADER *h; @@ -690,21 +556,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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); @@ -714,23 +567,14 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ == -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; @@ -744,7 +588,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mx_close_mailbox (ctx, NULL); p_delete(&ctx); mutt_error _("No messages in that folder."); - break; } @@ -783,7 +626,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); else { mutt_error _("Unable to attach!"); - p_delete(&idx[idxlen]); } } @@ -801,8 +643,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ /* 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: @@ -925,9 +767,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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) @@ -1006,7 +845,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ int itype; FILE *fp; - CLEARLINE (LINES - 1); fname[0] = 0; if (mutt_get_field (_("New file: "), fname, sizeof (fname), M_FILE) != 0 || !fname[0]) @@ -1167,7 +1005,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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."); @@ -1201,21 +1039,15 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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); - wmove (stdscr, option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW); - wprintw (stdscr, "%-*.*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; } } @@ -1234,5 +1066,5 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ p_delete(&idx); - return (r); + return r; }