X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=9c2d797bd41e1ba9f124ae114767729805f5c9d1;hp=f429e7760044f2a6549e6259dfc036a25aecd810;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1 diff --git a/pager.c b/pager.c index f429e77..9c2d797 100644 --- a/pager.c +++ b/pager.c @@ -11,46 +11,28 @@ * 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 +#include +#include +#include +#include #include "mutt.h" -#include "enter.h" -#include "mutt_curses.h" +#include "alias.h" #include "keymap.h" -#include "mutt_menu.h" #include "sort.h" #include "pager.h" #include "attach.h" #include "recvattach.h" -#include "mbyte.h" -#include "sidebar.h" +#include "charset.h" #include "buffy.h" -#include "mx.h" - -#ifdef USE_IMAP -#include "imap_private.h" -#endif - -#include "mutt_crypt.h" -#include "lib/rx.h" -#include "lib/debug.h" +#include -#include -#include -#include -#include -#include -#include -#include +#include #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) @@ -313,7 +295,7 @@ static void new_class_color (struct q_class_t *class, int *q_level) 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; @@ -321,7 +303,7 @@ shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class, new_class->index = -1; while (q_list) { - if (q_list->index >= index) { + if (q_list->index >= lindex) { q_list->index++; q_list->color = ColorQuote[q_list->index % ColorQuoteUsed]; } @@ -340,8 +322,8 @@ shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class, } } - new_class->index = index; - new_class->color = ColorQuote[index % ColorQuoteUsed]; + new_class->index = lindex; + new_class->color = ColorQuote[lindex % ColorQuoteUsed]; (*q_level)++; } @@ -370,7 +352,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, struct q_class_t *class = NULL, *tmp = NULL, *ptr, *save; char *tail_qptr; int offset, tail_lng; - int index = -1; + int lindex = -1; if (ColorQuoteUsed <= 1) { /* not much point in classifying quotes... */ @@ -423,7 +405,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, if (q_list == *QuoteList) *QuoteList = tmp; - index = q_list->index; + lindex = q_list->index; /* tmp should be the return class too */ class = tmp; @@ -456,7 +438,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, q_list->prev = ptr; q_list->up = tmp; - index = q_list->index; + lindex = q_list->index; /* next class to test; as above, we shouldn't go down */ q_list = save; @@ -523,7 +505,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, q_list->next = NULL; q_list->prev = NULL; - index = q_list->index; + lindex = q_list->index; /* tmp should be the return class too */ class = tmp; @@ -552,7 +534,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, q_list->prev = ptr; q_list->up = tmp; - index = q_list->index; + lindex = q_list->index; /* next class to test */ q_list = save; @@ -608,8 +590,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, return tmp; } else { - if (index != -1) - shift_class_colors (*QuoteList, tmp, index, q_level); + if (lindex != -1) + shift_class_colors (*QuoteList, tmp, lindex, q_level); return class; } @@ -636,8 +618,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, *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; } @@ -648,7 +630,7 @@ static int brailleCol = -1; 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) { @@ -678,13 +660,13 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last, } } } - else if (m_strncmp("\033[0m", raw, 4) == 0) /* a little hack... */ + else if (m_strncmp("\033[0m", rawbuf, 4) == 0) /* a little hack... */ lineInfo[n].type = MT_COLOR_NORMAL; #if 0 else if (m_strncmp("[-- ", buf, 4) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #else - else if (check_attachment_marker ((char *) raw) == 0) + else if (check_attachment_marker ((char *) rawbuf) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #endif else if (m_strcmp("-- \n", buf) == 0 @@ -885,7 +867,7 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) /* 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; + ssize_t k; p_clear(&mbstate, 1); for (; len > 0; buf += k, len -= k) { @@ -902,7 +884,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { static int fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, - unsigned char *fmt, size_t blen, int *buf_ready) + unsigned char *fmt, ssize_t blen, int *buf_ready) { unsigned char *p; static int b_read = 0; @@ -943,7 +925,6 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, } 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 */ ; } @@ -956,11 +937,9 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf, } #ifdef USE_NNTP -#include "mx.h" -#include "nntp.h" +#include #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) @@ -1002,7 +981,6 @@ 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; @@ -1016,7 +994,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; @@ -1027,7 +1005,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; @@ -1053,7 +1031,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); @@ -1095,7 +1073,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, break; ++col; if (pa) - addch (replacement_char ()); + addch (CharsetReplacement); } } *pspace = space; @@ -1427,7 +1405,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) 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) */ + MUTTMENU *pager_index = NULL; /* the Pager Index (PI) */ int indexoffset = 0; /* offset for the PI */ int indexlen = PagerIndexLines; /* indexlen not always == PIL */ int indicator = indexlen / 3; /* the indicator line of the PI */ @@ -1448,7 +1426,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (stat (fname, &sb) != 0) { mutt_perror (fname); - fclose (fp); + m_fclose(&fp); return (-1); } unlink (fname); @@ -1488,10 +1466,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) while (ch != -1) { mutt_curs_set (0); - -#ifdef USE_IMAP imap_keepalive (); -#endif if (redraw & REDRAW_FULL) { SETCOLOR (MT_COLOR_NORMAL); @@ -1548,31 +1523,31 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) #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); + pager_index->offset = indexoffset + (option (OPTSTATUSONTOP) ? 1 : 0); - index->pagelen = indexlen - 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; @@ -1664,15 +1639,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } 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)); + menu_redraw_current (pager_index); + sidebar_draw (); + /* print out the pager_index status bar */ + menu_status_line (buffer, sizeof (buffer), pager_index, NONULL (Status)); move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SW); SETCOLOR (MT_COLOR_STATUS); BKGDSET (MT_COLOR_STATUS); @@ -1682,7 +1657,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } /* if we're not using the index, update every time */ if (index == 0) - sidebar_draw (MENU_PAGER); + sidebar_draw (); redraw = 0; @@ -2195,9 +2170,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 || @@ -2576,7 +2551,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; @@ -2584,7 +2559,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) } } - fclose (fp); + m_fclose(&fp); if (IsHeader (extra)) { Context->msgnotreadyet = -1; if (rc == -1) @@ -2607,7 +2582,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) SearchCompiled = 0; } p_delete(&lineInfo); - if (index) - mutt_menuDestroy (&index); + if (pager_index) + mutt_menuDestroy (&pager_index); return (rc != -1 ? rc : 0); }