X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=2e29e65ad553a6db837086b5a986cac41d448f6f;hp=19a8c70ab7f38f770b8fc6f6d431fc8029e78e0a;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=690944eebbe058753a56dd10a455943507dc44e7

diff --git a/pager.c b/pager.c
index 19a8c70..2e29e65 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;
@@ -337,7 +336,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
             class->color = ColorQuote[0];
             *QuoteList = class;
         }
-        return (*QuoteList);
+        return *QuoteList;
     }
 
     /* Did I mention how much I like emulating Lisp in C? */
@@ -734,7 +733,7 @@ static int is_ansi(unsigned char *buf)
 {
     while (isdigit(*buf) || *buf == ';')
         buf++;
-    return (*buf == 'm');
+    return *buf == 'm';
 }
 
 static int check_attachment_marker(char *p)
@@ -776,7 +775,7 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
             fseeko (f, offset, 0);
         if (fgets ((char *) buf, blen - 1, f) == NULL) {
             fmt[0] = 0;
-            return (-1);
+            return -1;
         }
         *last_pos = ftello (f);
         b_read = (int) (*last_pos - offset);
@@ -1017,7 +1016,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
            &buf_ready) < 0) {
         if (change_last)
           (*last)--;
-        return (-1);
+        return -1;
       }
 
       resolve_types ((char *) fmt, (char *) buf, *lineInfo, n, *last,
@@ -1049,7 +1048,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
          &buf_ready) < 0) {
       if (change_last)
         (*last)--;
-      return (-1);
+      return -1;
     }
     regexec ((regex_t *) QuoteRegexp.rx, (char *) fmt, 1, pmatch, 0);
     (*lineInfo)[n].quote = classify_quote (QuoteList,
@@ -1065,7 +1064,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
          &buf_ready) < 0) {
       if (change_last)
         (*last)--;
-      return (-1);
+      return -1;
     }
 
     offset = 0;
@@ -1095,18 +1094,18 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
 
   if (!(flags & M_SHOW) && (*lineInfo)[n + 1].offset > 0) {
     /* we've already scanned this line, so just exit */
-    return (0);
+    return 0;
   }
   if ((flags & M_SHOWCOLOR) && *force_redraw && (*lineInfo)[n + 1].offset > 0) {
     /* no need to try to display this line... */
-    return (1);                 /* fake display */
+    return 1;                 /* fake display */
   }
 
   if ((b_read = fill_buffer (f, last_pos, (*lineInfo)[n].offset, buf, fmt,
                              sizeof (buf), &buf_ready)) < 0) {
     if (change_last)
       (*last)--;
-    return (-1);
+    return -1;
   }
 
   /* now chose a good place to break the line */
@@ -1189,7 +1188,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
   if (!(flags & M_SHOW))
     flags = 0;
 
-  return (flags);
+  return flags;
 }
 
 static int upNLines (int nlines, struct line_t *info, int cur, int hiding)
@@ -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) */
@@ -1244,13 +1242,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   if ((fp = fopen (fname, "r")) == NULL) {
     mutt_perror (fname);
-    return (-1);
+    return -1;
   }
 
   if (stat (fname, &sb) != 0) {
     mutt_perror (fname);
     m_fclose(&fp);
-    return (-1);
+    return -1;
   }
   unlink (fname);
 
@@ -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) {
@@ -2208,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);
@@ -2277,7 +2267,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   p_delete(&lineInfo);
   if (pager_index)
     mutt_menuDestroy (&pager_index);
-  return (rc != -1 ? rc : 0);
+  return rc != -1 ? rc : 0;
 }
 
 #undef CHECK_ATTACH