X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=a66f9b0a63f93998a1c9241b90859e1b49aeddf3;hp=ecb430d0c069e4c70cacc8f71c7896c101575a9e;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/pager.c b/pager.c index ecb430d..a66f9b0 100644 --- a/pager.c +++ b/pager.c @@ -11,77 +11,58 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include +#include +#include +#include #include "mutt.h" -#include "mutt_curses.h" +#include "crypt.h" +#include "alias.h" #include "keymap.h" -#include "mutt_menu.h" -#include "mapping.h" #include "sort.h" #include "pager.h" #include "attach.h" -#include "mbyte.h" -#include "sidebar.h" +#include "recvattach.h" +#include "charset.h" #include "buffy.h" -#include "mx.h" - -#ifdef USE_IMAP -#include "imap_private.h" -#endif +#include -#include "mutt_crypt.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/rx.h" -#include "lib/debug.h" +#define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) -#include -#include -#include -#include -#include -#include +#define IsAttach(x) (x && (x)->bdy) +#define IsRecvAttach(x) (x && (x)->bdy && (x)->fp) +#define IsSendAttach(x) (x && (x)->bdy && !(x)->fp) +#define IsMsgAttach(x) (x && (x)->fp && (x)->bdy && (x)->bdy->hdr) +#define IsHeader(x) (x && (x)->hdr && !(x)->bdy) + +/* hack to return to position when returning from index to same message */ +static int TopLine = 0; +static HEADER *OldHdr = NULL; + +#define CHECK_MODE(x) \ + if (!(x)) { \ + mutt_flushinp(); \ + mutt_error _("Not available in this menu."); \ + break; \ + } -#define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) +#define CHECK_READONLY \ + if (Context->readonly) { \ + mutt_flushinp(); \ + mutt_error _("Mailbox is read-only."); \ + break; \ + } -#define IsAttach(x) (x && (x)->bdy) -#define IsRecvAttach(x) (x && (x)->bdy && (x)->fp) -#define IsSendAttach(x) (x && (x)->bdy && !(x)->fp) -#define IsMsgAttach(x) (x && (x)->fp && (x)->bdy && (x)->bdy->hdr) -#define IsHeader(x) (x && (x)->hdr && !(x)->bdy) - -static const char *Not_available_in_this_menu = -N_("Not available in this menu."); -static const char *Mailbox_is_read_only = N_("Mailbox is read-only."); -static const char *Function_not_permitted_in_attach_message_mode = -N_("Function not permitted in attach-message mode."); - -#define CHECK_MODE(x) if (!(x)) \ - { \ - mutt_flushinp (); \ - mutt_error _(Not_available_in_this_menu); \ - break; \ - } - -#define CHECK_READONLY if (Context->readonly) \ - { \ - mutt_flushinp (); \ - mutt_error _(Mailbox_is_read_only); \ - break; \ - } - -#define CHECK_ATTACH if(option(OPTATTACHMSG)) \ - {\ - mutt_flushinp (); \ - mutt_error _(Function_not_permitted_in_attach_message_mode); \ - break; \ - } +#define CHECK_ATTACH \ + if (option(OPTATTACHMSG)) { \ + mutt_flushinp(); \ + mutt_error _("Function not permitted in attach-message mode."); \ + break; \ + } struct q_class_t { int length; @@ -99,7 +80,7 @@ struct syntax_t { }; struct line_t { - long offset; + off_t offset; short type; short continuation; short chunks; @@ -125,42 +106,35 @@ typedef struct _ansi_attr { static short InHelp = 0; -#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM) static struct resize { int line; int SearchCompiled; int SearchBack; -} *Resize = NULL; -#endif +} *Resize = NULL; #define NumSigLines 4 -static int check_sig (const char *s, struct line_t *info, int n) +static int check_sig(const char *s, struct line_t *info, int n) { - int count = 0; + int count = 0; - while (n > 0 && count <= NumSigLines) { - if (info[n].type != MT_COLOR_SIGNATURE) - break; - count++; - n--; - } + while (n > 0 && count <= NumSigLines) { + if (info[n].type != MT_COLOR_SIGNATURE) + break; + count++; + n--; + } - if (count == 0) - return (-1); + if (count == 0) + return -1; - if (count > NumSigLines) { - /* check for a blank line */ - while (*s) { - if (!ISSPACE (*s)) - return 0; - s++; + if (count > NumSigLines) { + /* check for a blank line */ + s = skipspaces(s); + return *s ? -1 : 0; } - return (-1); - } - - return (0); + return 0; } static void @@ -173,19 +147,20 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, int search = 0, i, m; if (!cnt) - last_color = -1; /* force attrset() */ + last_color = -1; /* force wattrset(main_w) */ if (lineInfo[n].continuation) { if (!cnt && option (OPTMARKERS)) { - SETCOLOR (MT_COLOR_MARKERS); - addch ('+'); + SETCOLOR(main_w, MT_COLOR_MARKERS); + waddch(main_w, '+'); last_color = ColorDefs[MT_COLOR_MARKERS]; } m = (lineInfo[n].syntax)[0].first; cnt += (lineInfo[n].syntax)[0].last; - } - else + } else { m = n; + } + if (!(flags & M_SHOWCOLOR)) def_color = ColorDefs[MT_COLOR_NORMAL]; else if (lineInfo[m].type == MT_COLOR_HEADER) @@ -218,8 +193,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, color = (lineInfo[m].syntax)[i].color; break; } - /* don't break here, as cnt might be - * in the next chunk as well */ + /* don't break here, as cnt might be in the next chunk as well */ } } @@ -239,16 +213,13 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, /* handle "special" bold & underlined characters */ if (special || a->attr) { -#ifdef HAVE_COLOR if ((a->attr & ANSI_COLOR)) { if (a->pair == -1) - a->pair = mutt_alloc_color (a->fg, a->bg); + a->pair = madtty_color_pair(a->fg, a->bg); color = a->pair; if (a->attr & ANSI_BOLD) color |= A_BOLD; - } - else -#endif + } else if ((special & A_BOLD) || (a->attr & ANSI_BOLD)) { if (ColorDefs[MT_COLOR_BOLD] && !search) color = ColorDefs[MT_COLOR_BOLD]; @@ -273,7 +244,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, } if (color != last_color) { - attrset (color); + wattrset(main_w, color); last_color = color; } } @@ -283,680 +254,568 @@ static void append_line (struct line_t *lineInfo, int n, int cnt) int m; lineInfo[n + 1].type = lineInfo[n].type; - (lineInfo[n + 1].syntax)[0].color = (lineInfo[n].syntax)[0].color; + lineInfo[n + 1].syntax[0].color = lineInfo[n].syntax[0].color; lineInfo[n + 1].continuation = 1; /* find the real start of the line */ for (m = n; m >= 0; m--) - if (lineInfo[m].continuation == 0) - break; + if (lineInfo[m].continuation == 0) + break; (lineInfo[n + 1].syntax)[0].first = m; (lineInfo[n + 1].syntax)[0].last = (lineInfo[n].continuation) ? - cnt + (lineInfo[n].syntax)[0].last : cnt; + cnt + (lineInfo[n].syntax)[0].last : cnt; } static void new_class_color (struct q_class_t *class, int *q_level) { - class->index = (*q_level)++; - class->color = ColorQuote[class->index % ColorQuoteUsed]; + class->index = (*q_level)++; + class->color = ColorQuote[class->index % ColorQuoteUsed]; } static void shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class, - int index, int *q_level) + int lindex, int *q_level) { - struct q_class_t *q_list; + struct q_class_t *q_list; - q_list = QuoteList; - new_class->index = -1; + q_list = QuoteList; + new_class->index = -1; - while (q_list) { - if (q_list->index >= index) { - q_list->index++; - q_list->color = ColorQuote[q_list->index % ColorQuoteUsed]; - } - if (q_list->down) - q_list = q_list->down; - else if (q_list->next) - q_list = q_list->next; - else { - while (!q_list->next) { - q_list = q_list->up; - if (q_list == NULL) - break; - } - if (q_list) - q_list = q_list->next; + while (q_list) { + if (q_list->index >= lindex) { + q_list->index++; + q_list->color = ColorQuote[q_list->index % ColorQuoteUsed]; + } + if (q_list->down) + q_list = q_list->down; + else if (q_list->next) + q_list = q_list->next; + else { + while (!q_list->next) { + q_list = q_list->up; + if (q_list == NULL) + break; + } + if (q_list) + q_list = q_list->next; + } } - } - new_class->index = index; - new_class->color = ColorQuote[index % ColorQuoteUsed]; - (*q_level)++; + new_class->index = lindex; + new_class->color = ColorQuote[lindex % ColorQuoteUsed]; + (*q_level)++; } -static void cleanup_quote (struct q_class_t **QuoteList) +static void cleanup_quote(struct q_class_t **QuoteList) { - struct q_class_t *ptr; - - while (*QuoteList) { - if ((*QuoteList)->down) - cleanup_quote (&((*QuoteList)->down)); - ptr = (*QuoteList)->next; - if ((*QuoteList)->prefix) - mem_free (&(*QuoteList)->prefix); - mem_free (QuoteList); - *QuoteList = ptr; - } - - return; + while (*QuoteList) { + struct q_class_t *ptr = (*QuoteList)->next; + cleanup_quote(&(*QuoteList)->down); + p_delete(&(*QuoteList)->prefix); + p_delete(QuoteList); + *QuoteList = ptr; + } } static struct q_class_t *classify_quote (struct q_class_t **QuoteList, const char *qptr, int length, int *force_redraw, int *q_level) { - struct q_class_t *q_list = *QuoteList; - struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save; - char *tail_qptr; - int offset, tail_lng; - int index = -1; - - if (ColorQuoteUsed <= 1) { - /* not much point in classifying quotes... */ - - if (*QuoteList == NULL) { - class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)); - class->color = ColorQuote[0]; - *QuoteList = class; + struct q_class_t *q_list = *QuoteList; + struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save; + char *tail_qptr; + int offset, tail_lng; + int lindex = -1; + + if (ColorQuoteUsed <= 1) { + /* not much point in classifying quotes... */ + + if (*QuoteList == NULL) { + class = p_new(struct q_class_t, 1); + class->color = ColorQuote[0]; + *QuoteList = class; + } + return *QuoteList; } - return (*QuoteList); - } - /* Did I mention how much I like emulating Lisp in C? */ - - /* classify quoting prefix */ - while (q_list) { - if (length <= q_list->length) { - /* case 1: check the top level nodes */ - - if (str_ncmp (qptr, q_list->prefix, length) == 0) { - if (length == q_list->length) - return q_list; /* same prefix: return the current class */ - - /* found shorter prefix */ - if (tmp == NULL) { - /* add a node above q_list */ - tmp = - (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)); - tmp->prefix = (char *) mem_calloc (1, length + 1); - strncpy (tmp->prefix, qptr, length); - tmp->length = length; - - /* replace q_list by tmp in the top level list */ - if (q_list->next) { - tmp->next = q_list->next; - q_list->next->prev = tmp; - } - if (q_list->prev) { - tmp->prev = q_list->prev; - q_list->prev->next = tmp; - } + /* Did I mention how much I like emulating Lisp in C? */ + + /* classify quoting prefix */ + while (q_list) { + if (length <= q_list->length) { + /* case 1: check the top level nodes */ + + if (m_strncmp(qptr, q_list->prefix, length) == 0) { + if (length == q_list->length) + return q_list; /* same prefix: return the current class */ + + /* found shorter prefix */ + if (tmp == NULL) { + /* add a node above q_list */ + tmp = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); + tmp->length = length; + + /* replace q_list by tmp in the top level list */ + if (q_list->next) { + tmp->next = q_list->next; + q_list->next->prev = tmp; + } + if (q_list->prev) { + tmp->prev = q_list->prev; + q_list->prev->next = tmp; + } + + /* make q_list a child of tmp */ + tmp->down = q_list; + q_list->up = tmp; + + /* q_list has no siblings for now */ + q_list->next = NULL; + q_list->prev = NULL; + + /* update the root if necessary */ + if (q_list == *QuoteList) + *QuoteList = tmp; + + lindex = q_list->index; + + /* tmp should be the return class too */ + class = tmp; + + /* next class to test; if tmp is a shorter prefix for another + * node, that node can only be in the top level list, so don't + * go down after this point + */ + q_list = tmp->next; + } else { + /* found another branch for which tmp is a shorter prefix */ + + /* save the next sibling for later */ + save = q_list->next; + + /* unlink q_list from the top level list */ + if (q_list->next) + q_list->next->prev = q_list->prev; + if (q_list->prev) + q_list->prev->next = q_list->next; + + /* at this point, we have a tmp->down; link q_list to it */ + ptr = tmp->down; + /* sibling order is important here, q_list should be linked last */ + while (ptr->next) + ptr = ptr->next; + ptr->next = q_list; + q_list->next = NULL; + q_list->prev = ptr; + q_list->up = tmp; + + lindex = q_list->index; + + /* next class to test; as above, we shouldn't go down */ + q_list = save; + } - /* make q_list a child of tmp */ - tmp->down = q_list; - q_list->up = tmp; + /* we found a shorter prefix, so certain quotes have changed classes */ + *force_redraw = 1; + continue; + } else { + /* shorter, but not a substring of the current class: try next */ + q_list = q_list->next; + continue; + } + } else { + /* case 2: try subclassing the current top level node */ - /* q_list has no siblings for now */ - q_list->next = NULL; - q_list->prev = NULL; + /* tmp != NULL means we already found a shorter prefix at case 1 */ + if (tmp == NULL + && m_strncmp(qptr, q_list->prefix, q_list->length) == 0) { + /* ok, it's a subclass somewhere on this branch */ + + ptr = q_list; + offset = q_list->length; + + q_list = q_list->down; + tail_lng = length - offset; + tail_qptr = (char *) qptr + offset; + + while (q_list) { + if (length <= q_list->length) { + if (m_strncmp(tail_qptr, (q_list->prefix) + offset, tail_lng) + == 0) { + /* same prefix: return the current class */ + if (length == q_list->length) + return q_list; + + /* found shorter common prefix */ + if (tmp == NULL) { + /* add a node above q_list */ + tmp = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); + tmp->length = length; + + /* replace q_list by tmp */ + if (q_list->next) { + tmp->next = q_list->next; + q_list->next->prev = tmp; + } + if (q_list->prev) { + tmp->prev = q_list->prev; + q_list->prev->next = tmp; + } + + /* make q_list a child of tmp */ + tmp->down = q_list; + tmp->up = q_list->up; + q_list->up = tmp; + if (tmp->up->down == q_list) + tmp->up->down = tmp; + + /* q_list has no siblings */ + q_list->next = NULL; + q_list->prev = NULL; + + lindex = q_list->index; + + /* tmp should be the return class too */ + class = tmp; + + /* next class to test */ + q_list = tmp->next; + } else { + /* found another branch for which tmp is a shorter prefix */ + + /* save the next sibling for later */ + save = q_list->next; + + /* unlink q_list from the top level list */ + if (q_list->next) + q_list->next->prev = q_list->prev; + if (q_list->prev) + q_list->prev->next = q_list->next; + + /* at this point, we have a tmp->down; link q_list to it */ + ptr = tmp->down; + while (ptr->next) + ptr = ptr->next; + ptr->next = q_list; + q_list->next = NULL; + q_list->prev = ptr; + q_list->up = tmp; + + lindex = q_list->index; + + /* next class to test */ + q_list = save; + } + + /* we found a shorter prefix, so we need a redraw */ + *force_redraw = 1; + continue; + } else { + q_list = q_list->next; + continue; + } + } else { + /* longer than the current prefix: try subclassing it */ + if (tmp == NULL + && m_strncmp(tail_qptr, (q_list->prefix) + offset, + q_list->length - offset) == 0) { + /* still a subclass: go down one level */ + ptr = q_list; + offset = q_list->length; + + q_list = q_list->down; + tail_lng = length - offset; + tail_qptr = (char *) qptr + offset; + + continue; + } else { + /* nope, try the next prefix */ + q_list = q_list->next; + continue; + } + } + } - /* update the root if necessary */ - if (q_list == *QuoteList) - *QuoteList = tmp; + /* still not found so far: add it as a sibling to the current node */ + if (class == NULL) { + tmp = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); + tmp->length = length; - index = q_list->index; + if (ptr->down) { + tmp->next = ptr->down; + ptr->down->prev = tmp; + } + ptr->down = tmp; + tmp->up = ptr; - /* tmp should be the return class too */ - class = tmp; + new_class_color (tmp, q_level); - /* next class to test; if tmp is a shorter prefix for another - * node, that node can only be in the top level list, so don't - * go down after this point - */ - q_list = tmp->next; - } - else { - /* found another branch for which tmp is a shorter prefix */ - - /* save the next sibling for later */ - save = q_list->next; - - /* unlink q_list from the top level list */ - if (q_list->next) - q_list->next->prev = q_list->prev; - if (q_list->prev) - q_list->prev->next = q_list->next; - - /* at this point, we have a tmp->down; link q_list to it */ - ptr = tmp->down; - /* sibling order is important here, q_list should be linked last */ - while (ptr->next) - ptr = ptr->next; - ptr->next = q_list; - q_list->next = NULL; - q_list->prev = ptr; - q_list->up = tmp; - - index = q_list->index; - - /* next class to test; as above, we shouldn't go down */ - q_list = save; - } + return tmp; + } else { + if (lindex != -1) + shift_class_colors (*QuoteList, tmp, lindex, q_level); - /* we found a shorter prefix, so certain quotes have changed classes */ - *force_redraw = 1; - continue; - } - else { - /* shorter, but not a substring of the current class: try next */ - q_list = q_list->next; - continue; - } - } - else { - /* case 2: try subclassing the current top level node */ - - /* tmp != NULL means we already found a shorter prefix at case 1 */ - if (tmp == NULL - && str_ncmp (qptr, q_list->prefix, q_list->length) == 0) { - /* ok, it's a subclass somewhere on this branch */ - - ptr = q_list; - offset = q_list->length; - - q_list = q_list->down; - tail_lng = length - offset; - tail_qptr = (char *) qptr + offset; - - while (q_list) { - if (length <= q_list->length) { - if (str_ncmp (tail_qptr, (q_list->prefix) + offset, tail_lng) - == 0) { - /* same prefix: return the current class */ - if (length == q_list->length) - return q_list; - - /* found shorter common prefix */ - if (tmp == NULL) { - /* add a node above q_list */ - tmp = (struct q_class_t *) mem_calloc (1, - sizeof (struct - q_class_t)); - tmp->prefix = (char *) mem_calloc (1, length + 1); - strncpy (tmp->prefix, qptr, length); - tmp->length = length; - - /* replace q_list by tmp */ - if (q_list->next) { - tmp->next = q_list->next; - q_list->next->prev = tmp; - } - if (q_list->prev) { - tmp->prev = q_list->prev; - q_list->prev->next = tmp; + return class; } - - /* make q_list a child of tmp */ - tmp->down = q_list; - tmp->up = q_list->up; - q_list->up = tmp; - if (tmp->up->down == q_list) - tmp->up->down = tmp; - - /* q_list has no siblings */ - q_list->next = NULL; - q_list->prev = NULL; - - index = q_list->index; - - /* tmp should be the return class too */ - class = tmp; - - /* next class to test */ - q_list = tmp->next; - } - else { - /* found another branch for which tmp is a shorter prefix */ - - /* save the next sibling for later */ - save = q_list->next; - - /* unlink q_list from the top level list */ - if (q_list->next) - q_list->next->prev = q_list->prev; - if (q_list->prev) - q_list->prev->next = q_list->next; - - /* at this point, we have a tmp->down; link q_list to it */ - ptr = tmp->down; - while (ptr->next) - ptr = ptr->next; - ptr->next = q_list; - q_list->next = NULL; - q_list->prev = ptr; - q_list->up = tmp; - - index = q_list->index; - - /* next class to test */ - q_list = save; - } - - /* we found a shorter prefix, so we need a redraw */ - *force_redraw = 1; - continue; - } - else { - q_list = q_list->next; - continue; + } else { + /* nope, try the next prefix */ + q_list = q_list->next; + continue; } - } - else { - /* longer than the current prefix: try subclassing it */ - if (tmp == NULL - && str_ncmp (tail_qptr, (q_list->prefix) + offset, - q_list->length - offset) == 0) { - /* still a subclass: go down one level */ - ptr = q_list; - offset = q_list->length; - - q_list = q_list->down; - tail_lng = length - offset; - tail_qptr = (char *) qptr + offset; - - continue; - } - else { - /* nope, try the next prefix */ - q_list = q_list->next; - continue; - } - } } + } - /* still not found so far: add it as a sibling to the current node */ - if (class == NULL) { - tmp = - (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)); - tmp->prefix = (char *) mem_calloc (1, length + 1); - strncpy (tmp->prefix, qptr, length); - tmp->length = length; - - if (ptr->down) { - tmp->next = ptr->down; - ptr->down->prev = tmp; - } - ptr->down = tmp; - tmp->up = ptr; - - new_class_color (tmp, q_level); - - return tmp; - } - else { - if (index != -1) - shift_class_colors (*QuoteList, tmp, index, q_level); + if (class == NULL) { + /* not found so far: add it as a top level class */ + class = p_new(struct q_class_t, 1); + class->prefix = p_dupstr(qptr, length); + class->length = length; + new_class_color (class, q_level); - return class; + if (*QuoteList) { + class->next = *QuoteList; + (*QuoteList)->prev = class; } - } - else { - /* nope, try the next prefix */ - q_list = q_list->next; - continue; - } - } - } - - if (class == NULL) { - /* not found so far: add it as a top level class */ - class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)); - class->prefix = (char *) mem_calloc (1, length + 1); - strncpy (class->prefix, qptr, length); - class->length = length; - new_class_color (class, q_level); - - if (*QuoteList) { - class->next = *QuoteList; - (*QuoteList)->prev = class; + *QuoteList = class; } - *QuoteList = class; - } - if (index != -1) - shift_class_colors (*QuoteList, tmp, index, q_level); + if (lindex != -1) + shift_class_colors (*QuoteList, tmp, lindex, q_level); - return class; + return class; } static int check_attachment_marker (char *); static void -resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last, +resolve_types (char *buf, char *rawbuf, struct line_t *lineInfo, int n, int last, struct q_class_t **QuoteList, int *q_level, int *force_redraw, int q_classify) { - COLOR_LINE *color_line; - regmatch_t pmatch[1], smatch[1]; - int found, offset, null_rx, i; - - if (n == 0 || ISHEADER (lineInfo[n - 1].type)) { - if (buf[0] == '\n') - lineInfo[n].type = MT_COLOR_NORMAL; - else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t')) { - lineInfo[n].type = lineInfo[n - 1].type; /* wrapped line */ - (lineInfo[n].syntax)[0].color = (lineInfo[n - 1].syntax)[0].color; - } - else { - lineInfo[n].type = MT_COLOR_HDEFAULT; - color_line = ColorHdrList; - while (color_line) { - if (REGEXEC (&color_line->rx, buf) == 0) { - lineInfo[n].type = MT_COLOR_HEADER; - lineInfo[n].syntax[0].color = color_line->pair; - break; + COLOR_LINE *color_line; + regmatch_t pmatch[1], smatch[1]; + int found, offset, null_rx, i; + + if (n == 0 || ISHEADER (lineInfo[n - 1].type)) { + if (buf[0] == '\n') { + lineInfo[n].type = MT_COLOR_NORMAL; + } + else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t')) { + lineInfo[n].type = lineInfo[n - 1].type; /* wrapped line */ + (lineInfo[n].syntax)[0].color = (lineInfo[n - 1].syntax)[0].color; + } else { + lineInfo[n].type = MT_COLOR_HDEFAULT; + color_line = ColorHdrList; + while (color_line) { + if (REGEXEC (&color_line->rx, buf) == 0) { + lineInfo[n].type = MT_COLOR_HEADER; + lineInfo[n].syntax[0].color = color_line->pair; + break; + } + color_line = color_line->next; + } } - color_line = color_line->next; - } - } - } - else if (str_ncmp ("\033[0m", raw, 4) == 0) /* a little hack... */ - lineInfo[n].type = MT_COLOR_NORMAL; -#if 0 - else if (str_ncmp ("[-- ", buf, 4) == 0) - lineInfo[n].type = MT_COLOR_ATTACHMENT; -#else - else if (check_attachment_marker ((char *) raw) == 0) - lineInfo[n].type = MT_COLOR_ATTACHMENT; -#endif - else if (str_cmp ("-- \n", buf) == 0 - || str_cmp ("-- \r\n", buf) == 0) { - i = n + 1; - - lineInfo[n].type = MT_COLOR_SIGNATURE; - while (i < last && check_sig (buf, lineInfo, i - 1) == 0 && - (lineInfo[i].type == MT_COLOR_NORMAL || - lineInfo[i].type == MT_COLOR_QUOTED || - lineInfo[i].type == MT_COLOR_HEADER)) { - /* oops... */ - if (lineInfo[i].chunks) { - lineInfo[i].chunks = 0; - mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t)); - } - lineInfo[i++].type = MT_COLOR_SIGNATURE; } - } - else if (check_sig (buf, lineInfo, n - 1) == 0) - lineInfo[n].type = MT_COLOR_SIGNATURE; - else if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { - if (regexec ((regex_t *) Smileys.rx, buf, 1, smatch, 0) == 0) { - if (smatch[0].rm_so > 0) { - char c; - - /* hack to avoid making an extra copy of buf */ - c = buf[smatch[0].rm_so]; - buf[smatch[0].rm_so] = 0; - - if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { - if (q_classify && lineInfo[n].quote == NULL) - lineInfo[n].quote = classify_quote (QuoteList, - buf + pmatch[0].rm_so, - pmatch[0].rm_eo - - pmatch[0].rm_so, force_redraw, - q_level); - lineInfo[n].type = MT_COLOR_QUOTED; + else if (m_strncmp("\033[0m", rawbuf, 4) == 0) /* a little hack... */ + lineInfo[n].type = MT_COLOR_NORMAL; + else if (check_attachment_marker ((char *) rawbuf) == 0) + lineInfo[n].type = MT_COLOR_ATTACHMENT; + else if (m_strcmp("-- \n", buf) == 0 + || m_strcmp("-- \r\n", buf) == 0) { + i = n + 1; + + lineInfo[n].type = MT_COLOR_SIGNATURE; + while (i < last && check_sig(buf, lineInfo, i - 1) == 0 && + (lineInfo[i].type == MT_COLOR_NORMAL || + lineInfo[i].type == MT_COLOR_QUOTED || + lineInfo[i].type == MT_COLOR_HEADER)) { + /* oops... */ + if (lineInfo[i].chunks) { + lineInfo[i].chunks = 0; + p_realloc(&(lineInfo[n].syntax), 1); + } + lineInfo[i++].type = MT_COLOR_SIGNATURE; } - else - lineInfo[n].type = MT_COLOR_NORMAL; + } + else if (check_sig(buf, lineInfo, n - 1) == 0) + lineInfo[n].type = MT_COLOR_SIGNATURE; + else if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { + if (regexec ((regex_t *) Smileys.rx, buf, 1, smatch, 0) == 0) { + if (smatch[0].rm_so > 0) { + char c; + + /* hack to avoid making an extra copy of buf */ + c = buf[smatch[0].rm_so]; + buf[smatch[0].rm_so] = 0; + + if (regexec ((regex_t *) QuoteRegexp.rx, buf, 1, pmatch, 0) == 0) { + if (q_classify && lineInfo[n].quote == NULL) + lineInfo[n].quote = classify_quote (QuoteList, + buf + pmatch[0].rm_so, + pmatch[0].rm_eo - + pmatch[0].rm_so, force_redraw, + q_level); + lineInfo[n].type = MT_COLOR_QUOTED; + } else { + lineInfo[n].type = MT_COLOR_NORMAL; + } - buf[smatch[0].rm_so] = c; - } - else + buf[smatch[0].rm_so] = c; + } else { + lineInfo[n].type = MT_COLOR_NORMAL; + } + } else { + if (q_classify && lineInfo[n].quote == NULL) + lineInfo[n].quote = classify_quote (QuoteList, buf + pmatch[0].rm_so, + pmatch[0].rm_eo - pmatch[0].rm_so, + force_redraw, q_level); + lineInfo[n].type = MT_COLOR_QUOTED; + } + } else { lineInfo[n].type = MT_COLOR_NORMAL; } - else { - if (q_classify && lineInfo[n].quote == NULL) - lineInfo[n].quote = classify_quote (QuoteList, buf + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so, - force_redraw, q_level); - lineInfo[n].type = MT_COLOR_QUOTED; - } - } - else - lineInfo[n].type = MT_COLOR_NORMAL; - /* body patterns */ - if (lineInfo[n].type == MT_COLOR_NORMAL || - lineInfo[n].type == MT_COLOR_QUOTED) { - i = 0; + /* body patterns */ + if (lineInfo[n].type == MT_COLOR_NORMAL || + lineInfo[n].type == MT_COLOR_QUOTED) { + i = 0; - offset = 0; - lineInfo[n].chunks = 0; - do { - if (!buf[offset]) - break; + offset = 0; + lineInfo[n].chunks = 0; + do { + if (!buf[offset]) + break; - found = 0; - null_rx = 0; - color_line = ColorBodyList; - while (color_line) { - if (regexec (&color_line->rx, buf + offset, 1, pmatch, - (offset ? REG_NOTBOL : 0)) == 0) { - if (pmatch[0].rm_eo != pmatch[0].rm_so) { - if (!found) { - if (++(lineInfo[n].chunks) > 1) - mem_realloc (&(lineInfo[n].syntax), - (lineInfo[n].chunks) * - sizeof (struct syntax_t)); - } - i = lineInfo[n].chunks - 1; - pmatch[0].rm_so += offset; - pmatch[0].rm_eo += offset; - if (!found || - pmatch[0].rm_so < (lineInfo[n].syntax)[i].first || - (pmatch[0].rm_so == (lineInfo[n].syntax)[i].first && - pmatch[0].rm_eo > (lineInfo[n].syntax)[i].last)) { - (lineInfo[n].syntax)[i].color = color_line->pair; - (lineInfo[n].syntax)[i].first = pmatch[0].rm_so; - (lineInfo[n].syntax)[i].last = pmatch[0].rm_eo; - } - found = 1; + found = 0; null_rx = 0; - } - else - null_rx = 1; /* empty regexp; don't add it, but keep looking */ - } - color_line = color_line->next; - } + color_line = ColorBodyList; + while (color_line) { + if (regexec (&color_line->rx, buf + offset, 1, pmatch, + (offset ? REG_NOTBOL : 0)) == 0) { + if (pmatch[0].rm_eo != pmatch[0].rm_so) { + if (!found) { + if (++(lineInfo[n].chunks) > 1) + p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks); + } + i = lineInfo[n].chunks - 1; + pmatch[0].rm_so += offset; + pmatch[0].rm_eo += offset; + if (!found || + pmatch[0].rm_so < (lineInfo[n].syntax)[i].first || + (pmatch[0].rm_so == (lineInfo[n].syntax)[i].first && + pmatch[0].rm_eo > (lineInfo[n].syntax)[i].last)) { + (lineInfo[n].syntax)[i].color = color_line->pair; + (lineInfo[n].syntax)[i].first = pmatch[0].rm_so; + (lineInfo[n].syntax)[i].last = pmatch[0].rm_eo; + } + found = 1; + null_rx = 0; + } else { + null_rx = 1; /* empty regexp; don't add it, but keep looking */ + } + } + color_line = color_line->next; + } - if (null_rx) - offset++; /* avoid degenerate cases */ - else - offset = (lineInfo[n].syntax)[i].last; - } while (found || null_rx); - } + if (null_rx) + offset++; /* avoid degenerate cases */ + else + offset = lineInfo[n].syntax[i].last; + } while (found || null_rx); + } } -static int is_ansi (unsigned char *buf) +static int is_ansi(unsigned char *buf) { - while (*buf && (isdigit (*buf) || *buf == ';')) - buf++; - return (*buf == 'm'); + while (isdigit(*buf) || *buf == ';') + buf++; + return *buf == 'm'; } -static int check_attachment_marker (char *p) +static int check_attachment_marker(char *p) { - char *q = AttachmentMarker; - - for (; *p == *q && *q && *p && *q != '\a' && *p != '\a'; p++, q++); - return (int) (*p - *q); -} + char *q = AttachmentMarker; -static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) -{ - int x = pos; - - while (isdigit (buf[x]) || buf[x] == ';') - x++; - - /* Character Attributes */ - if (option (OPTALLOWANSI) && a != NULL && buf[x] == 'm') { - if (pos == x) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->attr = ANSI_OFF; - a->pair = -1; - } - while (pos < x) { - if (buf[pos] == '1' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_BOLD; - pos += 2; - } - else if (buf[pos] == '4' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_UNDERLINE; - pos += 2; - } - else if (buf[pos] == '5' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_BLINK; - pos += 2; - } - else if (buf[pos] == '7' && (pos + 1 == x || buf[pos + 1] == ';')) { - a->attr |= ANSI_REVERSE; - pos += 2; - } - else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->attr = ANSI_OFF; - a->pair = -1; - pos += 2; - } - else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->pair = -1; - a->attr |= ANSI_COLOR; - a->fg = buf[pos + 1] - '0'; - pos += 3; - } - else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); -#endif - a->pair = -1; - a->attr |= ANSI_COLOR; - a->bg = buf[pos + 1] - '0'; - pos += 3; - } - else { - while (pos < x && buf[pos] != ';') - pos++; - pos++; - } - } - } - pos = x; - return pos; + for (; *p == *q && *q && *p && *q != '\a' && *p != '\a'; p++, q++); + return (int)(*p - *q); } /* trim tail of buf so that it contains complete multibyte characters */ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { - mbstate_t mbstate; - size_t k; - - memset (&mbstate, 0, sizeof (mbstate)); - for (; len > 0; buf += k, len -= k) { - k = mbrtowc (NULL, (char *) buf, len, &mbstate); - if (k == -2) - break; - else if (k == -1 || k == 0) - k = 1; - } - *buf = '\0'; + mbstate_t mbstate; + ssize_t k; - return len; + p_clear(&mbstate, 1); + for (; len > 0; buf += k, len -= k) { + k = mbrtowc (NULL, (char *) buf, len, &mbstate); + if (k == -2) + break; + if (k == -1 || k == 0) + k = 1; + } + *buf = '\0'; + + return len; } static int -fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf, - unsigned char *fmt, size_t blen, int *buf_ready) +fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, + unsigned char *fmt, ssize_t blen, int *buf_ready) { - unsigned char *p; - static int b_read = 0; - - if (*buf_ready == 0) { - buf[blen - 1] = 0; - if (offset != *last_pos) - fseek (f, offset, 0); - if (fgets ((char *) buf, blen - 1, f) == NULL) { - fmt[0] = 0; - return (-1); - } - *last_pos = ftell (f); - b_read = (int) (*last_pos - offset); - *buf_ready = 1; - - /* incomplete mbyte characters trigger a segfault in regex processing for - * certain versions of glibc. Trim them if necessary. */ - if (b_read == blen - 2) - b_read -= trim_incomplete_mbyte(buf, b_read); - - /* copy "buf" to "fmt", but without bold and underline controls */ - p = buf; - while (*p) { - if (*p == '\010' && (p > buf)) { - if (*(p + 1) == '_') /* underline */ - p += 2; - else if (*(p + 1)) { /* bold or overstrike */ - *(fmt - 1) = *(p + 1); - p += 2; + unsigned char *p; + static int b_read = 0; + + if (*buf_ready == 0) { + buf[blen - 1] = 0; + if (offset != *last_pos) + fseeko (f, offset, 0); + if (fgets ((char *) buf, blen - 1, f) == NULL) { + fmt[0] = 0; + return -1; } - else /* ^H */ - *fmt++ = *p++; - } - else if (*p == '\033' && *(p + 1) == '[' && is_ansi (p + 2)) { - while (*p++ != 'm') /* skip ANSI sequence */ - ; - } - else if (*p == '\033' && *(p + 1) == ']' - && check_attachment_marker ((char *) p) == 0) { - debug_print (2, ("seen attachment marker.\n")); - while (*p++ != '\a') /* skip pseudo-ANSI sequence */ - ; - } - else - *fmt++ = *p++; + *last_pos = ftello (f); + b_read = (int) (*last_pos - offset); + *buf_ready = 1; + + /* incomplete mbyte characters trigger a segfault in regex processing for + * certain versions of glibc. Trim them if necessary. */ + if (b_read == blen - 2) + b_read -= trim_incomplete_mbyte(buf, b_read); + + /* copy "buf" to "fmt", but without bold and underline controls */ + p = buf; + while (*p) { + if (*p == '\010' && (p > buf)) { + if (*(p + 1) == '_') /* underline */ + p += 2; + else if (*(p + 1)) { /* bold or overstrike */ + *(fmt - 1) = *(p + 1); + p += 2; + } else { /* ^H */ + *fmt++ = *p++; + } + } + else if (*p == '\033' && *(p + 1) == '[' && is_ansi (p + 2)) { + while (*p++ != 'm') /* skip ANSI sequence */ + ; + } + else if (*p == '\033' && *(p + 1) == ']' + && check_attachment_marker ((char *) p) == 0) { + while (*p++ != '\a') /* skip pseudo-ANSI sequence */ + ; + } else { + *fmt++ = *p++; + } + } + *fmt = 0; } - *fmt = 0; - } - return b_read; + return b_read; } -#ifdef USE_NNTP -#include "mx.h" -#include "nntp.h" -#endif - - static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, int flags, ansi_attr * pa, int cnt, int *pspace, int *pvch, int *pcol, int *pspecial) @@ -967,23 +826,24 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, wchar_t wc; mbstate_t mbstate; - int wrap_cols = COLS; + int wrap_cols = getmaxx(main_w); if (!(flags & (M_SHOWFLAT))) wrap_cols -= WrapMargin; - wrap_cols -= SidebarWidth; if (wrap_cols <= 0) - wrap_cols = COLS; + wrap_cols = getmaxx(main_w); /* FIXME: this should come from lineInfo */ - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); for (ch = 0, vch = 0; ch < cnt; ch += k, vch += k) { /* Handle ANSI sequences */ while (cnt - ch >= 2 && buf[ch] == '\033' && buf[ch + 1] == '[' && - is_ansi (buf + ch + 2)) - ch = grok_ansi (buf, ch + 2, pa) + 1; + is_ansi (buf + ch + 2)) { + while (isdigit(buf[ch]) || buf[ch] == ';') + ch++; + } while (cnt - ch >= 2 && buf[ch] == '\033' && buf[ch + 1] == ']' && check_attachment_marker ((char *) buf + ch) == 0) { @@ -998,12 +858,11 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate); if (k == -2 || k == -1) { - debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno)); if (col + 4 > wrap_cols) break; col += 4; if (pa) - printw ("\\%03o", buf[ch]); + wprintw(main_w, "\\%03o", buf[ch]); k = 1; continue; } @@ -1012,7 +871,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, /* Handle backspace */ special = 0; - if (IsWPrint (wc)) { + if (iswprint(wc)) { wchar_t wc1; mbstate_t mbstate1; int k1, k2; @@ -1023,7 +882,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, &mbstate1), k1 - k > 0 && wc1 == '\b') && (wc1 = 0, k2 = mbrtowc (&wc1, (char *) buf + ch + k1, cnt - ch - k1, - &mbstate1), k2 > 0 && IsWPrint (wc1))) { + &mbstate1), k2 > 0 && iswprint(wc1))) { if (wc == wc1) { special |= (wc == '_' && special & A_UNDERLINE) ? A_UNDERLINE : A_BOLD; @@ -1031,8 +890,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, else if (wc == '_' || wc1 == '_') { special |= A_UNDERLINE; wc = (wc1 == '_') ? wc : wc1; - } - else { + } else { /* special = 0; / * overstrike: nothing to do! */ wc = wc1; } @@ -1049,7 +907,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, last_special = special; } - if (IsWPrint (wc)) { + if (iswprint(wc)) { if (wc == ' ') space = ch; t = wcwidth (wc); @@ -1057,7 +915,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, break; col += t; if (pa) - mutt_addwch (wc); + waddwch(main_w, wc); } else if (wc == '\n') break; @@ -1068,7 +926,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, break; if (pa) for (; col < t; col++) - addch (' '); + waddch(main_w, ' '); else col = t; } @@ -1077,21 +935,20 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, break; col += 2; if (pa) - printw ("^%c", ('@' + wc) & 0x7f); + wprintw(main_w, "^%c", ('@' + wc) & 0x7f); } else if (wc < 0x100) { if (col + 4 > wrap_cols) break; col += 4; if (pa) - printw ("\\%03o", wc); - } - else { + wprintw(main_w, "\\%03o", wc); + } else { if (col + 1 > wrap_cols) break; ++col; if (pa) - addch (replacement_char ()); + waddch(main_w, CharsetReplacement); } } *pspace = space; @@ -1117,9 +974,8 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, * 0 normal exit, line was not displayed * >0 normal exit, line was displayed */ - static int -display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, +display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, int *last, int *max, int flags, struct q_class_t **QuoteList, int *q_level, int *force_redraw, regex_t * SearchRE) { @@ -1140,12 +996,12 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, } if (*last == *max) { - mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES)); + p_realloc(lineInfo, *max += LINES); for (ch = *last; ch < *max; ch++) { - memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t)); + p_clear(&(*lineInfo)[ch], 1); (*lineInfo)[ch].type = -1; (*lineInfo)[ch].search_cnt = -1; - (*lineInfo)[ch].syntax = mem_malloc (sizeof (struct syntax_t)); + (*lineInfo)[ch].syntax = p_new(struct syntax_t, 1); ((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last = -1; } @@ -1160,7 +1016,7 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, &buf_ready) < 0) { if (change_last) (*last)--; - return (-1); + return -1; } resolve_types ((char *) fmt, (char *) buf, *lineInfo, n, *last, @@ -1192,7 +1048,7 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, &buf_ready) < 0) { if (change_last) (*last)--; - return (-1); + return -1; } regexec ((regex_t *) QuoteRegexp.rx, (char *) fmt, 1, pmatch, 0); (*lineInfo)[n].quote = classify_quote (QuoteList, @@ -1208,7 +1064,7 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, &buf_ready) < 0) { if (change_last) (*last)--; - return (-1); + return -1; } offset = 0; @@ -1217,10 +1073,9 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, (SearchRE, (char *) fmt + offset, 1, pmatch, (offset ? REG_NOTBOL : 0)) == 0) { if (++((*lineInfo)[n].search_cnt) > 1) - mem_realloc (&((*lineInfo)[n].search), - ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t)); + p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt); else - (*lineInfo)[n].search = mem_malloc (sizeof (struct syntax_t)); + (*lineInfo)[n].search = p_new(struct syntax_t, 1); pmatch[0].rm_so += offset; pmatch[0].rm_eo += offset; ((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first = @@ -1239,24 +1094,23 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, if (!(flags & M_SHOW) && (*lineInfo)[n + 1].offset > 0) { /* we've already scanned this line, so just exit */ - return (0); + return 0; } if ((flags & M_SHOWCOLOR) && *force_redraw && (*lineInfo)[n + 1].offset > 0) { /* no need to try to display this line... */ - return (1); /* fake display */ + return 1; /* fake display */ } if ((b_read = fill_buffer (f, last_pos, (*lineInfo)[n].offset, buf, fmt, sizeof (buf), &buf_ready)) < 0) { if (change_last) (*last)--; - return (-1); + return -1; } /* now chose a good place to break the line */ - cnt = - format_line (lineInfo, n, buf, flags, 0, b_read, &ch, &vch, &col, - &special); + cnt = format_line(lineInfo, n, buf, flags, 0, b_read, &ch, &vch, &col, + &special); buf_ptr = buf + cnt; /* move the break point only if smart_wrap is set */ @@ -1273,9 +1127,9 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, buf_ptr = buf + cnt; else cnt = ch + 1; - } - else + } else { buf_ptr = buf + cnt; /* a very long word... */ + } } if (!(flags & M_PAGER_NSKIP)) /* skip leading blanks on the next line too */ @@ -1299,22 +1153,14 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, /* display the line */ format_line (lineInfo, n, buf, flags, &a, cnt, &ch, &vch, &col, &special); - /* avoid a bug in ncurses... */ -#ifndef USE_SLANG_CURSES - if (col == 0) { - SETCOLOR (MT_COLOR_NORMAL); - addch (' '); - } -#endif - /* end the last color pattern (needed by S-Lang) */ - if (special || (col != COLS && (flags & (M_SHOWCOLOR | M_SEARCH)))) - resolve_color (*lineInfo, n, vch, flags, 0, &a); + if (special || (col != getmaxx(main_w) && (flags & (M_SHOWCOLOR | M_SEARCH)))) + resolve_color(*lineInfo, n, vch, flags, 0, &a); /* * Fill the blank space at the end of the line with the prevailing color. - * ncurses does an implicit clrtoeol() when you do addch('\n') so we have - * to make sure to reset the color *after* that + * ncurses does an implicit wclrtoeol(main_w) when you do waddch(main_w, + * '\n') so we have to make sure to reset the color *after* that */ if (flags & M_SHOWCOLOR) { m = ((*lineInfo)[n].continuation) ? ((*lineInfo)[n].syntax)[0].first : n; @@ -1323,36 +1169,26 @@ display_line (FILE * f, long *last_pos, struct line_t **lineInfo, int n, else def_color = ColorDefs[(*lineInfo)[m].type]; - attrset (def_color); -#ifdef HAVE_BKGDSET - bkgdset (def_color | ' '); -#endif + wattrset(main_w, def_color); + wbkgdset(main_w, def_color | ' '); } - - /* ncurses always wraps lines when you get to the right side of the - * screen, but S-Lang seems to only wrap if the next character is *not* - * a newline (grr!). - */ -#ifndef USE_SLANG_CURSES - if (col < COLS) -#endif - addch ('\n'); + waddch(main_w, '\n'); /* * reset the color back to normal. This *must* come after the - * addch('\n'), otherwise the color for this line will not be + * waddch(main_w, '\n'), otherwise the color for this line will not be * filled to the right margin. */ if (flags & M_SHOWCOLOR) { - SETCOLOR (MT_COLOR_NORMAL); - BKGDSET (MT_COLOR_NORMAL); + SETCOLOR(main_w, MT_COLOR_NORMAL); + BKGDSET(main_w, MT_COLOR_NORMAL); } /* build a return code */ if (!(flags & M_SHOW)) flags = 0; - return (flags); + return flags; } static int upNLines (int nlines, struct line_t *info, int cur, int hiding) @@ -1366,32 +1202,6 @@ static int upNLines (int nlines, struct line_t *info, int cur, int hiding) return cur; } -static struct mapping_t PagerHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("PrevPg"), OP_PREV_PAGE}, - {N_("NextPg"), OP_NEXT_PAGE}, - {NULL, 0} -}; -static struct mapping_t PagerHelpExtra[] = { - {N_("View Attachm."), OP_VIEW_ATTACHMENTS}, - {N_("Del"), OP_DELETE}, - {N_("Reply"), OP_REPLY}, - {N_("Next"), OP_MAIN_NEXT_UNDELETED}, - {NULL, 0} -}; - -#ifdef USE_NNTP -static struct mapping_t PagerNewsHelpExtra[] = { - {N_("Post"), OP_POST}, - {N_("Followup"), OP_FOLLOWUP}, - {N_("Del"), OP_DELETE}, - {N_("Next"), OP_MAIN_NEXT_UNDELETED}, - {NULL, 0} -}; -#endif - - - /* This pager is actually not so simple as it once was. It now operates in two modes: one for viewing messages and the other for viewing help. These can be distinguished by whether or not ``hdr'' is NULL. The ``hdr'' arg @@ -1402,8 +1212,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) { static char searchbuf[STRING]; char buffer[LONG_STRING]; - char helpstr[SHORT_STRING * 2]; - char tmphelp[SHORT_STRING * 2]; int maxLine, lastLine = 0; struct line_t *lineInfo; struct q_class_t *QuoteList = NULL; @@ -1412,7 +1220,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) int r = -1; int redraw = REDRAW_FULL; FILE *fp = NULL; - long last_pos = 0, last_offset = 0; + off_t last_pos = 0, last_offset = 0; int old_smart_wrap, old_markers; struct stat sb; regex_t SearchRE; @@ -1421,32 +1229,26 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) int bodyoffset = 1; /* offset of first line of real text */ int statusoffset = 0; /* offset for the status bar */ - int helpoffset = LINES - 2; /* offset for the help bar. */ int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */ - MUTTMENU *index = NULL; /* the Pager Index (PI) */ - int indexoffset = 0; /* offset for the PI */ - int indexlen = PagerIndexLines; /* indexlen not always == PIL */ + MUTTMENU *pager_index = NULL; /* the Pager Index (PI) */ + int indexlen = PagerIndexLines; /* indexlen not always == PIL */ int indicator = indexlen / 3; /* the indicator line of the PI */ int old_PagerIndexLines; /* some people want to resize it * while inside the pager... */ -#ifdef USE_NNTP - char *followup_to; -#endif - if (!(flags & M_SHOWCOLOR)) flags |= M_SHOWFLAT; if ((fp = fopen (fname, "r")) == NULL) { mutt_perror (fname); - return (-1); + return -1; } if (stat (fname, &sb) != 0) { mutt_perror (fname); - fclose (fp); - return (-1); + m_fclose(&fp); + return -1; } unlink (fname); @@ -1457,44 +1259,22 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) mutt_set_flag (Context, extra->hdr, M_READ, 1); } - lineInfo = mem_malloc (sizeof (struct line_t) * (maxLine = LINES)); + lineInfo = p_new(struct line_t, maxLine = LINES); for (i = 0; i < maxLine; i++) { - memset (&lineInfo[i], 0, sizeof (struct line_t)); + p_clear(&lineInfo[i], 1); lineInfo[i].type = -1; lineInfo[i].search_cnt = -1; - lineInfo[i].syntax = mem_malloc (sizeof (struct syntax_t)); + lineInfo[i].syntax = p_new(struct syntax_t, 1); (lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1; } - mutt_compile_help (helpstr, sizeof (helpstr), MENU_PAGER, PagerHelp); - if (IsHeader (extra)) { - strfcpy (tmphelp, helpstr, sizeof (tmphelp)); - mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER, -#ifdef USE_NNTP - (Context - && (Context->magic == M_NNTP)) ? PagerNewsHelpExtra : -#endif - PagerHelpExtra); - snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer); - } - if (!InHelp) { - strfcpy (tmphelp, helpstr, sizeof (tmphelp)); - mutt_make_help (buffer, sizeof (buffer), _("Help"), MENU_PAGER, OP_HELP); - snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer); - } - while (ch != -1) { mutt_curs_set (0); - -#ifdef USE_IMAP imap_keepalive (); -#endif if (redraw & REDRAW_FULL) { - SETCOLOR (MT_COLOR_NORMAL); - /* clear() doesn't optimize screen redraws */ - move (0, 0); - clrtobot (); + SETCOLOR(main_w, MT_COLOR_NORMAL); + werase(main_w); if (IsHeader (extra) && Context->vcount + 1 < PagerIndexLines) indexlen = Context->vcount + 1; @@ -1503,33 +1283,14 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) indicator = indexlen / 3; - if (option (OPTSTATUSONTOP)) { - indexoffset = 0; - statusoffset = IsHeader (extra) ? indexlen : 0; - bodyoffset = statusoffset + 1; - helpoffset = LINES - 2; - bodylen = helpoffset - bodyoffset; - if (!option (OPTHELP)) - bodylen++; - } - else { - helpoffset = 0; - indexoffset = 1; - statusoffset = LINES - 2; - if (!option (OPTHELP)) - indexoffset = 0; - bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0); - bodylen = statusoffset - bodyoffset; - } + statusoffset = IsHeader (extra) ? indexlen : 0; + bodyoffset = statusoffset + 1; + bodylen = LINES - 2 - bodyoffset; - if (option (OPTHELP)) { - SETCOLOR (MT_COLOR_STATUS); - move (helpoffset, 0); - mutt_paddstr (COLS, helpstr); - SETCOLOR (MT_COLOR_NORMAL); - } + SETCOLOR(main_w, MT_COLOR_SIDEBAR); + mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w)); + SETCOLOR(main_w, MT_COLOR_NORMAL); -#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM) if (Resize != NULL) { if ((SearchCompiled = Resize->SearchCompiled)) { REGCOMP @@ -1540,36 +1301,34 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lines = Resize->line; redraw |= REDRAW_SIGWINCH; - mem_free (&Resize); + p_delete(&Resize); } -#endif if (IsHeader (extra) && PagerIndexLines) { - if (index == NULL) { + if (pager_index == NULL) { /* only allocate the space if/when we need the index. Initialise the menu as per the main index */ - index = mutt_new_menu (); - index->menu = MENU_MAIN; - index->make_entry = index_make_entry; - index->color = index_color; - index->max = Context->vcount; - index->current = extra->hdr->virtual; + pager_index = mutt_new_menu (); + pager_index->menu = MENU_MAIN; + pager_index->make_entry = index_make_entry; + pager_index->color = index_color; + pager_index->max = Context->vcount; + pager_index->current = extra->hdr->virtual; } - SETCOLOR (MT_COLOR_NORMAL); - index->offset = indexoffset + (option (OPTSTATUSONTOP) ? 1 : 0); - - index->pagelen = indexlen - 1; + SETCOLOR(main_w, MT_COLOR_NORMAL); + pager_index->offset = 1; + pager_index->pagelen = indexlen - 1; /* some fudge to work out where abouts the indicator should go */ - if (index->current - indicator < 0) - index->top = 0; - else if (index->max - index->current < index->pagelen - indicator) - index->top = index->max - index->pagelen; + if (pager_index->current - indicator < 0) + pager_index->top = 0; + else if (pager_index->max - pager_index->current < pager_index->pagelen - indicator) + pager_index->top = pager_index->max - pager_index->pagelen; else - index->top = index->current - indicator; + pager_index->top = pager_index->current - indicator; - menu_redraw_index (index); + menu_redraw_index (pager_index); } redraw |= REDRAW_BODY | REDRAW_INDEX | REDRAW_STATUS; @@ -1593,7 +1352,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if ((redraw & REDRAW_BODY) || topline != oldtopline) { do { - move (bodyoffset, SidebarWidth); + wmove(main_w, bodyoffset, 0); curline = oldtopline = topline; lines = 0; force_redraw = 0; @@ -1606,21 +1365,21 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) &SearchRE) > 0) lines++; curline++; - move (lines + bodyoffset, SidebarWidth); + wmove(main_w, lines + bodyoffset, 0); redraw |= REDRAW_SIDEBAR; } last_offset = lineInfo[curline].offset; } while (force_redraw); - SETCOLOR (MT_COLOR_TILDE); - BKGDSET (MT_COLOR_TILDE); + SETCOLOR(main_w, MT_COLOR_TILDE); + BKGDSET(main_w, MT_COLOR_TILDE); while (lines < bodylen) { - clrtoeol (); + wclrtoeol(main_w); if (option (OPTTILDE)) - addch ('~'); - addch ('\n'); + waddch(main_w, '~'); + waddch(main_w, '\n'); lines++; - move (lines + bodyoffset, SidebarWidth); + wmove(main_w, lines + bodyoffset, 0); } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ @@ -1630,67 +1389,70 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (redraw & REDRAW_STATUS) { /* print out the pager status bar */ - SETCOLOR (MT_COLOR_STATUS); - BKGDSET (MT_COLOR_STATUS); - CLEARLINE_WIN (statusoffset); + SETCOLOR(main_w, MT_COLOR_STATUS); + BKGDSET(main_w, MT_COLOR_STATUS); + wmove(main_w, statusoffset, 0); + wclrtoeol(main_w); if (IsHeader (extra)) { - size_t l1 = (COLS - 9) * MB_LEN_MAX; + size_t l1 = (getmaxx(main_w) - 9) * MB_LEN_MAX; size_t l2 = sizeof (buffer); _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), Context, extra->hdr, M_FORMAT_MAKEPRINT); } else if (IsMsgAttach (extra)) { - size_t l1 = (COLS - 9) * MB_LEN_MAX; + size_t l1 = (getmaxx(main_w) - 9) * MB_LEN_MAX; size_t l2 = sizeof (buffer); _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT); } - if (option(OPTSTATUSONTOP)) { - move(0,0); - } - /*move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (InHelp?(LINES-2):(indexlen - 1))), - option (OPTSTATUSONTOP) ? 0 : SidebarWidth);*/ - mutt_paddstr (COLS - 10 - (option(OPTSTATUSONTOP)?0:SidebarWidth), IsHeader (extra) - || IsMsgAttach (extra) ? buffer : banner); + wmove(main_w, statusoffset, 0); + mutt_paddstr(main_w, getmaxx(main_w) - 10, + IsHeader(extra) || IsMsgAttach(extra) ? buffer : banner); - addstr (" -- ("); + waddstr(main_w, " -- ("); if (last_pos < sb.st_size - 1) - printw ("%d%%)", (int) (100 * last_offset / sb.st_size)); + wprintw(main_w, "%d%%)", (int) (100 * last_offset / sb.st_size)); else - addstr (topline == 0 ? "all)" : "end)"); - BKGDSET (MT_COLOR_NORMAL); - SETCOLOR (MT_COLOR_NORMAL); + waddstr(main_w, topline == 0 ? "all)" : "end)"); + BKGDSET(main_w, MT_COLOR_NORMAL); + SETCOLOR(main_w, MT_COLOR_NORMAL); } if (redraw & REDRAW_SIDEBAR) - sidebar_draw (MENU_PAGER); + sidebar_draw (); - if ((redraw & REDRAW_INDEX) && index) { + if ((redraw & REDRAW_INDEX) && pager_index) { /* redraw the pager_index indicator, because the * flags for this message might have changed. */ - menu_redraw_current (index); - sidebar_draw (MENU_PAGER); - /* print out the index status bar */ - menu_status_line (buffer, sizeof (buffer), index, NONULL (Status)); - move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), - option (OPTSTATUSONTOP) ? 0 : SidebarWidth); - SETCOLOR (MT_COLOR_STATUS); - BKGDSET (MT_COLOR_STATUS); - mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SidebarWidth), - buffer); - SETCOLOR (MT_COLOR_NORMAL); - BKGDSET (MT_COLOR_NORMAL); + menu_redraw_current (pager_index); + sidebar_draw (); + /* print out the pager_index status bar */ + menu_status_line (buffer, sizeof (buffer), pager_index, NONULL (Status)); + wmove(main_w, 0, 0); + SETCOLOR(main_w, MT_COLOR_STATUS); + BKGDSET(main_w, MT_COLOR_STATUS); + mutt_paddstr(main_w, getmaxx(main_w), buffer); + SETCOLOR(main_w, MT_COLOR_NORMAL); + BKGDSET(main_w, MT_COLOR_NORMAL); } - /* if we're not using the index, update every time */ - if (index == 0) - sidebar_draw (MENU_PAGER); + sidebar_draw (); redraw = 0; + mutt_refresh(); + + if (IsHeader (extra) && OldHdr == extra->hdr && TopLine != topline + && lineInfo[curline].offset < sb.st_size-1) { + if (TopLine - topline > lines) + topline += lines; + else + topline = TopLine; + continue; + } else { + OldHdr = NULL; + } - move (statusoffset, COLS - 1); - mutt_refresh (); ch = km_dokey (MENU_PAGER); if (ch != -1) mutt_clear_error (); @@ -1700,9 +1462,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) mutt_query_exit (); continue; } -#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM) - else if (SigWinch) { - mutt_resize_screen (); + + if (SigWinch) { + ui_layout_resize(); /* Store current position. */ lines = -1; @@ -1711,7 +1473,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lines++; if (flags & M_PAGER_RETWINCH) { - Resize = mem_malloc (sizeof (struct resize)); + Resize = p_new(struct resize, 1); Resize->line = lines; Resize->SearchCompiled = SearchCompiled; @@ -1719,8 +1481,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) ch = -1; rc = OP_REFORMAT_WINCH; - } - else { + } else { for (i = 0; i < maxLine; i++) { lineInfo[i].offset = 0; lineInfo[i].type = -1; @@ -1729,9 +1490,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lineInfo[i].search_cnt = -1; lineInfo[i].quote = NULL; - mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)); - if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_realloc(&lineInfo[i].syntax, 1); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } lastLine = 0; @@ -1740,13 +1501,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) redraw = REDRAW_FULL | REDRAW_SIGWINCH; ch = 0; } - - SigWinch = 0; - clearok (stdscr, TRUE); /*force complete redraw */ continue; } -#endif - else if (ch == -1) { + + if (ch == -1) { ch = 0; continue; } @@ -1766,8 +1524,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) else if (option (OPTPAGERSTOP)) { /* emulate "less -q" and don't go on to the next message. */ mutt_error _("Bottom of message is shown."); - } - else { + } else { /* end of the current message, so display the next message. */ rc = OP_MAIN_NEXT_UNDELETED; ch = -1; @@ -1824,8 +1581,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) else if (option (OPTPAGERSTOP)) { /* emulate "less -q" and don't go on to the next message. */ mutt_error _("Bottom of message is shown."); - } - else { + } else { /* end of the current message, so display the next message. */ rc = OP_MAIN_NEXT_UNDELETED; ch = -1; @@ -1874,13 +1630,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) case OP_SEARCH: case OP_SEARCH_REVERSE: - strfcpy (buffer, searchbuf, sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), searchbuf); if (mutt_get_field ((SearchBack ? _("Reverse search: ") : _("Search: ")), buffer, sizeof (buffer), M_CLEAR) != 0) break; - if (!strcmp (buffer, searchbuf)) { + if (!m_strcmp (buffer, searchbuf)) { if (SearchCompiled) { /* do an implicit search-next */ if (ch == OP_SEARCH) @@ -1895,7 +1651,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (!buffer[0]) break; - strfcpy (searchbuf, buffer, sizeof (searchbuf)); + m_strcpy(searchbuf, sizeof(searchbuf), buffer); /* leave SearchBack alone if ch == OP_SEARCH_NEXT */ if (ch == OP_SEARCH) @@ -1906,8 +1662,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (SearchCompiled) { regfree (&SearchRE); for (i = 0; i < lastLine; i++) { - if (lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&lineInfo[i].search); lineInfo[i].search_cnt = -1; } } @@ -1920,8 +1675,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) regfree (&SearchRE); for (i = 0; i < maxLine; i++) { /* cleanup */ - if (lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&lineInfo[i].search); lineInfo[i].search_cnt = -1; } SearchFlag = 0; @@ -2061,7 +1815,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) break; case OP_REDRAW: - clearok (stdscr, TRUE); + clearok(main_w, TRUE); redraw = REDRAW_FULL; break; @@ -2097,8 +1851,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) case OP_CHECK_TRADITIONAL: CHECK_MODE (IsHeader (extra)); - if (!(WithCrypto & APPLICATION_PGP)) - break; if (!(extra->hdr->security & PGP_TRADITIONAL_CHECKED)) { ch = -1; rc = OP_CHECK_TRADITIONAL; @@ -2182,9 +1934,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } if (old_PagerIndexLines != PagerIndexLines) { - if (index) - mutt_menuDestroy (&index); - index = NULL; + if (pager_index) + mutt_menuDestroy (&pager_index); + pager_index = NULL; } if (option (OPTWRAP) != old_smart_wrap || @@ -2211,9 +1963,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) lineInfo[i].search_cnt = -1; lineInfo[i].quote = NULL; - mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)); - if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_realloc(&(lineInfo[i].syntax), 1); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } if (SearchCompiled) { @@ -2284,70 +2036,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) redraw = REDRAW_FULL; break; -#ifdef USE_NNTP - case OP_POST: - CHECK_MODE (IsHeader (extra) && !IsAttach (extra)); - CHECK_ATTACH; - if (extra->ctx && extra->ctx->magic == M_NNTP && - !((NNTP_DATA *) extra->ctx->data)->allowed && - query_quadoption (OPT_TOMODERATED, - _ - ("Posting to this group not allowed, may be moderated. Continue?")) - != M_YES) - break; - ci_send_message (SENDNEWS, NULL, NULL, extra->ctx, NULL); - redraw = REDRAW_FULL; - break; - - case OP_FORWARD_TO_GROUP: - CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra)); - CHECK_ATTACH; - if (extra->ctx && extra->ctx->magic == M_NNTP && - !((NNTP_DATA *) extra->ctx->data)->allowed && - query_quadoption (OPT_TOMODERATED, - _ - ("Posting to this group not allowed, may be moderated. Continue?")) - != M_YES) - break; - if (IsMsgAttach (extra)) - mutt_attach_forward (extra->fp, extra->hdr, extra->idx, - extra->idxlen, extra->bdy, SENDNEWS); - else - ci_send_message (SENDNEWS | SENDFORWARD, NULL, NULL, extra->ctx, - extra->hdr); - redraw = REDRAW_FULL; - break; - - case OP_FOLLOWUP: - CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra)); - CHECK_ATTACH; - - if (IsMsgAttach (extra)) - followup_to = extra->bdy->hdr->env->followup_to; - else - followup_to = extra->hdr->env->followup_to; - - if (!followup_to || str_casecmp (followup_to, "poster") || - query_quadoption (OPT_FOLLOWUPTOPOSTER, - _("Reply by mail as poster prefers?")) != M_YES) { - if (extra->ctx && extra->ctx->magic == M_NNTP - && !((NNTP_DATA *) extra->ctx->data)->allowed - && query_quadoption (OPT_TOMODERATED, - _ - ("Posting to this group not allowed, may be moderated. Continue?")) - != M_YES) - break; - if (IsMsgAttach (extra)) - mutt_attach_reply (extra->fp, extra->hdr, extra->idx, - extra->idxlen, extra->bdy, SENDNEWS | SENDREPLY); - else - ci_send_message (SENDNEWS | SENDREPLY, NULL, NULL, - extra->ctx, extra->hdr); - redraw = REDRAW_FULL; - break; - } -#endif - case OP_REPLY: CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra)); CHECK_ATTACH; @@ -2404,11 +2092,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) break; case OP_DECRYPT_SAVE: - if (!WithCrypto) { - ch = -1; - break; - } - /* fall through */ case OP_SAVE: if (IsAttach (extra)) { mutt_save_attachment_list (extra->fp, 0, extra->bdy, extra->hdr, @@ -2420,10 +2103,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) case OP_DECODE_SAVE: case OP_DECODE_COPY: case OP_DECRYPT_COPY: - if (!WithCrypto && ch == OP_DECRYPT_COPY) { - ch = -1; - break; - } CHECK_MODE (IsHeader (extra)); if (mutt_save_message (extra->hdr, (ch == OP_DECRYPT_SAVE) || @@ -2523,11 +2202,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } break; - case OP_VERSION: - mutt_version (); - break; - case OP_BUFFY_LIST: + if (option (OPTFORCEBUFFYCHECK)) + buffy_check (1); buffy_list (); redraw |= REDRAW_SIDEBAR; break; @@ -2545,28 +2222,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) redraw = REDRAW_FULL; break; - - case OP_MAIL_KEY: - if (!(WithCrypto & APPLICATION_PGP)) { - ch = -1; - break; - } - CHECK_MODE (IsHeader (extra)); - CHECK_ATTACH; - ci_send_message (SENDKEY, NULL, NULL, extra->ctx, extra->hdr); - redraw = REDRAW_FULL; - break; - - - case OP_FORGET_PASSPHRASE: - crypt_forget_passphrase (); - break; - case OP_EXTRACT_KEYS: - if (!WithCrypto) { - ch = -1; - break; - } CHECK_MODE (IsHeader (extra)); crypt_extract_keys_from_messages (extra->hdr); redraw = REDRAW_FULL; @@ -2578,7 +2234,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) case OP_SIDEBAR_NEXT_NEW: case OP_SIDEBAR_PREV: case OP_SIDEBAR_PREV_NEW: - sidebar_scroll (ch, MENU_PAGER); + sidebar_scroll (ch); break; default: ch = -1; @@ -2586,23 +2242,34 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } } - fclose (fp); - if (IsHeader (extra)) + m_fclose(&fp); + if (IsHeader (extra)) { Context->msgnotreadyet = -1; + if (rc == -1) + OldHdr = NULL; + else { + TopLine = topline; + OldHdr = extra->hdr; + } + } - cleanup_quote (&QuoteList); + cleanup_quote(&QuoteList); for (i = 0; i < maxLine; i++) { - mem_free (&(lineInfo[i].syntax)); - if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&lineInfo[i].syntax); + if (SearchCompiled) + p_delete(&lineInfo[i].search); } if (SearchCompiled) { regfree (&SearchRE); SearchCompiled = 0; } - mem_free (&lineInfo); - if (index) - mutt_menuDestroy (&index); - return (rc != -1 ? rc : 0); + p_delete(&lineInfo); + if (pager_index) + mutt_menuDestroy (&pager_index); + return rc != -1 ? rc : 0; } + +#undef CHECK_ATTACH +#undef CHECK_READONLY +#undef CHECK_MODE