X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=f001c3dbcb43abce7ccfa04f88099b5dbf22a766;hp=43608e7ed7b06a9fb2c1e0e3b847d8af4649b9f6;hb=7dcd7ee09b8760133ac8ec00562e4d60b2f0aebd;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2 diff --git a/browser.c b/browser.c index 43608e7..f001c3d 100644 --- a/browser.c +++ b/browser.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include @@ -27,28 +27,7 @@ #include #ifdef USE_NNTP -#include -#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 { @@ -370,11 +349,11 @@ newsgroup_format_str(char *dest, ssize_t destlen, char op, 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); @@ -428,7 +407,7 @@ static void add_folder (MUTTMENU * m, struct browser_state *state, (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)++; } @@ -449,17 +428,14 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, { #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)) @@ -544,16 +520,13 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state) #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)))) @@ -639,12 +612,12 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num) #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, @@ -706,12 +679,11 @@ static int file_tag (MUTTMENU * menu, int n, int m) 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; @@ -733,14 +705,12 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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; } @@ -817,13 +787,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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 (;;) { @@ -1327,7 +1290,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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); @@ -1347,12 +1310,10 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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); @@ -1375,8 +1336,8 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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]; @@ -1426,13 +1387,9 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, } } 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); @@ -1442,7 +1399,6 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files, 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);