projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the C gods blessed us with a preprocessor, use it.
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
39973fa
..
a62f166
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-14,11
+14,15
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
-#include "mapping.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
@@
-41,9
+45,10
@@
#include "nntp.h"
#endif
#include "nntp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#ifdef USE_SASL
+#include "mutt_sasl.h"
+#endif
+
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-106,8
+111,8
@@
static const char *No_visible = N_("No visible messages.");
#define CURHDR Context->hdrs[Context->v2r[menu->current]]
#define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
#define UNREAD(h) mutt_thread_contains_unread (Context, h)
#define CURHDR Context->hdrs[Context->v2r[menu->current]]
#define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
#define UNREAD(h) mutt_thread_contains_unread (Context, h)
+#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-extern const char *ReleaseDate;
extern size_t UngetCount;
void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
extern size_t UngetCount;
void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
@@
-293,9
+298,7
@@
static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
/* save the list of new messages */
if (oldcount && check != M_REOPENED && ((Sort & SORT_MASK) == SORT_THREADS)) {
/* save the list of new messages */
if (oldcount && check != M_REOPENED && ((Sort & SORT_MASK) == SORT_THREADS)) {
- save_new =
- (HEADER **) mem_malloc (sizeof (HEADER *) *
- (Context->msgcount - oldcount));
+ save_new = p_new(HEADER*, Context->msgcount - oldcount);
for (j = oldcount; j < Context->msgcount; j++)
save_new[j - oldcount] = Context->hdrs[j];
}
for (j = oldcount; j < Context->msgcount; j++)
save_new[j - oldcount] = Context->hdrs[j];
}
@@
-327,7
+330,7
@@
static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
mutt_uncollapse_thread (Context, h);
}
}
mutt_uncollapse_thread (Context, h);
}
}
-
mem_free
(&save_new);
+
p_delete
(&save_new);
mutt_set_virtual (Context);
}
}
mutt_set_virtual (Context);
}
}
@@
-381,7
+384,7
@@
struct mapping_t IndexHelp[] = {
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
#ifdef USE_NNTP
};
#ifdef USE_NNTP
@@
-394,7
+397,7
@@
struct mapping_t IndexNewsHelp[] = {
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
#endif
};
#endif
@@
-441,7
+444,7
@@
int mutt_index_menu (void)
sidebar_set_current (Context->path);
}
sidebar_set_current (Context->path);
}
-
FOREVER
{
+
for (;;)
{
tag = 0; /* clear the tag-prefix */
menu->max = Context ? Context->vcount : 0;
tag = 0; /* clear the tag-prefix */
menu->max = Context ? Context->vcount : 0;
@@
-479,7
+482,7
@@
int mutt_index_menu (void)
if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) {
if (!Context->path) {
/* fatal error occurred */
if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) {
if (!Context->path) {
/* fatal error occurred */
-
mem_free
(&Context);
+
p_delete
(&Context);
menu->redraw = REDRAW_FULL;
}
set_option (OPTSEARCHINVALID);
menu->redraw = REDRAW_FULL;
}
set_option (OPTSEARCHINVALID);
@@
-557,13
+560,13
@@
int mutt_index_menu (void)
}
if (menu->redraw & REDRAW_STATUS) {
}
if (menu->redraw & REDRAW_STATUS) {
- DrawFullLine = 1;
menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
- DrawFullLine = 0;
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
+ sidebar_draw_frames();
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
- mutt_paddstr (COLS, buf);
+ move(option (OPTSTATUSONTOP) ? 0 : LINES - 2,SW);
+ mutt_paddstr (COLS-SW, buf);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
sidebar_set_buffystats (Context);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
sidebar_set_buffystats (Context);
@@
-590,10
+593,6
@@
int mutt_index_menu (void)
move (menu->current - menu->top + menu->offset, COLS - 1);
mutt_refresh ();
move (menu->current - menu->top + menu->offset, COLS - 1);
mutt_refresh ();
- op = km_dokey (MENU_MAIN);
-
- debug_print (4, ("Got op %d\n", op));
-
#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
if (SigWinch) {
mutt_flushinp ();
#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
if (SigWinch) {
mutt_flushinp ();
@@
-611,6
+610,10
@@
int mutt_index_menu (void)
}
#endif
}
#endif
+ op = km_dokey (MENU_MAIN);
+
+ debug_print (4, ("Got op %d\n", op));
+
if (op == -1)
continue; /* either user abort or timeout */
if (op == -1)
continue; /* either user abort or timeout */
@@
-751,7
+754,7
@@
int mutt_index_menu (void)
if (op == OP_GET_MESSAGE) {
buf[0] = 0;
if (op == OP_GET_MESSAGE) {
buf[0] = 0;
- if (mutt_get_field (_("Enter Message-I
d
: "), buf, sizeof (buf), 0)
+ if (mutt_get_field (_("Enter Message-I
D
: "), buf, sizeof (buf), 0)
!= 0 || !buf[0])
break;
}
!= 0 || !buf[0])
break;
}
@@
-763,7
+766,7
@@
int mutt_index_menu (void)
break;
}
break;
}
-
strfcpy (buf, ref->data, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), ref->data
);
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
@@
-802,14
+805,14
@@
int mutt_index_menu (void)
int old = CURHDR->index, i;
if (!CURHDR->env->message_id) {
int old = CURHDR->index, i;
if (!CURHDR->env->message_id) {
- mutt_error (_("No Message-I
d
. Unable to perform operation"));
+ mutt_error (_("No Message-I
D
. Unable to perform operation"));
break;
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
break;
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
-
strfcpy (buf, CURHDR->env->message_id, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), CURHDR->env->message_id
);
if (op == OP_RECONSTRUCT_THREAD) {
LIST *ref = CURHDR->env->references;
if (op == OP_RECONSTRUCT_THREAD) {
LIST *ref = CURHDR->env->references;
@@
-818,7
+821,7
@@
int mutt_index_menu (void)
nntp_check_msgid (Context, ref->data);
/* the last msgid in References is the root message */
if (!ref->next)
nntp_check_msgid (Context, ref->data);
/* the last msgid in References is the root message */
if (!ref->next)
-
strfcpy (buf, ref->data, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), ref->data
);
ref = ref->next;
}
}
ref = ref->next;
}
}
@@
-956,13
+959,13
@@
int mutt_index_menu (void)
set_option (OPTHIDEREAD);
}
else {
set_option (OPTHIDEREAD);
}
else {
-
strfcpy (buf, Context->pattern + 8, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), Context->pattern + 8
);
if (!*buf || strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
if (!*buf || strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
-
mem_free
(&Context->pattern);
- Context->pattern =
str_dup
(buf);
+
p_delete
(&Context->pattern);
+ Context->pattern =
m_strdup
(buf);
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
@@
-985,6
+988,8
@@
int mutt_index_menu (void)
mutt_draw_tree (Context);
menu->redraw = REDRAW_FULL;
}
mutt_draw_tree (Context);
menu->redraw = REDRAW_FULL;
}
+ if (Context->pattern)
+ mutt_message _("To view all messages, limit to \"all\".");
break;
case OP_QUIT:
break;
case OP_QUIT:
@@
-1147,7
+1152,7
@@
int mutt_index_menu (void)
/* check for a fatal error, or all messages deleted */
if (!Context->path)
/* check for a fatal error, or all messages deleted */
if (!Context->path)
-
mem_free
(&Context);
+
p_delete
(&Context);
/* if we were in the pager, redisplay the message */
if (menu->menu == MENU_PAGER) {
/* if we were in the pager, redisplay the message */
if (menu->menu == MENU_PAGER) {
@@
-1196,17
+1201,21
@@
int mutt_index_menu (void)
#endif
{
if (Context && Context->path)
#endif
{
if (Context && Context->path)
-
strncpy (buf, Context->path, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), Context->path
);
if (op != OP_SIDEBAR_OPEN)
buffy_next (buf, sizeof (buf));
}
if (op == OP_SIDEBAR_OPEN) {
if (op != OP_SIDEBAR_OPEN)
buffy_next (buf, sizeof (buf));
}
if (op == OP_SIDEBAR_OPEN) {
- strncpy (buf, NONULL(sidebar_get_current ()), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), sidebar_get_current());
+ }
+ else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) {
+ if (menu->menu == MENU_PAGER) {
+ op = OP_DISPLAY_MESSAGE;
+ continue;
+ } else
+ break;
}
}
- else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) ==
- -1)
- break;
if (!buf[0]) {
CLEARLINE (LINES - 1);
break;
if (!buf[0]) {
CLEARLINE (LINES - 1);
break;
@@
-1246,7
+1255,7
@@
int mutt_index_menu (void)
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
break;
}
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
break;
}
-
mem_free
(&Context);
+
p_delete
(&Context);
}
mutt_sleep (0);
}
mutt_sleep (0);
@@
-1329,7
+1338,7
@@
int mutt_index_menu (void)
{
if (Context) {
mx_fastclose_mailbox (Context);
{
if (Context) {
mx_fastclose_mailbox (Context);
-
mem_free
(&Context);
+
p_delete
(&Context);
}
done = 1;
}
}
done = 1;
}
@@
-2099,6
+2108,14
@@
int mutt_index_menu (void)
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_pipe_message (tag ? NULL : CURHDR);
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_pipe_message (tag ? NULL : CURHDR);
+#ifdef USE_IMAP
+ /* in an IMAP folder index with imap_peek=no, piping could change
+ * * new or old messages status to read. Redraw what's needed.
+ */
+ if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
+ menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
+ }
+#endif
MAYBE_REDRAW (menu->redraw);
break;
MAYBE_REDRAW (menu->redraw);
break;
@@
-2107,6
+2124,14
@@
int mutt_index_menu (void)
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_print_message (tag ? NULL : CURHDR);
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_print_message (tag ? NULL : CURHDR);
+#ifdef USE_IMAP
+ /* in an IMAP folder index with imap_peek=no, piping could change
+ * * new or old messages status to read. Redraw what's needed.
+ */
+ if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
+ menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
+ }
+#endif
break;
case OP_MAIN_READ_THREAD:
break;
case OP_MAIN_READ_THREAD:
@@
-2170,7
+2195,7
@@
int mutt_index_menu (void)
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
-
str_casecmp
(CURHDR->env->followup_to, "poster") ||
+
m_strcasecmp
(CURHDR->env->followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {
@@
-2317,6
+2342,10
@@
int mutt_index_menu (void)
mutt_what_key ();
break;
mutt_what_key ();
break;
+ case OP_REBUILD_CACHE:
+ mx_rebuild_cache ();
+ break;
+
case OP_SIDEBAR_SCROLL_UP:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
case OP_SIDEBAR_SCROLL_UP:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
@@
-2342,16
+2371,19
@@
int mutt_index_menu (void)
break;
}
break;
}
+ if (!attach_msg) {
#ifdef USE_IMAP
/* Close all open IMAP connections */
#ifdef USE_IMAP
/* Close all open IMAP connections */
- if (!attach_msg)
imap_logout_all ();
#endif
#ifdef USE_NNTP
/* Close all open NNTP connections */
imap_logout_all ();
#endif
#ifdef USE_NNTP
/* Close all open NNTP connections */
- if (!attach_msg)
nntp_logout_all ();
#endif
nntp_logout_all ();
#endif
+#ifdef USE_SASL
+ mutt_sasl_done ();
+#endif
+ }
mutt_menuDestroy (&menu);
return (close);
mutt_menuDestroy (&menu);
return (close);