* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
#include "mutt.h"
-#include "mutt_curses.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 "mutt_crypt.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/rx.h"
+#include <imap/imap_private.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <lib-crypt/crypt.h>
#define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
#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.");
static const char *Function_not_permitted_in_attach_message_mode =
N_("Function not permitted in attach-message mode.");
+/* 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 (); \
break; \
}
-#ifdef USE_IMAP
-/* the error message returned here could be better. */
-#define CHECK_IMAP_ACL(aclbit) if (Context->magic == M_IMAP) \
- if (mutt_bit_isset (((IMAP_DATA *)Context->data)->capabilities, ACL) \
- && !mutt_bit_isset(((IMAP_DATA *)Context->data)->rights,aclbit)){ \
- mutt_flushinp(); \
- mutt_error ("Operation not permitted by the IMAP ACL for this mailbox"); \
- break; \
- }
-#endif
-
struct q_class_t {
int length;
int index;
};
struct line_t {
- long offset;
+ off_t offset;
short type;
short continuation;
short chunks;
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;
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];
}
}
}
- new_class->index = index;
- new_class->color = ColorQuote[index % ColorQuoteUsed];
+ new_class->index = lindex;
+ new_class->color = ColorQuote[lindex % ColorQuoteUsed];
(*q_level)++;
}
cleanup_quote (&((*QuoteList)->down));
ptr = (*QuoteList)->next;
if ((*QuoteList)->prefix)
- FREE (&(*QuoteList)->prefix);
- FREE (QuoteList);
+ p_delete(&(*QuoteList)->prefix);
+ p_delete(QuoteList);
*QuoteList = ptr;
}
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... */
if (*QuoteList == NULL) {
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
+ class = p_new(struct q_class_t, 1);
class->color = ColorQuote[0];
*QuoteList = class;
}
if (length <= q_list->length) {
/* case 1: check the top level nodes */
- if (safe_strncmp (qptr, q_list->prefix, length) == 0) {
+ 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 =
- (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_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 */
if (q_list == *QuoteList)
*QuoteList = tmp;
- index = q_list->index;
+ lindex = q_list->index;
/* tmp should be the return class too */
class = tmp;
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;
/* tmp != NULL means we already found a shorter prefix at case 1 */
if (tmp == NULL
- && safe_strncmp (qptr, q_list->prefix, q_list->length) == 0) {
+ && m_strncmp(qptr, q_list->prefix, q_list->length) == 0) {
/* ok, it's a subclass somewhere on this branch */
ptr = q_list;
while (q_list) {
if (length <= q_list->length) {
- if (safe_strncmp (tail_qptr, (q_list->prefix) + offset, tail_lng)
+ if (m_strncmp(tail_qptr, (q_list->prefix) + offset, tail_lng)
== 0) {
/* same prefix: return the current class */
if (length == q_list->length)
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp = (struct q_class_t *) safe_calloc (1,
- sizeof (struct
- q_class_t));
- tmp->prefix = (char *) safe_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 */
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;
q_list->prev = ptr;
q_list->up = tmp;
- index = q_list->index;
+ lindex = q_list->index;
/* next class to test */
q_list = save;
else {
/* longer than the current prefix: try subclassing it */
if (tmp == NULL
- && safe_strncmp (tail_qptr, (q_list->prefix) + offset,
+ && m_strncmp(tail_qptr, (q_list->prefix) + offset,
q_list->length - offset) == 0) {
/* still a subclass: go down one level */
ptr = q_list;
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
- tmp =
- (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_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) {
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;
}
if (class == NULL) {
/* not found so far: add it as a top level class */
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- class->prefix = (char *) safe_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);
*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;
}
+static int brailleLine = -1;
+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)
{
int found, offset, null_rx, i;
if (n == 0 || ISHEADER (lineInfo[n - 1].type)) {
- if (buf[0] == '\n')
+ if (buf[0] == '\n') {
lineInfo[n].type = MT_COLOR_NORMAL;
+ getyx(stdscr, brailleLine, brailleCol);
+ }
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 if (safe_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 (safe_strncmp ("[-- ", buf, 4) == 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 (safe_strcmp ("-- \n", buf) == 0
- || safe_strcmp ("-- \r\n", buf) == 0) {
+ else if (m_strcmp("-- \n", buf) == 0
+ || m_strcmp("-- \r\n", buf) == 0) {
i = n + 1;
lineInfo[n].type = MT_COLOR_SIGNATURE;
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
- safe_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[n].syntax), 1);
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- safe_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;
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 {
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;
+ ssize_t k;
+
+ p_clear(&mbstate, 1);
+ 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';
+
+ 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);
+ 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;
+ /* 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) {
}
else if (*p == '\033' && *(p + 1) == ']'
&& check_attachment_marker ((char *) p) == 0) {
- dprint (2, (debugfile, "fill_buffer: Seen attachment marker.\n"));
while (*p++ != '\a') /* skip pseudo-ANSI sequence */
;
}
if (!(flags & (M_SHOWFLAT)))
wrap_cols -= WrapMargin;
- wrap_cols -= SidebarWidth;
+ wrap_cols -= SW;
if (wrap_cols <= 0)
wrap_cols = COLS;
/* 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 */
k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
if (k == -2 || k == -1) {
- dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
- __FILE__, __LINE__, k, errno));
if (col + 4 > wrap_cols)
break;
col += 4;
/* Handle backspace */
special = 0;
- if (IsWPrint (wc)) {
+ if (iswprint(wc)) {
wchar_t wc1;
mbstate_t mbstate1;
int k1, k2;
&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;
last_special = special;
}
- if (IsWPrint (wc)) {
+ if (iswprint(wc)) {
if (wc == ' ')
space = ch;
t = wcwidth (wc);
break;
++col;
if (pa)
- addch (replacement_char ());
+ addch (CharsetReplacement);
}
}
*pspace = space;
*/
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)
{
}
if (*last == *max) {
- safe_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 = safe_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;
}
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
- safe_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 = safe_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 =
/* skip trailing blanks */
while (ch && (buf[ch] == ' ' || buf[ch] == '\t' || buf[ch] == '\r'))
ch--;
- cnt = ch + 1;
+ /* a very long word with leading spaces causes infinite wrapping */
+ if ((!ch) && (flags & M_PAGER_NSKIP))
+ buf_ptr = buf + cnt;
+ else
+ cnt = ch + 1;
}
else
buf_ptr = buf + cnt; /* a very long word... */
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;
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 */
mutt_set_flag (Context, extra->hdr, M_READ, 1);
}
- lineInfo = safe_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 = safe_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));
+ m_strcpy(tmphelp, sizeof(tmphelp), helpstr);
mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER,
#ifdef USE_NNTP
(Context
snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
}
if (!InHelp) {
- strfcpy (tmphelp, helpstr, sizeof (tmphelp));
+ m_strcpy(tmphelp, sizeof(tmphelp), helpstr);
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);
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;
- 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);
+ 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;
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)
}
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);
+ 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);
- mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SidebarWidth),
- buffer);
+ BKGDSET (MT_COLOR_STATUS);
+ mutt_paddstr (COLS-SW, buffer);
SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET (MT_COLOR_NORMAL);
}
/* if we're not using the index, update every time */
if (index == 0)
- sidebar_draw (MENU_PAGER);
+ sidebar_draw ();
redraw = 0;
- move (statusoffset, COLS - 1);
+ if (option(OPTBRAILLEFRIENDLY)) {
+ if (brailleLine!=-1) {
+ move(brailleLine+1, 0);
+ brailleLine = -1;
+ }
+ } else
+ move (statusoffset, COLS-1);
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;
+
ch = km_dokey (MENU_PAGER);
if (ch != -1)
mutt_clear_error ();
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize = safe_malloc (sizeof (struct resize));
+ Resize = p_new(struct resize, 1);
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ p_realloc(&lineInfo[i].syntax, 1);
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
}
lastLine = 0;
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)
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)
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (lineInfo[i].search)
- 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)
- FREE (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
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;
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
mutt_set_flag (Context, extra->hdr, M_PURGED,
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 1,
ch == OP_DELETE_THREAD ? 0 : 1);
}
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 ||
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[i].syntax), 1);
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
}
if (SearchCompiled) {
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_POP
- if (Context->magic == M_POP) {
- mutt_flushinp ();
- mutt_error _("Can't change 'important' flag on POP server.");
-
- break;
- }
-#endif
-
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_WRITE);
-#endif
-
-#ifdef USE_NNTP
- if (Context->magic == M_NNTP) {
- mutt_flushinp ();
- mutt_error _("Can't change 'important' flag on NNTP server.");
-
- break;
- }
-#endif
+ CHECK_MX_ACL (Context, ACL_WRITE, _("Flagging"));
mutt_set_flag (Context, extra->hdr, M_FLAG, !extra->hdr->flagged);
redraw = REDRAW_STATUS | REDRAW_INDEX;
else
followup_to = extra->hdr->env->followup_to;
- if (!followup_to || safe_strcasecmp (followup_to, "poster") ||
+ 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
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,
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) ||
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_SEEN);
-#endif
+ CHECK_MX_ACL (Context, ACL_SEEN, _("Toggling"));
if (extra->hdr->read || extra->hdr->old)
mutt_set_flag (Context, extra->hdr, M_NEW, 1);
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
CHECK_MODE (IsHeader (extra));
CHECK_READONLY;
-#ifdef USE_IMAP
- CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+ CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
ch == OP_UNDELETE_THREAD ? 0 : 1)
break;
case OP_BUFFY_LIST:
- mutt_buffy_list ();
+ if (option (OPTFORCEBUFFYCHECK))
+ buffy_check (1);
+ buffy_list ();
redraw |= REDRAW_SIDEBAR;
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);
break;
case OP_EXTRACT_KEYS:
- if (!WithCrypto) {
- ch = -1;
- break;
- }
CHECK_MODE (IsHeader (extra));
crypt_extract_keys_from_messages (extra->hdr);
redraw = REDRAW_FULL;
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;
}
fclose (fp);
- if (IsHeader (extra))
+ if (IsHeader (extra)) {
Context->msgnotreadyet = -1;
+ if (rc == -1)
+ OldHdr = NULL;
+ else {
+ TopLine = topline;
+ OldHdr = extra->hdr;
+ }
+ }
cleanup_quote (&QuoteList);
for (i = 0; i < maxLine; i++) {
- FREE (&(lineInfo[i].syntax));
+ p_delete(&(lineInfo[i].syntax));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ p_delete(&(lineInfo[i].search));
}
if (SearchCompiled) {
regfree (&SearchRE);
SearchCompiled = 0;
}
- FREE (&lineInfo);
- if (index)
- mutt_menuDestroy (&index);
+ p_delete(&lineInfo);
+ if (pager_index)
+ mutt_menuDestroy (&pager_index);
return (rc != -1 ? rc : 0);
}
projects / apps / madmutt.git / blobdiff