#include <pwd.h>
#include <grp.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/sidebar.h>
#include <imap/imap.h>
#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-static struct mapping_t FolderHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Chdir"), OP_CHANGE_DIRECTORY},
- {N_("Mask"), OP_ENTER_MASK},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t FolderNewsHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("List"), OP_TOGGLE_MAILBOXES},
- {N_("Subscribe"), OP_BROWSER_SUBSCRIBE},
- {N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE},
- {N_("Catchup"), OP_CATCHUP},
- {N_("Mask"), OP_ENTER_MASK},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
+#include "nntp.h"
#endif
typedef struct folder_t {
snprintf (dest, destlen, tmp, Context->new);
}
else if (option (OPTMARKOLD) &&
- folder->ff->nd->lastCached >= folder->ff->nd->firstMessage &&
- folder->ff->nd->lastCached <= folder->ff->nd->lastMessage) {
+ folder->ff->nd->lastCached >= folder->ff->nd->first &&
+ folder->ff->nd->lastCached <= folder->ff->nd->last) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp,
- folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
+ folder->ff->nd->last - folder->ff->nd->lastCached);
}
else {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
(state->entry)[state->entrylen].imap = 0;
#ifdef USE_NNTP
if (option (OPTNEWS))
- (state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
+ (state->entry)[state->entrylen].nd = data;
#endif
(state->entrylen)++;
}
{
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- string_list_t *tmp;
- NNTP_DATA *data;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_data_t *data;
+ nntp_server_t *news = CurrentNewsSrv;
/* buffy_check (0); */
init_state (state, menu);
- for (tmp = news->list; tmp; tmp = tmp->next) {
- if (!(data = (NNTP_DATA *) tmp->data))
- continue;
- nntp_sync_sidebar (data);
+ for (data = news->list; data; data = data->next) {
+ nntp_sync_sidebar(data);
if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
continue;
if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.neg))
#ifdef USE_NNTP
if (option (OPTNEWS)) {
- string_list_t *tmp;
- NNTP_DATA *data;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_data_t *data;
+ nntp_server_t *news = CurrentNewsSrv;
/* buffy_check (0); */
init_state (state, menu);
- for (tmp = news->list; tmp; tmp = tmp->next) {
- if ((data = (NNTP_DATA*) tmp->data) == NULL)
- continue;
+ for (data = news->list; data; data = data->next) {
nntp_sync_sidebar (data);
if ((data->new || (data->subscribed &&
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
#ifdef USE_NNTP
if (option (OPTNEWS))
- m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folder,
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ m_strformat(s, slen, getmaxx(main_w), GroupFormat, newsgroup_format_str,
+ &folder, 0);
else
#endif
- m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folder,
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ m_strformat(s, slen, getmaxx(main_w), FolderFormat, folder_format_str,
+ &folder, 0);
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,
return ff->tagged - ot;
}
-void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
- int *numfiles)
+void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
+ int *numfiles)
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
- char helpstr[STRING];
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
if (*f)
m_strcpy(prefix, sizeof(prefix), f);
else {
- string_list_t *list;
+ nntp_data_t *list;
/* default state for news reader mode is browse subscribed newsgroups */
buffy = 0;
for (list = CurrentNewsSrv->list; list; list = list->next) {
- NNTP_DATA *data = (NNTP_DATA *) list->data;
-
- if (data && data->subscribed) {
+ if (list->subscribed) {
buffy = 1;
break;
}
menu->data = state.entry;
if (multiple)
menu->tag = file_tag;
-
- menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
-#ifdef USE_NNTP
- (option (OPTNEWS)) ? FolderNewsHelp :
-#endif
- FolderHelp);
-
init_menu (&state, menu, title, sizeof (title), buffy);
for (;;) {
case OP_UNCATCHUP:
if (option (OPTNEWS)) {
struct folder_file *folder_f = &state.entry[menu->current];
- NNTP_DATA *nd;
+ nntp_data_t *nd;
if (i == OP_CATCHUP)
nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
break;
{
- string_list_t *tmp;
- NNTP_DATA *data;
+ nntp_data_t *data;
- for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next) {
- if ((data = (NNTP_DATA *) tmp->data))
- data->deleted = 1;
+ for (data = CurrentNewsSrv->list; data; data = data->next) {
+ data->deleted = 1;
}
}
nntp_get_active (CurrentNewsSrv);
regex_t *rx = p_new(regex_t, 1);
char *s = buf;
int j = menu->current;
- NNTP_DATA *nd;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_data_t *nd;
+ nntp_server_t *news = CurrentNewsSrv;
if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) {
char tmp[STRING];
}
}
if (i == OP_SUBSCRIBE_PATTERN) {
- string_list_t *grouplist = NULL;
-
- if (news)
- grouplist = news->list;
- for (; grouplist; grouplist = grouplist->next) {
- nd = (NNTP_DATA *) grouplist->data;
- if (nd && nd->group && !nd->subscribed) {
+ nd = news ? news->list : NULL;
+ for (; nd; nd = nd->next) {
+ if (nd->group && !nd->subscribed) {
if (regexec (rx, nd->group, 0, NULL, 0) == 0) {
mutt_newsgroup_subscribe (news, nd->group);
add_folder (menu, &state, nd->group, NULL, nd, nd->new);
init_menu (&state, menu, title, sizeof (title), buffy);
}
mutt_newsrc_update (news);
- nntp_clear_cacheindex (news);
if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
regfree (rx);
p_delete(&rx);
projects / apps / madmutt.git / blobdiff