X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=2e29e65ad553a6db837086b5a986cac41d448f6f;hp=7132f32b3aa01458b29273c4983d6a902cf60947;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=8b89861e79d1b2e8ddcc54ea4d89957d6d10ebe6 diff --git a/pager.c b/pager.c index 7132f32..2e29e65 100644 --- a/pager.c +++ b/pager.c @@ -14,9 +14,8 @@ #include #include -#include #include -#include +#include #include #include "mutt.h" @@ -216,7 +215,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, if (special || a->attr) { 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; @@ -337,7 +336,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, class->color = ColorQuote[0]; *QuoteList = class; } - return (*QuoteList); + return *QuoteList; } /* Did I mention how much I like emulating Lisp in C? */ @@ -734,7 +733,7 @@ static int is_ansi(unsigned char *buf) { while (isdigit(*buf) || *buf == ';') buf++; - return (*buf == 'm'); + return *buf == 'm'; } static int check_attachment_marker(char *p) @@ -745,73 +744,6 @@ static int check_attachment_marker(char *p) return (int)(*p - *q); } -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) { - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); - a->attr = ANSI_OFF; - a->pair = -1; - } - a->bg = -2; - a->fg = -2; - 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] == ';')) { - a->bg = -2; - a->fg = -2; - pos += 2; - } - else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); - a->pair = -1; - a->attr |= ANSI_COLOR; - if (buf[pos + 1] != '9') - a->fg = buf[pos + 1] - '0'; - pos += 3; - } - else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { - if (a->pair != -1) - mutt_free_color (a->fg, a->bg); - a->pair = -1; - a->attr |= ANSI_COLOR; - if (buf[pos + 1] != '9') - a->bg = buf[pos + 1] - '0'; - pos += 3; - } else { - while (pos < x && buf[pos] != ';') - pos++; - pos++; - } - } - } - pos = x; - return pos; -} - /* 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; @@ -843,7 +775,7 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, fseeko (f, offset, 0); if (fgets ((char *) buf, blen - 1, f) == NULL) { fmt[0] = 0; - return (-1); + return -1; } *last_pos = ftello (f); b_read = (int) (*last_pos - offset); @@ -884,10 +816,6 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, return b_read; } -#ifdef USE_NNTP -#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) @@ -912,8 +840,10 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, 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) { @@ -1086,7 +1016,7 @@ display_line (FILE * f, off_t *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, @@ -1118,7 +1048,7 @@ display_line (FILE * f, off_t *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, @@ -1134,7 +1064,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, &buf_ready) < 0) { if (change_last) (*last)--; - return (-1); + return -1; } offset = 0; @@ -1164,18 +1094,18 @@ display_line (FILE * f, off_t *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 */ @@ -1258,7 +1188,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n, if (!(flags & M_SHOW)) flags = 0; - return (flags); + return flags; } static int upNLines (int nlines, struct line_t *info, int cur, int hiding) @@ -1299,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 *pager_index = NULL; /* the Pager Index (PI) */ - int indexoffset = 0; /* offset for the PI */ - int indexlen = PagerIndexLines; /* indexlen not always == PIL */ + 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); m_fclose(&fp); - return (-1); + return -1; } unlink (fname); @@ -1350,9 +1274,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (redraw & REDRAW_FULL) { SETCOLOR(main_w, MT_COLOR_NORMAL); - /* wclear(main_w) doesn't optimize screen redraws */ - wmove(main_w, 0, 0); - wclrtobot(main_w); + werase(main_w); if (IsHeader (extra) && Context->vcount + 1 < PagerIndexLines) indexlen = Context->vcount + 1; @@ -1361,23 +1283,12 @@ 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; - } else { - helpoffset = 0; - indexoffset = 1; - statusoffset = LINES - 2; - bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0); - bodylen = statusoffset - bodyoffset; - } + statusoffset = IsHeader (extra) ? indexlen : 0; + bodyoffset = statusoffset + 1; + bodylen = LINES - 2 - bodyoffset; - SETCOLOR(main_w, MT_COLOR_STATUS); - wmove(main_w, helpoffset, 0); - mutt_paddstr(main_w, getmaxx(main_w), ""); + SETCOLOR(main_w, MT_COLOR_SIDEBAR); + mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w)); SETCOLOR(main_w, MT_COLOR_NORMAL); if (Resize != NULL) { @@ -1406,8 +1317,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } SETCOLOR(main_w, MT_COLOR_NORMAL); - pager_index->offset = indexoffset + (option (OPTSTATUSONTOP) ? 1 : 0); - + pager_index->offset = 1; pager_index->pagelen = indexlen - 1; /* some fudge to work out where abouts the indicator should go */ @@ -1520,17 +1430,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) sidebar_draw (); /* print out the pager_index status bar */ menu_status_line (buffer, sizeof (buffer), pager_index, NONULL (Status)); - wmove(main_w, indexoffset + (option(OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0); + 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 (); + sidebar_draw (); redraw = 0; mutt_refresh(); @@ -2128,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_t *) 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_t *) 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 || m_strcasecmp(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_t *) 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; @@ -2358,10 +2202,6 @@ 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); @@ -2427,7 +2267,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) p_delete(&lineInfo); if (pager_index) mutt_menuDestroy (&pager_index); - return (rc != -1 ? rc : 0); + return rc != -1 ? rc : 0; } #undef CHECK_ATTACH