# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "lib/rx.h"
#include "lib/debug.h"
+#include <wchar.h>
#include <sys/stat.h>
#include <ctype.h>
#include <unistd.h>
#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.");
};
struct line_t {
- long offset;
+ off_t offset;
short type;
short continuation;
short chunks;
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;
}
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] == '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])) {
#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])) {
#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 {
}
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;
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;
if (!(flags & (M_SHOWFLAT)))
wrap_cols -= WrapMargin;
- wrap_cols -= SidebarWidth;
+ wrap_cols -= SW;
if (wrap_cols <= 0)
wrap_cols = COLS;
*/
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)
{
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;
}
mem_realloc (&((*lineInfo)[n].search),
((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
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 =
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;
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;
}
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);
}
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
- mem_free (&Resize);
+ p_delete(&Resize);
}
#endif
if ((redraw & REDRAW_BODY) || topline != oldtopline) {
do {
- move (bodyoffset, SidebarWidth);
+ move (bodyoffset, SW);
curline = oldtopline = topline;
lines = 0;
force_redraw = 0;
&SearchRE) > 0)
lines++;
curline++;
- move (lines + bodyoffset, SidebarWidth);
+ move (lines + bodyoffset, SW);
redraw |= REDRAW_SIDEBAR;
}
last_offset = lineInfo[curline].offset;
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. */
_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)
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);
}
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize = mem_malloc (sizeof (struct resize));
+ Resize = p_new(struct resize, 1);
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- mem_free (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
}
lastLine = 0;
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;
}
}
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;
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- mem_free (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
}
if (SearchCompiled) {
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);