X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=3906a331214cdb9ebf46ff99c26708bb0a92bcb0;hp=3b3736976217f3df1ebb4681db2bc6c8d0b66eeb;hb=3d5533f226da9cd9f86236c658c26be01ebf1e87;hpb=d6988dab6bd378ccdf0f17aaa16de8aee1ceaf43 diff --git a/init.h b/init.h index 3b37369..3906a33 100644 --- a/init.h +++ b/init.h @@ -63,11 +63,11 @@ #define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) struct option_t { - char *option; + const char *option; short type; short flags; unsigned long data; - char* init; + const char *init; }; #define UL (unsigned long) @@ -81,21 +81,12 @@ struct option_t { /* build complete documentation */ #ifdef _MAKEDOC -# ifndef USE_IMAP -# define USE_IMAP -# endif # ifndef MIXMASTER # define MIXMASTER "mixmaster" # endif -# ifndef USE_POP -# define USE_POP -# endif # ifndef USE_SSL # define USE_SSL # endif -# ifndef USE_SOCKET -# define USE_SOCKET -# endif # ifndef USE_LIBESMTP # define USE_LIBESMTP # endif @@ -108,9 +99,6 @@ struct option_t { # ifndef USE_DOTLOCK # define USE_DOTLOCK # endif -# ifndef DL_STANDALONE -# define DL_STANDALONE -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -409,6 +397,18 @@ struct option_t MuttVars[] = { ** When \fIunset\fP, Mutt-ng will not collapse a thread if it contains any ** unread messages. */ + {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"}, + /* + ** .pp + ** This variable controls whether attachments should be counted for $$$index_format + ** and its \fT%X\fP expando or not. As for scoring, this variable can be used to + ** selectively turn counting on or off instead of removing and re-adding rules as + ** prefered because counting requires full loading of messages. + ** .pp + ** If it is \fIset\fP and rules were defined via the \fTattachments\fP and/or + ** \fTunattachments\fP commands, counting will be done. If it is \fIunset\fP no + ** counting will be done regardless whether rules were defined or not. + */ {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" }, /* ** .pp @@ -585,11 +585,11 @@ struct option_t MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(DL_STANDALONE) && defined(USE_DOTLOCK) +#if defined(USE_DOTLOCK) {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"}, /* ** .pp - ** Availability: Standalone and Dotlock + ** Availability: Dotlock ** ** .pp ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by @@ -1009,12 +1009,8 @@ struct option_t MuttVars[] = { ** Remember: This option works only for mailing lists which are explicitly set in your muttngrc ** configuration file. */ -#ifdef USE_IMAP {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** This is a colon-delimited list of authentication methods Mutt-ng may ** attempt to use to log in to an IMAP server, in the order Mutt-ng should @@ -1039,12 +1035,8 @@ struct option_t MuttVars[] = { ** your server on connection, and add them to the set of mailboxes ** it polls for new mail. See also the ``$mailboxes'' command. */ - {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."}, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** This contains the list of characters which you would like to treat ** as folder separators for displaying IMAP paths. In particular it @@ -1052,9 +1044,6 @@ struct option_t MuttVars[] = { */ {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Mutt-ng requests these header fields in addition to the default headers ** (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE @@ -1066,9 +1055,6 @@ struct option_t MuttVars[] = { */ {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** You normally want to see your personal folders alongside ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set @@ -1076,9 +1062,6 @@ struct option_t MuttVars[] = { */ {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** This variable specifies the maximum amount of time in seconds that Mutt-ng ** will wait before polling open IMAP connections, to prevent the server @@ -1094,9 +1077,6 @@ struct option_t MuttVars[] = { */ {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Your login name on the IMAP server. ** .pp @@ -1104,9 +1084,6 @@ struct option_t MuttVars[] = { */ {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** This variable configures whether IMAP folder browsing will look for ** only subscribed folders or all folders. This can be toggled in the @@ -1121,9 +1098,6 @@ struct option_t MuttVars[] = { */ {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Specifies the password for your IMAP account. If \fIunset\fP, Mutt-ng will ** prompt you for your password when you invoke the fetch-mail function. @@ -1134,9 +1108,6 @@ struct option_t MuttVars[] = { */ {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** When \fIset\fP, Mutt-ng will not open new IMAP connections to check for new ** mail. Mutt-ng will only check for new mail over existing IMAP @@ -1146,9 +1117,6 @@ struct option_t MuttVars[] = { */ {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** If \fIset\fP, Mutt-ng will avoid implicitly marking your mail as read whenever ** you fetch a message from the server. This is generally a good thing, @@ -1157,18 +1125,12 @@ struct option_t MuttVars[] = { */ {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when ** the connection is lost. */ {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** When \fIset\fP, Mutt-ng will display warning messages from the IMAP ** server as error messages. Since these messages are often @@ -1178,16 +1140,12 @@ struct option_t MuttVars[] = { */ {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" }, /* - ** .pp - ** Availability: IMAP - ** ** .pp ** The name of the user whose mail you intend to access on the IMAP ** server. ** .pp ** This variable defaults to your user name on the local machine. */ -#endif {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" }, /* ** .pp @@ -1321,12 +1279,12 @@ struct option_t MuttVars[] = { ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale variable \fTLC_TIME\fP. */ - {"list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "no" }, + {"force_list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "ask-no" }, /* ** .pp - ** When \fIset\fP, address replies to the mailing list the original message came - ** from (instead to the author only). Setting this option to ``\fIask-yes\fP'' or - ** ``\fIask-no\fP'' will ask if you really intended to reply to the author only. + ** This variable controls what effect ordinary replies have on mailing list + ** messages: if \fIset\fP, a normal reply will be interpreted as list-reply + ** while if it's \fIunset\fP the reply functions work as usual. */ {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" }, /* @@ -1517,9 +1475,20 @@ struct option_t MuttVars[] = { /* ** .pp ** \fIThis is a read-only system property and, at runtime, - ** specifies the last part of the full path or URI of the - ** folder currently open (if any), i.e. everything after - ** the last ``/''.\fP + ** specifies the actual name of the folder as far as it could + ** be detected.\fP + ** .pp + ** For detection, $$$folder is first taken into account + ** and simply stripped to form the result when a match is found. For + ** example, with $$$folder being \fTimap://host\fP and the folder is + ** \fTimap://host/INBOX/foo\fP, $$$muttng_folder_name will be just + ** \fTINBOX/foo\fP.) + ** .pp + ** Second, if the initial portion of a name is not $$$folder, + ** the result will be everything after the last ``/''. + ** .pp + ** Third and last, the result will be just the name if neither + ** $$$folder nor a ``/'' were found in the name. */ {"muttng_pwd", DT_SYS, R_NONE, 0, "" }, /* @@ -1584,6 +1553,7 @@ struct option_t MuttVars[] = { ** .dt %M .dd Total number of messages shown, i.e. not hidden by a limit. 1) ** .dt %n .dd Number of new messages. ** .dt %t .dd Number of tagged messages. 1) + ** .dt %u .dd Number of unread messages. ** .de ** .pp ** 1) These expandos only have a non-zero value for the current mailbox and @@ -1906,7 +1876,6 @@ struct option_t MuttVars[] = { ** was connection lost. */ #endif -#ifdef USE_SOCKET { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, /* ** .pp @@ -1916,7 +1885,6 @@ struct option_t MuttVars[] = { ** .pp ** See also ``$$read_inc'' and ``$$write_inc''. */ -#endif {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, /* ** .pp @@ -2651,7 +2619,7 @@ struct option_t MuttVars[] = { ** The file which includes random data that is used to initialize SSL ** library functions. */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "yes" }, + {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, /* ** .pp ** Availability: SSL @@ -2726,12 +2694,8 @@ struct option_t MuttVars[] = { ** The separator to add between messages when piping a list of tagged ** messages to an external Unix command. */ -#ifdef USE_POP {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** This is a colon-delimited list of authentication methods Mutt-ng may ** attempt to use to log in to an POP server, in the order Mutt-ng should @@ -2746,9 +2710,6 @@ struct option_t MuttVars[] = { */ {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** If \fIset\fP, Mutt-ng will try all available methods. When \fIunset\fP, Mutt-ng will ** only fall back to other authentication methods if the previous @@ -2758,18 +2719,12 @@ struct option_t MuttVars[] = { {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0}, {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** This variable configures how often (in seconds) Mutt-ng should look for ** new mail. */ {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** If \fIset\fP, Mutt-ng will delete successfully downloaded messages from the POP ** server when using the ``fetch-mail'' function. When \fIunset\fP, Mutt-ng will @@ -2777,9 +2732,6 @@ struct option_t MuttVars[] = { */ {"pop_host", DT_STR, R_NONE, UL &PopHost, ""}, /* - ** .pp - ** Availability: POP - ** ** .pp ** The name of your POP server for the ``fetch-mail'' function. You ** can also specify an alternative port, username and password, i.e.: @@ -2792,9 +2744,6 @@ struct option_t MuttVars[] = { */ {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** If this variable is \fIset\fP, Mutt-ng will try to use the ``\fTLAST\fP'' POP command ** for retrieving only unread messages from the POP server when using @@ -2802,18 +2751,12 @@ struct option_t MuttVars[] = { */ {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** Controls whether or not Mutt-ng will try to reconnect to a POP server if the ** connection is lost. */ {"pop_user", DT_STR, R_NONE, UL &PopUser, "" }, /* - ** .pp - ** Availability: POP - ** ** .pp ** Your login name on the POP server. ** .pp @@ -2821,9 +2764,6 @@ struct option_t MuttVars[] = { */ {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""}, /* - ** .pp - ** Availability: POP - ** ** .pp ** Specifies the password for your POP account. If \fIunset\fP, Mutt-ng will ** prompt you for your password when you open POP mailbox. @@ -2832,7 +2772,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ -#endif /* USE_POP */ {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""}, /* ** .pp @@ -2868,7 +2807,6 @@ struct option_t MuttVars[] = { ** in the mailbox specified by this variable. Also see the ``$$postpone'' ** variable. */ -#ifdef USE_SOCKET {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" }, /* ** .pp @@ -2886,7 +2824,6 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work, you must be able to log in to the ** remote machine without having to enter a password. */ -#endif /* USE_SOCKET */ {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" }, /* ** .pp @@ -3650,7 +3587,6 @@ struct option_t MuttVars[] = { ** \fBNote\fP: When you delete a message in the trash folder, it is really ** deleted, so that there is no way to recover mail. */ -#ifdef USE_SOCKET {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" }, /* ** .pp @@ -3663,7 +3599,6 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work you must be able to log in to the remote ** machine without having to enter a password. */ -#endif {"umask", DT_NUM, R_NONE, UL &Umask, "0077" }, /* ** .pp @@ -3830,7 +3765,7 @@ struct option_t MuttVars[] = { */ #endif /*--*/ - { NULL } + { NULL, -1, R_NONE, -1, NULL } }; static const char* Features[] = { @@ -3849,18 +3784,9 @@ static const char* Features[] = { #ifdef USE_DOTLOCK "dotlock", #endif -#ifdef DL_STANDALONE - "standalone", -#endif -#ifdef USE_POP - "pop", -#endif #ifdef USE_NNTP "nntp", #endif -#ifdef USE_IMAP - "imap", -#endif #ifdef USE_SSL "ssl", #endif @@ -3873,18 +3799,9 @@ static const char* Features[] = { #ifdef USE_LIBESMTP "libesmtp", #endif -#ifdef USE_COMPRESSED - "compessed", -#endif #ifdef HAVE_COLOR "color", #endif -#ifdef CRYPT_BACKEND_CLASSIC_PGP - "classic_pgp", -#endif -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - "class_smime", -#endif #ifdef CRYPT_BACKEND_GPGME "gpgme", #endif @@ -3944,14 +3861,14 @@ const struct mapping_t SortBrowserMethods[] = { {"date", SORT_DATE}, {"size", SORT_SIZE}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortAliasMethods[] = { {"alias", SORT_ALIAS}, {"address", SORT_ADDRESS}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortKeyMethods[] = { @@ -3959,7 +3876,7 @@ const struct mapping_t SortKeyMethods[] = { {"date", SORT_DATE}, {"keyid", SORT_KEYID}, {"trust", SORT_TRUST}, - {NULL} + {NULL, 0} }; @@ -3988,10 +3905,9 @@ static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); struct command_t { - char *name; + const char *name; int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *); unsigned long data; - unsigned long data1; }; struct command_t Commands[] = { @@ -3999,9 +3915,7 @@ struct command_t Commands[] = { {"attachments", parse_attachments, 0 }, {"unattachments",parse_unattachments,0 }, {"unalternates", parse_unalternates, 0}, -#ifdef USE_SOCKET {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, -#endif {"alias", parse_alias, 0}, {"auto_view", parse_list, UL &AutoViewList}, {"alternative_order", parse_list, UL &AlternativeOrderList}, @@ -4015,11 +3929,9 @@ struct command_t Commands[] = { {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, -#ifdef USE_COMPRESSED {"open-hook", mutt_parse_hook, M_OPENHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, -#endif {"hdr_order", parse_list, UL &HeaderOrderList}, {"ifdef", parse_ifdef, 1}, {"ifndef", parse_ifdef, 0}, @@ -4064,5 +3976,5 @@ struct command_t Commands[] = { {"unscore", mutt_parse_unscore, 0}, {"unset", parse_set, M_SET_UNSET}, {"unsubscribe", parse_unsubscribe, 0}, - {NULL} + {NULL, NULL, 0} };