X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=bd1b2a8e21c8cb2fd353ce1f9f6e07365e7b2eb4;hp=9eb354790b3cbfa993c25c5cbcb03b338888e0c1;hb=9e6ab0152703ad301042ce8810859f41fbee405a;hpb=b17296ba049d71986028ac83f0b415a021d0691c diff --git a/pager.c b/pager.c index 9eb3547..bd1b2a8 100644 --- a/pager.c +++ b/pager.c @@ -15,6 +15,8 @@ # include "config.h" #endif +#include + #include "mutt.h" #include "enter.h" #include "mutt_curses.h" @@ -37,12 +39,12 @@ #include "mutt_crypt.h" -#include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" #include "lib/rx.h" #include "lib/debug.h" +#include #include #include #include @@ -57,6 +59,7 @@ #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) +#define SW (option(OPTMBOXPANE)?SidebarWidth:0) static const char *Not_available_in_this_menu = N_("Not available in this menu."); @@ -105,7 +108,7 @@ struct syntax_t { }; struct line_t { - long offset; + off_t offset; short type; short continuation; short chunks; @@ -351,8 +354,8 @@ static void cleanup_quote (struct q_class_t **QuoteList) cleanup_quote (&((*QuoteList)->down)); ptr = (*QuoteList)->next; if ((*QuoteList)->prefix) - mem_free (&(*QuoteList)->prefix); - mem_free (QuoteList); + p_delete(&(*QuoteList)->prefix); + p_delete(QuoteList); *QuoteList = ptr; } @@ -373,7 +376,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, /* not much point in classifying quotes... */ if (*QuoteList == NULL) { - class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)); + class = p_new(struct q_class_t, 1); class->color = ColorQuote[0]; *QuoteList = class; } @@ -394,10 +397,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, /* 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 = 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 */ @@ -497,11 +498,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, /* 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 = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); tmp->length = length; /* replace q_list by tmp */ @@ -594,10 +592,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, /* 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 = p_new(struct q_class_t, 1); + tmp->prefix = p_dupstr(qptr, length); tmp->length = length; if (ptr->down) { @@ -628,9 +624,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList, 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 = p_new(struct q_class_t, 1); + class->prefix = p_dupstr(qptr, length); class->length = length; new_class_color (class, q_level); @@ -704,7 +699,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last, /* oops... */ if (lineInfo[i].chunks) { lineInfo[i].chunks = 0; - mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t)); + p_realloc(&(lineInfo[n].syntax), 1); } lineInfo[i++].type = MT_COLOR_SIGNATURE; } @@ -768,9 +763,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last, 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)); + p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks); } i = lineInfo[n].chunks - 1; pmatch[0].rm_so += offset; @@ -832,6 +825,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) 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; @@ -850,12 +845,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) 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; + a->bg = -2; + a->fg = -2; pos += 2; } else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { @@ -865,7 +856,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) #endif a->pair = -1; a->attr |= ANSI_COLOR; - a->fg = buf[pos + 1] - '0'; + if (buf[pos + 1] != '9') + a->fg = buf[pos + 1] - '0'; pos += 3; } else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { @@ -875,7 +867,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) #endif a->pair = -1; a->attr |= ANSI_COLOR; - a->bg = buf[pos + 1] - '0'; + if (buf[pos + 1] != '9') + a->bg = buf[pos + 1] - '0'; pos += 3; } else { @@ -908,7 +901,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) { } static int -fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf, +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 *p; @@ -917,12 +910,12 @@ fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf, if (*buf_ready == 0) { buf[blen - 1] = 0; if (offset != *last_pos) - fseek (f, offset, 0); + fseeko (f, offset, 0); if (fgets ((char *) buf, blen - 1, f) == NULL) { fmt[0] = 0; return (-1); } - *last_pos = ftell (f); + *last_pos = ftello (f); b_read = (int) (*last_pos - offset); *buf_ready = 1; @@ -982,7 +975,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, if (!(flags & (M_SHOWFLAT))) wrap_cols -= WrapMargin; - wrap_cols -= SidebarWidth; + wrap_cols -= SW; if (wrap_cols <= 0) wrap_cols = COLS; @@ -1130,7 +1123,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, */ 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) { @@ -1151,12 +1144,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)); (*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; } @@ -1228,10 +1221,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 = @@ -1423,7 +1415,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; @@ -1468,12 +1460,12 @@ 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)); 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; } @@ -1535,8 +1527,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if (option (OPTHELP)) { SETCOLOR (MT_COLOR_STATUS); - move (helpoffset, 0); - mutt_paddstr (COLS, helpstr); + move (helpoffset, SW); + mutt_paddstr (COLS-SW, helpstr); SETCOLOR (MT_COLOR_NORMAL); } @@ -1551,7 +1543,7 @@ 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 @@ -1604,7 +1596,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) if ((redraw & REDRAW_BODY) || topline != oldtopline) { do { - move (bodyoffset, SidebarWidth); + move (bodyoffset, SW); curline = oldtopline = topline; lines = 0; force_redraw = 0; @@ -1617,7 +1609,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) &SearchRE) > 0) lines++; curline++; - move (lines + bodyoffset, SidebarWidth); + move (lines + bodyoffset, SW); redraw |= REDRAW_SIDEBAR; } last_offset = lineInfo[curline].offset; @@ -1631,7 +1623,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) addch ('~'); addch ('\n'); lines++; - move (lines + bodyoffset, SidebarWidth); + move (lines + bodyoffset, SW); } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ @@ -1658,13 +1650,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) _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); + move(statusoffset,SW); + mutt_paddstr (COLS - 10 - SW, IsHeader (extra) || + IsMsgAttach (extra) ? buffer : banner); addstr (" -- ("); if (last_pos < sb.st_size - 1) @@ -1685,12 +1673,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) 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); + move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SW); SETCOLOR (MT_COLOR_STATUS); BKGDSET (MT_COLOR_STATUS); - mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SidebarWidth), - buffer); + mutt_paddstr (COLS-SW, buffer); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); } @@ -1740,7 +1726,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; @@ -1758,9 +1744,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)); + p_realloc(&lineInfo[i].syntax, 1); if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } lastLine = 0; @@ -1936,7 +1922,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) 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; } } @@ -1950,7 +1936,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) 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; @@ -2240,9 +2226,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)); + p_realloc(&(lineInfo[i].syntax), 1); if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } if (SearchCompiled) { @@ -2631,15 +2617,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) cleanup_quote (&QuoteList); for (i = 0; i < maxLine; i++) { - mem_free (&(lineInfo[i].syntax)); + p_delete(&(lineInfo[i].syntax)); if (SearchCompiled && lineInfo[i].search) - mem_free (&(lineInfo[i].search)); + p_delete(&(lineInfo[i].search)); } if (SearchCompiled) { regfree (&SearchRE); SearchCompiled = 0; } - mem_free (&lineInfo); + p_delete(&lineInfo); if (index) mutt_menuDestroy (&index); return (rc != -1 ? rc : 0);