Nico Golde:

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index 9dd0f9c..17a08b9 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -16,6 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
@@ -971,7 +975,7 @@ fill_buffer (FILE *f, long *last_pos, long offset, unsigned char *buf,
             unsigned char *fmt, size_t blen, int *buf_ready)
 {
   unsigned char *p;
-  static int b_read;
+  static int b_read = 0;
 
   if (*buf_ready == 0)
   {
@@ -1038,8 +1042,11 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
   wchar_t wc;
   mbstate_t mbstate;
 
-  int wrap_cols = COLS - WrapMargin - SidebarWidth;
-  
+  int wrap_cols = COLS;
+  if (!(flags & (M_SHOWFLAT)))
+    wrap_cols -= WrapMargin;
+  wrap_cols -= SidebarWidth;
+
   if (wrap_cols <= 0)
     wrap_cols = COLS;
   
@@ -1677,13 +1684,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       j = -1;
       while (display_line (fp, &last_pos, &lineInfo, ++i, &lastLine, &maxLine,
             has_types | SearchFlag, &QuoteList, &q_level, &force_redraw,
-            &SearchRE) == 0)
-       if (!lineInfo[i].continuation && ++j == lines)
-       {
-         topline = i;
-         if (!SearchFlag)
-           break;
-       }
+            &SearchRE) == 0) {
+        if (!lineInfo[i].continuation && ++j == lines)
+        {
+          topline = i;
+          if (!SearchFlag)
+            break;
+        }
+        redraw |= REDRAW_SIDEBAR;
+      } /* while */
     }
 
     if ((redraw & REDRAW_BODY) || topline != oldtopline)
@@ -1703,6 +1712,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
            lines++;
          curline++;
                move(lines + bodyoffset, SidebarWidth);
+          redraw |= REDRAW_SIDEBAR;
        }
        last_offset = lineInfo[curline].offset;
       } while (force_redraw);
@@ -1732,17 +1742,17 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       CLEARLINE_WIN(statusoffset);
       if (IsHeader (extra))
       {
-       _mutt_make_string (buffer,
-                          COLS-9-SidebarWidth < sizeof (buffer) ?
-                          COLS-9-SidebarWidth : sizeof (buffer),
-                          NONULL (PagerFmt), Context, extra->hdr, M_FORMAT_MAKEPRINT);
+       size_t l1 = (COLS - 9) * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
+                          Context, extra->hdr, M_FORMAT_MAKEPRINT);
       }
       else if (IsMsgAttach (extra))
       {
-       _mutt_make_string (buffer,
-                          COLS - 9 - SidebarWidth < sizeof (buffer) ?
-                          COLS - 9 - SidebarWidth : sizeof (buffer),
-                          NONULL (PagerFmt), Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
+       size_t l1 = (COLS - 9) * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
+                          Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
       }
       mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?
                    buffer : banner);
@@ -1755,18 +1765,20 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       SETCOLOR (MT_COLOR_NORMAL);
     }
 
+    if (redraw & REDRAW_SIDEBAR)
+      draw_sidebar(MENU_PAGER);
+
     if ((redraw & REDRAW_INDEX) && index)
     {
       /* redraw the pager_index indicator, because the
        * flags for this message might have changed. */
       menu_redraw_current (index);
-         draw_sidebar(MENU_PAGER);
+      draw_sidebar(MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
-                 SidebarWidth);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
       SETCOLOR (MT_COLOR_STATUS);
-      mutt_paddstr (COLS-SidebarWidth, buffer);
+      mutt_paddstr (COLS-(option(OPTSTATUSONTOP)?0:SidebarWidth), buffer);
       SETCOLOR (MT_COLOR_NORMAL);
     }
        /* if we're not using the index, update every time */
@@ -2046,8 +2058,10 @@ search_next:
          while (display_line (fp, &last_pos, &lineInfo, i, &lastLine, 
                                &maxLine, M_SEARCH | (flags & M_PAGER_NSKIP),
                                &QuoteList, &q_level,
-                               &force_redraw, &SearchRE) == 0)
+                               &force_redraw, &SearchRE) == 0) {
            i++;
+            redraw |= REDRAW_SIDEBAR;
+          }
 
          if (!SearchBack)
          {
@@ -2127,8 +2141,10 @@ search_next:
                  (0 == (dretval = display_line (fp, &last_pos, &lineInfo,
                         new_topline, &lastLine, &maxLine, M_TYPES,
                         &QuoteList, &q_level, &force_redraw, &SearchRE))))
-                && lineInfo[new_topline].type != MT_COLOR_QUOTED)
+                && lineInfo[new_topline].type != MT_COLOR_QUOTED) {
+            redraw |= REDRAW_SIDEBAR;
            new_topline++;
+          }
 
          if (dretval < 0)
          {
@@ -2140,8 +2156,10 @@ search_next:
                  (0 == (dretval = display_line (fp, &last_pos, &lineInfo,
                         new_topline, &lastLine, &maxLine, M_TYPES,
                         &QuoteList, &q_level, &force_redraw, &SearchRE))))
-                && lineInfo[new_topline].type == MT_COLOR_QUOTED)
+                && lineInfo[new_topline].type == MT_COLOR_QUOTED) {
            new_topline++;
+            redraw |= REDRAW_SIDEBAR;
+          }
 
          if (dretval < 0)
          {
@@ -2160,8 +2178,10 @@ search_next:
          while (display_line (fp, &last_pos, &lineInfo, i, &lastLine, 
                                &maxLine, has_types, 
                                &QuoteList, &q_level, &force_redraw,
-                               &SearchRE) == 0)
+                               &SearchRE) == 0) {
            i++;
+            redraw |= REDRAW_SIDEBAR;
+          }
          topline = upNLines (bodylen, lineInfo, lastLine, hideQuoted);
        }
        else
@@ -2204,6 +2224,17 @@ search_next:
          mutt_resend_message (NULL, extra->ctx, extra->hdr);
         redraw = REDRAW_FULL;
         break;
+
+      case OP_CHECK_TRADITIONAL:
+        CHECK_MODE (IsHeader (extra));
+        if (!(WithCrypto & APPLICATION_PGP))
+         break;
+        if (!(extra->hdr->security & PGP_TRADITIONAL_CHECKED)) 
+        {
+         ch = -1;
+         rc = OP_CHECK_TRADITIONAL;
+       }
+        break;
       
       case OP_CREATE_ALIAS:
        CHECK_MODE(IsHeader (extra) || IsMsgAttach (extra));
@@ -2345,6 +2376,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
                                        &QuoteList, &q_level, &force_redraw,
                                        &SearchRE) == 0)
          {
+            redraw |= REDRAW_SIDEBAR;
            if (! lineInfo[topline].continuation)
              j--;
            if (j > 0)
@@ -2415,7 +2447,7 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
       case OP_MAIL:
        CHECK_MODE(IsHeader (extra) && !IsAttach (extra));
         CHECK_ATTACH;      
-       ci_send_message (0, NULL, NULL, extra->ctx, extra->hdr);
+       ci_send_message (0, NULL, NULL, extra->ctx, NULL);
        redraw = REDRAW_FULL;
        break;
 
@@ -2486,7 +2518,7 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
        break;
 
       case OP_RECALL_MESSAGE:
-       CHECK_MODE(IsHeader (extra));
+       CHECK_MODE(IsHeader (extra) && !IsAttach(extra));
         CHECK_ATTACH;
        ci_send_message (SENDPOSTPONED, NULL, NULL, extra->ctx, extra->hdr);
        redraw = REDRAW_FULL;
@@ -2667,6 +2699,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 
       case OP_BUFFY_LIST:
        mutt_buffy_list ();
+    redraw |= REDRAW_SIDEBAR;
        break;
 
       case OP_VIEW_ATTACHMENTS:
@@ -2715,7 +2748,9 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
          case OP_SIDEBAR_SCROLL_UP:
          case OP_SIDEBAR_SCROLL_DOWN:
          case OP_SIDEBAR_NEXT:
+         case OP_SIDEBAR_NEXT_NEW:
          case OP_SIDEBAR_PREV:
+         case OP_SIDEBAR_PREV_NEW:
            scroll_sidebar(ch, MENU_PAGER);
                break;
       default: