X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=1f756a5f0f61f3dae2e821a00c027042da356d6e;hp=8f58fec83884dbd5edbf61eb39754ca8434a021e;hb=fdb93a08e305b8755260144807e4d45106a9cb9f;hpb=5c310cabcfafe551dcad7638c007daae1c7d3710

diff --git a/status.c b/status.c
index 8f58fec..1f756a5 100644
--- a/status.c
+++ b/status.c
@@ -1,42 +1,42 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sort.h"
-#include "mapping.h"
 #include "mx.h"
+#include "buffy.h"
+
 
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 
-static char *get_sort_str (char *buf, size_t buflen, int method)
+#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
+
+static char *get_sort_str (char *buf, ssize_t buflen, int method)
 {
   snprintf (buf, buflen, "%s%s%s",
-	    (method & SORT_REVERSE) ? "reverse-" : "",
-	    (method & SORT_LAST) ? "last-" : "",
-	    mutt_getnamebyvalue (method & SORT_MASK, SortMethods));
+            (method & SORT_REVERSE) ? "reverse-" : "",
+            (method & SORT_LAST) ? "last-" : "",
+            mutt_getnamebyvalue (method & SORT_MASK, SortMethods));
   return buf;
 }
 
@@ -56,266 +56,240 @@ static char *get_sort_str (char *buf, size_t buflen, int method)
  * %s = current sorting method ($sort)
  * %S = current aux sorting method ($sort_aux)
  * %t = # of tagged messages [option]
- * %v = Mutt-ng version 
+ * %v = Madmutt version 
  * %V = currently active limit pattern [option] */
-static const char *
-status_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)
+static const char *status_format_str (char *buf, ssize_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], *cp, *p;
+  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  const char *cp, *p;
   int count, optional = (flags & M_FORMAT_OPTIONAL);
   MUTTMENU *menu = (MUTTMENU *) data;
 
   *buf = 0;
-  switch (op)
-  {
-    case 'b':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, mutt_buffy_check (0));
-      }
-      else if (!mutt_buffy_check (0))
-	optional = 0;
-      break;
-
-    case 'B':
-      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
-      if (Context && Context->compressinfo && Context->realpath)
-      {
-	if ((p = strrchr (Context->realpath, '/')))
-	  strfcpy (tmp, p + 1, sizeof (tmp));
-	else
-	  strfcpy (tmp, Context->realpath, sizeof (tmp));
-      } 
+  switch (op) {
+  case 'b':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, buffy_check (0));
+    }
+    else if (!buffy_check (0))
+      optional = 0;
+    break;
+
+  case 'B':
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    if (Context && Context->compressinfo && Context->realpath) {
+      if ((p = strrchr (Context->realpath, '/')))
+        m_strcpy(tmp, sizeof(tmp), p + 1);
       else
-#endif
-      if (Context && Context->path)
-      {
-	if ((p = strrchr (Context->path, '/')))
-	  strfcpy (tmp, p + 1, sizeof (tmp));
-	else
-	  strfcpy (tmp, Context->path, sizeof (tmp));
-      }
+        m_strcpy(tmp, sizeof(tmp), Context->realpath);
+    }
+    else
+    if (Context && Context->path) {
+      if ((p = strrchr (Context->path, '/')))
+        m_strcpy(tmp, sizeof(tmp), p + 1);
       else
-	  strfcpy (tmp, _("no mailbox"), sizeof (tmp));
-      snprintf (buf, buflen, fmt, tmp);
-      break;
-
-    case 'd':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->deleted : 0);
-      }
-      else if (!Context || !Context->deleted)
-	optional = 0;
-      break;
+        m_strcpy(tmp, sizeof(tmp), Context->path);
+    }
+    else
+      m_strcpy(tmp, sizeof(tmp), _("no mailbox"));
+    snprintf (buf, buflen, fmt, tmp);
+    break;
+
+  case 'd':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->deleted : 0);
+    }
+    else if (!Context || !Context->deleted)
+      optional = 0;
+    break;
+
+  case 'h':
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    snprintf (buf, buflen, fmt, NONULL (Hostname));
+    break;
+
+  case 'f':
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    if (Context && Context->compressinfo && Context->realpath) {
+      m_strcpy(tmp, sizeof(tmp), Context->realpath);
+      mutt_pretty_mailbox (tmp);
+    }
+    else
+    if (Context && Context->path) {
+      m_strcpy(tmp, sizeof(tmp), Context->path);
+      mutt_pretty_mailbox (tmp);
+    }
+    else
+      m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
+    snprintf (buf, buflen, fmt, tmp);
+    break;
+
+  case 'F':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->flagged : 0);
+    }
+    else if (!Context || !Context->flagged)
+      optional = 0;
+    break;
 
-    case 'h':
+  case 'l':
+    if (!optional) {
       snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      snprintf (buf, buflen, fmt, NONULL(Hostname));
-      break;
-
-    case 'f':
-      snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
-      if (Context && Context->compressinfo && Context->realpath)
-      {
-	 strfcpy (tmp, Context->realpath, sizeof (tmp));
-	 mutt_pretty_mailbox (tmp);
-      }
-      else
-#endif
-      if (Context && Context->path)
-      {
-	strfcpy (tmp, Context->path, sizeof (tmp));
-	mutt_pretty_mailbox (tmp);
-      }
-      else
-	strfcpy (tmp, _("(no mailbox)"), sizeof (tmp));
+      mutt_pretty_size (tmp, sizeof (tmp), Context ? Context->size : 0);
       snprintf (buf, buflen, fmt, tmp);
-      break;
-
-    case 'F':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->flagged : 0);
-      }
-      else if (!Context || !Context->flagged)
-	optional = 0;
-      break;
-
-    case 'l':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-	mutt_pretty_size (tmp, sizeof (tmp), Context ? Context->size : 0);
-	snprintf (buf, buflen, fmt, tmp);
-      }
-      else if (!Context || !Context->size)
-	optional = 0;
-      break;
-
-    case 'L':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-	mutt_pretty_size (tmp, sizeof (tmp), Context ? Context->vsize: 0);
-	snprintf (buf, buflen, fmt, tmp);
-      }
-      else if (!Context || !Context->pattern)
-	optional = 0;
-      break;
-
-    case 'm':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->msgcount : 0);
-      }
-      else if (!Context || !Context->msgcount)
-	optional = 0;
-      break;
-
-    case 'M':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof(fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->vcount : 0);
-      }
-      else if (!Context || !Context->pattern)
-	optional = 0;
-      break;
-
-    case 'n':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->new : 0);
-      }
-      else if (!Context || !Context->new)
-	optional = 0;
-      break;
-
-    case 'o':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->unread - Context->new : 0);
-      }
-      else if (!Context || !(Context->unread - Context->new))
-	optional = 0;
-      break;
-
-    case 'p':
-      count = mutt_num_postponed (0);
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, count);
-      }
-      else if (!count)
-	optional = 0;
-      break;
+    }
+    else if (!Context || !Context->size)
+      optional = 0;
+    break;
 
-    case 'P':
-      if (menu->top + menu->pagelen >= menu->max)
-	cp = menu->top ? "end" : "all";
-      else
-      {
-	count = (100 * (menu->top + menu->pagelen)) / menu->max;
-	snprintf (tmp, sizeof (tmp), "%d%%", count);
-	cp = tmp;
-      }
+  case 'L':
+    if (!optional) {
       snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      snprintf (buf, buflen, fmt, cp);
-      break;
+      mutt_pretty_size (tmp, sizeof (tmp), Context ? Context->vsize : 0);
+      snprintf (buf, buflen, fmt, tmp);
+    }
+    else if (!Context || !Context->pattern)
+      optional = 0;
+    break;
+
+  case 'm':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->msgcount : 0);
+    }
+    else if (!Context || !Context->msgcount)
+      optional = 0;
+    break;
+
+  case 'M':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->vcount : 0);
+    }
+    else if (!Context || !Context->pattern)
+      optional = 0;
+    break;
+
+  case 'n':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->new : 0);
+    }
+    else if (!Context || Context->new <= 0)
+      optional = 0;
+    break;
+
+  case 'o':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt,
+                Context ? Context->unread - Context->new : 0);
+    }
+    else if (!Context || !(Context->unread - Context->new))
+      optional = 0;
+    break;
+
+  case 'p':
+    count = mutt_num_postponed (0);
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, count);
+    }
+    else if (!count)
+      optional = 0;
+    break;
+
+  case 'P':
+    if (menu->top + menu->pagelen >= menu->max)
+      cp = menu->top ? "end" : "all";
+    else {
+      count = (100 * (menu->top + menu->pagelen)) / menu->max;
+      snprintf (tmp, sizeof (tmp), "%d%%", count);
+      cp = tmp;
+    }
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    snprintf (buf, buflen, fmt, cp);
+    break;
 
-    case 'r':
+  case 'r':
     {
       int i = 0;
 
-      if (Context)
-      {
-	i = option(OPTATTACHMSG) ? 3 : ((Context->readonly ||
-          Context->dontwrite) ? 2 : (Context->changed || (
-#ifdef USE_IMAP
-        /* deleted doesn't necessarily mean changed in IMAP */
-          Context->magic != M_IMAP &&
-#endif
-          Context->deleted)) ? 1 : 0);
+      if (Context) {
+        /* XXX: deleted doesn't necessarily mean changed in IMAP */
+        i = option (OPTATTACHMSG) ? 3
+            : ((Context->readonly || Context->dontwrite) ? 2
+               : (Context->changed || (Context-> magic != M_IMAP && Context->
+                                        deleted)) ? 1 : 0);
       }
-      
+
       if (!StChars)
-	buf[0] = 0;
-      else if (i >= mutt_strlen(StChars))
-	buf[0] = StChars[0];
+        buf[0] = 0;
+      else if (i >= m_strlen(StChars))
+        buf[0] = StChars[0];
       else
-	buf[0] = StChars[i];
+        buf[0] = StChars[i];
 
       buf[1] = 0;
       break;
     }
-      
-    case 's':
-      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      snprintf (buf, buflen, fmt,
-		get_sort_str (tmp, sizeof (tmp), Sort));
-      break;
 
-    case 'S':
-      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      snprintf (buf, buflen, fmt,
-		get_sort_str (tmp, sizeof (tmp), SortAux));
-      break;
+  case 's':
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    snprintf (buf, buflen, fmt, get_sort_str (tmp, sizeof (tmp), Sort));
+    break;
 
-    case 't':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->tagged : 0);
-      }
-      else if (!Context || !Context->tagged)
-	optional = 0;
-      break;
+  case 'S':
+    snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+    snprintf (buf, buflen, fmt, get_sort_str (tmp, sizeof (tmp), SortAux));
+    break;
 
-    case 'u':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-	snprintf (buf, buflen, fmt, Context ? Context->unread : 0);
-      }
-      else if (!Context || !Context->unread)
-	optional = 0;
-      break;
+  case 't':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->tagged : 0);
+    }
+    else if (!Context || !Context->tagged)
+      optional = 0;
+    break;
+
+  case 'u':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+      snprintf (buf, buflen, fmt, Context ? Context->unread : 0);
+    }
+    else if (!Context || !Context->unread)
+      optional = 0;
+    break;
 
-    case 'v':
-      snprintf (fmt, sizeof (fmt), "Mutt-ng %%s");
-      snprintf (buf, buflen, fmt, MUTT_VERSION);
-      break;
+  case 'v':
+    m_strcpy(buf, buflen, mutt_make_version(0));
+    break;
 
-    case 'V':
-      if (!optional)
-      {
-	snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
-	snprintf (buf, buflen, fmt, (Context && Context->pattern) ? Context->pattern : "");
-      }
-      else if (!Context || !Context->pattern)
-	optional = 0;
-      break;
+  case 'V':
+    if (!optional) {
+      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+      snprintf (buf, buflen, fmt,
+                (Context && Context->pattern) ? Context->pattern : "");
+    }
+    else if (!Context || !Context->pattern)
+      optional = 0;
+    break;
 
-    case 0:
-      *buf = 0;
-      return (src);
+  case 0:
+    *buf = 0;
+    return (src);
 
-    default:
-      snprintf (buf, buflen, "%%%s%c", prefix, op);
-      break;
+  default:
+    snprintf (buf, buflen, "%%%s%c", prefix, op);
+    break;
   }
 
   if (optional)
@@ -326,7 +300,13 @@ status_format_str (char *buf, size_t buflen, char op, const char *src,
   return (src);
 }
 
-void menu_status_line (char *buf, size_t buflen, MUTTMENU *menu, const char *p)
-{
-  mutt_FormatString (buf, buflen, p, status_format_str, (unsigned long) menu, 0);
+void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
+  /*
+   * if we have enough space for buffer, format lines to $COLS-$SidebarWidth
+   * only to not wrap past end of screen
+   */
+  int width = COLS - SW;
+  mutt_FormatString (buf, (width >= len ? len : (width + 1)),
+                     p, status_format_str,
+                     (unsigned long) menu, 0);
 }