X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=1d93b5a260764e0ce334f1c16f90020bef655cb6;hp=255941c5e21d9a344a25194938ecdd39f2c09b01;hb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;hpb=b17296ba049d71986028ac83f0b415a021d0691c

diff --git a/init.h b/init.h
index 255941c..1d93b5a 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)
@@ -279,10 +279,12 @@ struct option_t MuttVars[] = {
    ** .dt %m  .dd major MIME type
    ** .dt %M  .dd MIME subtype
    ** .dt %n  .dd attachment number
+   ** .dt %Q  .dd "Q", if MIME part qualifies for attachment counting
    ** .dt %s  .dd size
    ** .dt %t  .dd tagged flag
    ** .dt %T  .dd graphic tree characters
    ** .dt %u  .dd unlink (=to delete) flag
+   ** .dt %X  .dd number of qualifying MIME parts in this part and its children
    ** .dt %>X .dd right justify the rest of the string and pad with character "X"
    ** .dt %|X .dd pad to the end of the line with character "X"
    ** .de
@@ -407,6 +409,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
@@ -1260,6 +1274,7 @@ struct option_t MuttVars[] = {
    ** .dt %u .dd user (login) name of the author
    ** .dt %v .dd first name of the author, or the recipient if the message is from you
    ** .dt %W .dd name of organization of author (`organization:' field)
+   ** .dt %X .dd number of attachments
    ** .dt %y .dd `x-label:' field, if present
    ** .dt %Y .dd `x-label' field, if present, and (1) not at part of a thread tree,
    **            (2) at the top of a thread, or (3) `x-label' is different from
@@ -1318,12 +1333,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" },
   /*
@@ -1514,9 +1529,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, "" },
   /*
@@ -1581,6 +1607,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
@@ -1638,9 +1665,9 @@ struct option_t MuttVars[] = {
    ** If \fIset\fP, forces Mutt-ng to interpret keystrokes with the high bit (bit 8)
    ** set as if the user had pressed the \fTESC\fP key and whatever key remains
    ** after having the high bit removed.  For example, if the key pressed
-   ** has an ASCII value of \fT0xf4\fP, then this is treated as if the user had
+   ** has an ASCII value of \fT0xf8\fP, then this is treated as if the user had
    ** pressed \fTESC\fP then ``\fTx\fP''.  This is because the result of removing the
-   ** high bit from ``\fT0xf4\fP'' is ``\fT0x74\fP'', which is the ASCII character
+   ** high bit from ``\fT0xf8\fP'' is ``\fT0x78\fP'', which is the ASCII character
    ** ``\fTx\fP''.
    */
   {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" },
@@ -2648,7 +2675,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
@@ -2759,7 +2786,7 @@ struct option_t MuttVars[] = {
    ** Availability: POP
    **
    ** .pp
-   ** This variable configures how often (in seconds) POP should look for
+   ** This variable configures how often (in seconds) Mutt-ng should look for
    ** new mail.
    */
   {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
@@ -2803,7 +2830,7 @@ struct option_t MuttVars[] = {
    ** Availability: POP
    **
    ** .pp
-   ** Controls whether or not Mutt-ng will try to reconnect to a POP server when the
+   ** 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, "" },
@@ -3827,7 +3854,7 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  { NULL }
+  { NULL, -1, R_NONE, -1, NULL }
 };
 
 static const char* Features[] = {
@@ -3941,14 +3968,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[] = {
@@ -3956,7 +3983,7 @@ const struct mapping_t SortKeyMethods[] = {
   {"date", SORT_DATE},
   {"keyid", SORT_KEYID},
   {"trust", SORT_TRUST},
-  {NULL}
+  {NULL, 0}
 };
 
 
@@ -3965,7 +3992,8 @@ const struct mapping_t SortKeyMethods[] = {
 static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
+static int parse_attachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_unattachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3984,14 +4012,15 @@ 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[] = {
   {"alternates", parse_alternates, 0},
+  {"attachments", parse_attachments, 0 },
+  {"unattachments",parse_unattachments,0 },
   {"unalternates", parse_unalternates, 0},
 #ifdef USE_SOCKET
   {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK},
@@ -4058,5 +4087,5 @@ struct command_t Commands[] = {
   {"unscore", mutt_parse_unscore, 0},
   {"unset", parse_set, M_SET_UNSET},
   {"unsubscribe", parse_unsubscribe, 0},
-  {NULL}
+  {NULL, NULL, 0}
 };