Changeset 1792:af67af9994ab for compose.c

Timestamp:

2000-05-16 11:38:41 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

A modified version of Will Fiveash's compose format patch.

Files:

• compose.c (modified) (12 diffs)

compose.c

@@ -415 +415 @@
 }
 
+/* 
+ * cum_attachs_size: Cumulative Attachments Size
+ *
+ * 
+ * Returns the total number of bytes used by the attachments in the
+ * attachment list.
+ */
+
+static unsigned long cum_attachs_size (MUTTMENU *menu)
+{
+  size_t s;
+  unsigned short i;
+  ATTACHPTR **idx = menu->data;
+  CONTENT *info;
+  
+  for (i = 0, s = 0; i < menu->max; i++)
+  {
+    if ((info = idx[i]->content->content))
+    {
+      switch (idx[i]->content->encoding)
+      {
+        case ENCQUOTEDPRINTABLE:
+          s += 3 * (info->lobin + info->hibin) + info->ascii;
+          break;
+        case ENCBASE64:
+          s += (4 * (info->lobin + info->hibin + info->ascii)) / 3;
+          break;
+        default:
+          s += info->lobin + info->hibin + info->ascii;
+          break;
+      }
+    }
+  }
+
+  return s;
+}
+
+/* prototype for use below */
+void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, 
+      const char *p);
+
+/*
+ * compose_format_str()
+ *
+ * %a = total number of attachments 
+ * %h = hostname  [option]
+ * %l = approx. length of current message (in bytes) 
+ * %v = Mutt version 
+ *
+ * This function is similar to status_format_str().  Look at that function for
+ * help when modifying this function.
+ */
+
+static const char *
+compose_format_str (char *buf, size_t buflen, char op, const char *src,
+                   const char *prefix, const char *ifstring,
+                   const char *elsestring,
+                   unsigned long data, format_flag flags)
+{
+  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  int optional = (flags & M_FORMAT_OPTIONAL);
+  MUTTMENU *menu = (MUTTMENU *) data;
+
+  *buf = 0;
+  switch (op)
+  {
+    case 'a': /* total number of attachments */
+        snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+        snprintf (buf, buflen, fmt, menu->max);
+      break;
+
+    case 'h':  /* hostname */
+      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+      snprintf (buf, buflen, fmt, NONULL(Hostname));
+      break;
+
+    case 'l': /* approx length of current message in bytes */
+        snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+        mutt_pretty_size (tmp, sizeof (tmp), menu ? cum_attachs_size(menu) : 0);
+        snprintf (buf, buflen, fmt, tmp);
+      break;
+
+    case 'v':
+      snprintf (fmt, sizeof (fmt), "Mutt %%s");
+      snprintf (buf, buflen, fmt, MUTT_VERSION);
+      break;
+
+    case 0:
+      *buf = 0;
+      return (src);
+
+    default:
+      snprintf (buf, buflen, "%%%s%c", prefix, op);
+      break;
+  }
+
+  if (optional)
+    compose_status_line (buf, buflen, menu, ifstring);
+  else if (flags & M_FORMAT_OPTIONAL)
+    compose_status_line (buf, buflen, menu, elsestring);
+
+  return (src);
+}
+
+void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, 
+      const char *p)
+{
+  mutt_FormatString (buf, buflen, p, compose_format_str, 
+        (unsigned long) menu, 0);
+}
+
+
 /* return values:
  *
@@ -451 +563 @@
   menu->make_entry = snd_entry;
   menu->tag = mutt_tag_attach;
-  menu->title = _("Compose");
   menu->data = idx;
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
@@ -460 +571 @@
     {
       case OP_REDRAW:
-        menu_redraw_status (menu);
         draw_envelope (msg, fcc);
         menu->offset = HDR_ATTACH;
@@ -511 +621 @@
           mutt_edit_file (Editor, msg->content->filename);
           mutt_update_encoding (msg->content);
-          menu->redraw = REDRAW_CURRENT;
+          menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
           break;
         }
@@ -575 +685 @@
         menu->redraw |= REDRAW_STATUS;
 
-        if(option(OPTNEEDREDRAW))
+        if (option(OPTNEEDREDRAW))
         {
           menu->redraw = REDRAW_FULL;
@@ -749 +859 @@
         if (menu->current == 0)
           msg->content = idx[0]->content;
+
+        menu->redraw |= REDRAW_STATUS;
         break;
 
@@ -837 +949 @@
         {
           mutt_update_encoding(idx[menu->current]->content);
-          menu->redraw = REDRAW_CURRENT;
+          menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         }
         break;
@@ -869 +981 @@
           {
             idx[menu->current]->content->encoding = i;
-            menu->redraw = REDRAW_CURRENT;
+            menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
             mutt_clear_error();
           }
@@ -909 +1021 @@
                         idx[menu->current]->content->filename);
         mutt_update_encoding (idx[menu->current]->content);
-        menu->redraw = REDRAW_CURRENT;
+        menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         break;
 
@@ -1077 +1189 @@
         if (op == OP_FILTER) /* cte might have changed */
           menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT; 
+        menu->redraw |= REDRAW_STATUS;
         break;
 
@@ -1121 +1234 @@
           mutt_error (_("Error running \"%s\"!"), buf);
         else
+        {
           mutt_update_encoding (msg->content);
+          menu->redraw |= REDRAW_STATUS;
+        }
         break;
 
@@ -1174 +1290 @@
 
     }
+
+    /* Draw formated compose status line */
+    if (menu->redraw & REDRAW_STATUS) 
+    {
+        compose_status_line (buf, sizeof (buf), menu, NONULL(ComposeFormat));
+        CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
+        SETCOLOR (MT_COLOR_STATUS);
+        printw ("%-*.*s", COLS, COLS, buf);
+        SETCOLOR (MT_COLOR_NORMAL);
+        menu->redraw &= ~REDRAW_STATUS;
+    }
   }