X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=3bed8200f1c11b32471a9298e8ea944249f899f0;hp=b287a6b429da9f901c235ddbe39634705815118a;hb=9b87576a7ebf2e52a7ca6a0e2dba12fa24bd34dd;hpb=cfd5f411041c7ef44087b032751792fadc74586d

diff --git a/pager.c b/pager.c
index b287a6b..3bed820 100644
--- a/pager.c
+++ b/pager.c
@@ -14,9 +14,8 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
+#include <lib-ui/madtty.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -216,7 +215,7 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags,
   if (special || a->attr) {
     if ((a->attr & ANSI_COLOR)) {
       if (a->pair == -1)
-        a->pair = mutt_alloc_color (a->fg, a->bg);
+        a->pair = madtty_color_pair(a->fg, a->bg);
       color = a->pair;
       if (a->attr & ANSI_BOLD)
         color |= A_BOLD;
@@ -1230,7 +1229,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   int bodyoffset = 1;           /* offset of first line of real text */
   int statusoffset = 0;         /* offset for the status bar */
-  int helpoffset = LINES - 2;   /* offset for the help bar. */
   int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
 
   MUTTMENU *pager_index = NULL;       /* the Pager Index (PI) */
@@ -1276,9 +1274,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
     if (redraw & REDRAW_FULL) {
       SETCOLOR(main_w, MT_COLOR_NORMAL);
-      /* wclear(main_w) doesn't optimize screen redraws */
-      wmove(main_w, 0, 0);
-      wclrtobot(main_w);
+      werase(main_w);
 
       if (IsHeader (extra) && Context->vcount + 1 < PagerIndexLines)
         indexlen = Context->vcount + 1;
@@ -1289,12 +1285,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
       statusoffset = IsHeader (extra) ? indexlen : 0;
       bodyoffset   = statusoffset + 1;
-      helpoffset   = LINES - 2;
-      bodylen      = helpoffset - bodyoffset;
+      bodylen      = LINES - 2 - bodyoffset;
 
-      SETCOLOR(main_w, MT_COLOR_STATUS);
-      wmove(main_w, helpoffset, 0);
-      mutt_paddstr(main_w, getmaxx(main_w), "");
+      SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+      mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w));
       SETCOLOR(main_w, MT_COLOR_NORMAL);
 
       if (Resize != NULL) {
@@ -1443,10 +1437,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       SETCOLOR(main_w, MT_COLOR_NORMAL);
       BKGDSET(main_w, MT_COLOR_NORMAL);
     }
-    /* if we're not using the index, update every time */
-    if (index == 0)
-      sidebar_draw ();
 
+    sidebar_draw ();
     redraw = 0;
     mutt_refresh();
 
@@ -2210,10 +2202,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       }
       break;
 
-    case OP_VERSION:
-      mutt_version ();
-      break;
-
     case OP_BUFFY_LIST:
       if (option (OPTFORCEBUFFYCHECK))
         buffy_check (1);