drop mem_alloc and mem_free, use my own hand crafted optmized macros that

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index dfd4cbe..c3800df 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -15,6 +15,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
@@ -43,6 +45,7 @@
 #include "lib/rx.h"
 #include "lib/debug.h"
 
+#include <wchar.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -106,7 +109,7 @@ struct syntax_t {
 };
 
 struct line_t {
-  LOFF_T offset;
+  off_t offset;
   short type;
   short continuation;
   short chunks;
@@ -352,8 +355,8 @@ static void cleanup_quote (struct q_class_t **QuoteList)
       cleanup_quote (&((*QuoteList)->down));
     ptr = (*QuoteList)->next;
     if ((*QuoteList)->prefix)
-      mem_free (&(*QuoteList)->prefix);
-    mem_free (QuoteList);
+      p_delete(&(*QuoteList)->prefix);
+    p_delete(QuoteList);
     *QuoteList = ptr;
   }
 
@@ -853,12 +856,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a)
         pos += 2;
       }
       else if (buf[pos] == '0' && (pos + 1 == x || buf[pos + 1] == ';')) {
-#ifdef HAVE_COLOR
-        if (a->pair != -1)
-          mutt_free_color (a->fg, a->bg);
-#endif
-        a->attr = ANSI_OFF;
-        a->pair = -1;
+        a->bg = -2;
+        a->fg = -2;
         pos += 2;
       }
       else if (buf[pos] == '3' && isdigit (buf[pos + 1])) {
@@ -913,7 +912,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
 }
 
 static int
-fill_buffer (FILE * f, LOFF_T *last_pos, LOFF_T offset, unsigned char *buf,
+fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
              unsigned char *fmt, size_t blen, int *buf_ready)
 {
   unsigned char *p;
@@ -1135,7 +1134,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
  */
 
 static int
-display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
+display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
               int *last, int *max, int flags, struct q_class_t **QuoteList,
               int *q_level, int *force_redraw, regex_t * SearchRE)
 {
@@ -1161,7 +1160,7 @@ display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
       memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
       (*lineInfo)[ch].type = -1;
       (*lineInfo)[ch].search_cnt = -1;
-      (*lineInfo)[ch].syntax = mem_malloc (sizeof (struct syntax_t));
+      (*lineInfo)[ch].syntax = p_new(struct syntax_t, 1);
       ((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last =
         -1;
     }
@@ -1236,7 +1235,7 @@ display_line (FILE * f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
         mem_realloc (&((*lineInfo)[n].search),
                       ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
       else
-        (*lineInfo)[n].search = mem_malloc (sizeof (struct syntax_t));
+        (*lineInfo)[n].search = p_new(struct syntax_t, 1);
       pmatch[0].rm_so += offset;
       pmatch[0].rm_eo += offset;
       ((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first =
@@ -1428,7 +1427,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   int r = -1;
   int redraw = REDRAW_FULL;
   FILE *fp = NULL;
-  LOFF_T last_pos = 0, last_offset = 0;
+  off_t last_pos = 0, last_offset = 0;
   int old_smart_wrap, old_markers;
   struct stat sb;
   regex_t SearchRE;
@@ -1473,12 +1472,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     mutt_set_flag (Context, extra->hdr, M_READ, 1);
   }
 
-  lineInfo = mem_malloc (sizeof (struct line_t) * (maxLine = LINES));
+  lineInfo = p_new(struct line_t, maxLine = LINES);
   for (i = 0; i < maxLine; i++) {
     memset (&lineInfo[i], 0, sizeof (struct line_t));
     lineInfo[i].type = -1;
     lineInfo[i].search_cnt = -1;
-    lineInfo[i].syntax = mem_malloc (sizeof (struct syntax_t));
+    lineInfo[i].syntax = p_new(struct syntax_t, 1);
     (lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1;
   }
 
@@ -1540,8 +1539,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
       if (option (OPTHELP)) {
         SETCOLOR (MT_COLOR_STATUS);
-        move (helpoffset, 0);
-        mutt_paddstr (COLS, helpstr);
+        move (helpoffset, SW);
+        mutt_paddstr (COLS-SW, helpstr);
         SETCOLOR (MT_COLOR_NORMAL);
       }
 
@@ -1556,7 +1555,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         lines = Resize->line;
         redraw |= REDRAW_SIGWINCH;
 
-        mem_free (&Resize);
+        p_delete(&Resize);
       }
 #endif
 
@@ -1663,13 +1662,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
                            Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
       }
-      if (option(OPTSTATUSONTOP)) {
-        move(0,0);
-      } else {
-        move(LINES-2,SW);
-      }
-      mutt_paddstr (COLS - 10 - (option(OPTSTATUSONTOP)?0:SW), IsHeader (extra)
-                    || IsMsgAttach (extra) ? buffer : banner);
+      move(statusoffset,SW);
+      mutt_paddstr (COLS - 10 - SW, IsHeader (extra) || 
+                    IsMsgAttach (extra) ? buffer : banner);
 
       addstr (" -- (");
       if (last_pos < sb.st_size - 1)
@@ -1690,12 +1685,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       sidebar_draw (MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL (Status));
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
-            option (OPTSTATUSONTOP) ? 0 : SW);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SW);
       SETCOLOR (MT_COLOR_STATUS);
       BKGDSET (MT_COLOR_STATUS);
-      mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SW),
-                    buffer);
+      mutt_paddstr (COLS-SW, buffer);
       SETCOLOR (MT_COLOR_NORMAL);
       BKGDSET (MT_COLOR_NORMAL);
     }
@@ -1745,7 +1738,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
           lines++;
 
       if (flags & M_PAGER_RETWINCH) {
-        Resize = mem_malloc (sizeof (struct resize));
+        Resize = p_new(struct resize, 1);
 
         Resize->line = lines;
         Resize->SearchCompiled = SearchCompiled;
@@ -1765,7 +1758,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
           mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
           if (SearchCompiled && lineInfo[i].search)
-            mem_free (&(lineInfo[i].search));
+            p_delete(&(lineInfo[i].search));
         }
 
         lastLine = 0;
@@ -1941,7 +1934,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         regfree (&SearchRE);
         for (i = 0; i < lastLine; i++) {
           if (lineInfo[i].search)
-            mem_free (&(lineInfo[i].search));
+            p_delete(&(lineInfo[i].search));
           lineInfo[i].search_cnt = -1;
         }
       }
@@ -1955,7 +1948,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         for (i = 0; i < maxLine; i++) {
           /* cleanup */
           if (lineInfo[i].search)
-            mem_free (&(lineInfo[i].search));
+            p_delete(&(lineInfo[i].search));
           lineInfo[i].search_cnt = -1;
         }
         SearchFlag = 0;
@@ -2247,7 +2240,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
           mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
           if (SearchCompiled && lineInfo[i].search)
-            mem_free (&(lineInfo[i].search));
+            p_delete(&(lineInfo[i].search));
         }
 
         if (SearchCompiled) {
@@ -2636,15 +2629,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   cleanup_quote (&QuoteList);
 
   for (i = 0; i < maxLine; i++) {
-    mem_free (&(lineInfo[i].syntax));
+    p_delete(&(lineInfo[i].syntax));
     if (SearchCompiled && lineInfo[i].search)
-      mem_free (&(lineInfo[i].search));
+      p_delete(&(lineInfo[i].search));
   }
   if (SearchCompiled) {
     regfree (&SearchRE);
     SearchCompiled = 0;
   }
-  mem_free (&lineInfo);
+  p_delete(&lineInfo);
   if (index)
     mutt_menuDestroy (&index);
   return (rc != -1 ? rc : 0);