Changeset 3783:9af868b4220d

Timestamp:

2004-12-07 11:50:04 (4 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add send2-hook and fix alternates handling.

Files:

• compose.c (modified) (27 diffs)
• hook.c (modified) (3 diffs)
• init.c (modified) (5 diffs)
• init.h (modified) (3 diffs)
• mutt.h (modified) (1 diff)
• send.c (modified) (1 diff)

compose.c

@@ -528 +528 @@
       case OP_COMPOSE_EDIT_FROM:
         menu->redraw = edit_address_list (HDR_FROM, &msg->env->from);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_TO:
         menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_BCC:
         menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_CC:
         menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);     
+        break;
       case OP_COMPOSE_EDIT_SUBJECT:
         if (msg->env->subject)
@@ -551 +555 @@
             mutt_paddstr (W, msg->env->subject);
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_REPLY_TO:
         menu->redraw = edit_address_list (HDR_REPLYTO, &msg->env->reply_to);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_FCC:
@@ -566 +572 @@
         }
         MAYBE_REDRAW (menu->redraw);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_MESSAGE:
         if (Editor && (mutt_strcmp ("builtin", Editor) != 0) && !option (OPTEDITHDRS))
@@ -573 +580 @@
           mutt_update_encoding (msg->content);
           menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
+          mutt_message_hook (NULL, msg, M_SEND2HOOK);
           break;
         }
@@ -612 +620 @@
         }
 
-        menu->redraw = REDRAW_FULL;
+        menu->redraw = REDRAW_FULL;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -643 +652 @@
         }
         
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -689 +699 @@
           menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_ATTACH_MESSAGE:
@@ -795 +806 @@
           SortAux = oldSortAux;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_DELETE:
@@ -814 +826 @@
 
         menu->redraw |= REDRAW_STATUS;
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 #define CURRENT idx[menu->current]->content
@@ -832 +845 @@
           mutt_message (_("The current attachment will be converted."));
         menu->redraw = REDRAW_CURRENT;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       }
@@ -848 +862 @@
           menu->redraw = REDRAW_CURRENT;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_UPDATE_ENCODING:
@@ -867 +882 @@
           menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         }
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       
@@ -885 +901 @@
           menu->redraw = REDRAW_CURRENT;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_EDIT_ENCODING:
@@ -903 +920 @@
             mutt_error _("Invalid encoding.");
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_SEND_MESSAGE:
+
+        /* Note: We don't invoke send2-hook here, since we want to leave
+         * users an opportunity to change settings from the ":" prompt.
+         */
       
         if(check_attachments(idx, idxlen) != 0)
@@ -937 +959 @@
         mutt_update_encoding (idx[menu->current]->content);
         menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -952 +975 @@
 # endif
         menu->redraw = REDRAW_INDEX;
+        /* No send2hook since this doesn't change the message. */
         break;
 
@@ -969 +993 @@
           menu->redraw = REDRAW_CURRENT;
 
+        /* No send2hook since this doesn't change the message. */
         break;
       
@@ -995 +1020 @@
           
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_NEW_MIME:
@@ -1062 +1088 @@
           }
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);    
+        break;
 
       case OP_COMPOSE_EDIT_MIME:
@@ -1071 +1098 @@
           menu->redraw = REDRAW_FULL;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_VIEW_ATTACH:
@@ -1078 +1106 @@
         mutt_attach_display_loop (menu, op, NULL, NULL, NULL, &idx, &idxlen, NULL, 0);
         menu->redraw = REDRAW_FULL;
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1084 +1113 @@
         mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL, menu);
         MAYBE_REDRAW (menu->redraw);
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1089 +1119 @@
         CHECK_COUNT;
         mutt_print_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content);
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1096 +1127 @@
         mutt_pipe_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content, op == OP_FILTER);
         if (op == OP_FILTER) /* cte might have changed */
-          menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT; 
+          menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT;
         menu->redraw |= REDRAW_STATUS;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -1192 +1224 @@
         msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
         redraw_crypt_lines (msg);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -1217 +1250 @@
         msg->security = crypt_smime_send_menu(msg, &menu->redraw);
         redraw_crypt_lines (msg);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -1224 +1258 @@
       
         mix_make_chain (&msg->chain, &menu->redraw);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 #endif

hook.c

@@ -67 +67 @@
   }
 
-  mutt_extract_token (&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) ?  M_TOKEN_SPACE : 0);
+  mutt_extract_token (&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) ?  M_TOKEN_SPACE : 0);
 
   if (!command.data)
@@ -118 +118 @@
         !mutt_strcmp (pattern.data, ptr->rx.pattern))
     {
-      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
+      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
       {
         /* these hooks allow multiple commands with the same
@@ -147 +147 @@
   }
 
-  if (data & (M_SENDHOOK | M_SAVEHOOK | M_FCCHOOK | M_MESSAGEHOOK | M_REPLYHOOK))
+  if (data & (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK | M_MESSAGEHOOK | M_REPLYHOOK))
   {
     if ((pat = mutt_pattern_comp (pattern.data,
-           (data & (M_SENDHOOK | M_FCCHOOK)) ? 0 : M_FULL_MSG,
+           (data & (M_SENDHOOK | M_SEND2HOOK | M_FCCHOOK)) ? 0 : M_FULL_MSG,
                                   err)) == NULL)
       goto error;

init.c

@@ -612 +612 @@
 }
 
+static void _alternates_clean (void)
+{
+  int i;
+  if (Context && Context->msgcount) 
+  {
+    for (i = 0; i < Context->msgcount; i++)
+      Context->hdrs[i]->recip_valid = 0;
+  }
+}
+
+static int parse_alternates (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+{
+  _alternates_clean();
+  return parse_rx_list (buf, s, data, err);
+}
+
+static int parse_unalternates (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+{
+  _alternates_clean();
+  return parse_rx_unlist (buf, s, data, err);
+}
+
 static int parse_spam_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
@@ -1067 +1089 @@
           pp->rx = safe_calloc (1, sizeof (regex_t));
           pp->pattern = safe_strdup ((char *) p->init);
-          if (mutt_strcmp (p->option, "alternates") == 0)
-            flags |= REG_ICASE;
-          else if (mutt_strcmp (p->option, "mask") != 0)
+          if (mutt_strcmp (p->option, "mask") != 0)
             flags |= mutt_which_case ((const char *) p->init);
           if (mutt_strcmp (p->option, "mask") == 0 && *s == '!')
@@ -1281 +1301 @@
       }
 
-      if (option(OPTATTACHMSG) && (!mutt_strcmp(MuttVars[idx].option, "alternates")
-                                   || !mutt_strcmp(MuttVars[idx].option, "reply_regexp")))
+      if (option(OPTATTACHMSG) && !mutt_strcmp(MuttVars[idx].option, "reply_regexp"))
       {
         snprintf (err->data, err->dsize, "Operation not permitted when in attach-message mode.");
@@ -1298 +1317 @@
         int not = 0;
 
-        /* $alternates is case-insensitive,
-           $mask is case-sensitive */
-        if (mutt_strcmp (MuttVars[idx].option, "alternates") == 0)
-          flags |= REG_ICASE;
-        else if (mutt_strcmp (MuttVars[idx].option, "mask") != 0)
+        /* $mask is case-sensitive */
+        if (mutt_strcmp (MuttVars[idx].option, "mask") != 0)
           flags |= mutt_which_case (tmp->data);
 
@@ -1356 +1372 @@
           }
 #undef CUR_ENV
-        }
-        
-        if(Context && Context->msgcount &&
-           mutt_strcmp(MuttVars[idx].option, "alternates") == 0)
-        {
-          int i;
-          
-          for(i = 0; i < Context->msgcount; i++)
-            Context->hdrs[i]->recip_valid = 0;
         }
       }

init.h

@@ -2825 +2825 @@
 static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 
+static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+
 struct command_t
 {
@@ -2833 +2836 @@
 
 struct command_t Commands[] = {
-  { "alternates",       parse_rx_list,          UL &Alternates },
-  { "unalternates",     parse_rx_unlist,        UL &Alternates },
+  { "alternates",       parse_alternates,       UL &Alternates },
+  { "unalternates",     parse_unalternates,     UL &Alternates },
 #ifdef USE_SOCKET
   { "account-hook",     mutt_parse_hook,        M_ACCOUNTHOOK },
@@ -2874 +2877 @@
   { "score",            mutt_parse_score,       0 },
   { "send-hook",        mutt_parse_hook,        M_SENDHOOK },
+  { "send2-hook",       mutt_parse_hook,        M_SEND2HOOK },
   { "set",              parse_set,              0 },
   { "source",           parse_source,           0 },

mutt.h

@@ -161 +161 @@
 #define M_ACCOUNTHOOK   (1<<9)
 #define M_REPLYHOOK     (1<<10)
+#define M_SEND2HOOK     (1<<11)
 
 /* tree characters for linearize_tree and print_enriched_string */

send.c

@@ -1321 +1321 @@
       msg->security = 0;
   }
+  
+  /* 
+   * This hook is even called for postponed messages, and can, e.g., be
+   * used for setting the editor, the sendmail path, or the
+   * envelope sender.
+   */
+  mutt_message_hook (NULL, msg, M_SEND2HOOK);
+  
   /* wait until now to set the real name portion of our return address so
      that $realname can be set in a send-hook */