Do not use implicit ncurses functions, now we can grep for 'stdscr' to find them.

[apps/madmutt.git] / lib-ui / curs_lib.c

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 72560b6..53609b5 100644 (file)
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -52,7 +52,7 @@ void mutt_refresh (void)
         return;
 
     /* else */
-    refresh ();
+    wrefresh (stdscr);
 }
 
 void mutt_need_hard_redraw (void)
@@ -73,7 +73,7 @@ event_t mutt_getch (void)
   SigInt = 0;
 
   mutt_allow_interrupt (1);
-  ch = getch ();
+  ch = wgetch (stdscr);
   mutt_allow_interrupt (0);
 
   if (SigInt)
@@ -97,7 +97,7 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
 
   do {
     CLEARLINE (LINES - 1);
-    addstr (field);
+    waddstr (stdscr, field);
     mutt_refresh ();
     getyx (stdscr, y, x);
     ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
@@ -172,7 +172,7 @@ int mutt_yesorno (const char *msg, int def)
   snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
             def == M_YES ? no : yes);
   answer_string_len = m_strlen(answer_string);
-  printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
+  wprintw (stdscr, "%.*s%s", COLS - answer_string_len, msg, answer_string);
   p_delete(&answer_string);
 
   for (;;) {
@@ -207,7 +207,7 @@ int mutt_yesorno (const char *msg, int def)
     regfree (&reno);
 
   if (def != -1) {
-    addstr ((char *) (def == M_YES ? yes : no));
+    waddstr (stdscr, (char *) (def == M_YES ? yes : no));
     mutt_refresh ();
   }
   return (def);
@@ -219,7 +219,7 @@ void mutt_query_exit (void)
   mutt_flushinp ();
   curs_set (1);
   if (Timeout)
-    timeout (-1);               /* restore blocking operation */
+    wtimeout (stdscr, -1);               /* restore blocking operation */
   if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) {
     mutt_endwin (NULL);
     exit (1);
@@ -245,8 +245,8 @@ void mutt_curses_error (const char *fmt, ...)
   if (!option (OPTKEEPQUIET)) {
     BEEP ();
     SETCOLOR (MT_COLOR_ERROR);
-    mvaddstr (LINES - 1, 0, Errorbuf);
-    clrtoeol ();
+    mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+    wclrtoeol (stdscr);
     SETCOLOR (MT_COLOR_NORMAL);
     mutt_refresh ();
   }
@@ -297,8 +297,8 @@ void mutt_curses_message (const char *fmt, ...)
 
   if (!option (OPTKEEPQUIET)) {
     SETCOLOR (MT_COLOR_MESSAGE);
-    mvaddstr (LINES - 1, 0, Errorbuf);
-    clrtoeol ();
+    mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+    wclrtoeol (stdscr);
     SETCOLOR (MT_COLOR_NORMAL);
     mutt_refresh ();
   }
@@ -313,7 +313,7 @@ void mutt_show_error (void)
 
   SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
   CLEARLINE (LINES - 1);
-  addstr (Errorbuf);
+  waddstr (stdscr, Errorbuf);
   SETCOLOR (MT_COLOR_NORMAL);
 }
 
@@ -322,7 +322,7 @@ void mutt_endwin (const char *msg)
   if (!option (OPTNOCURSES)) {
     CLEARLINE (LINES - 1);
 
-    attrset (A_NORMAL);
+    wattrset (stdscr, A_NORMAL);
     mutt_refresh ();
     endwin ();
   }
@@ -373,11 +373,11 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
 {
   event_t ch;
 
-  mvaddstr (LINES - 1, 0, (char *) prompt);
-  addstr (_(" ('?' for list): "));
+  mvwaddstr (stdscr, LINES - 1, 0, (char *) prompt);
+  waddstr (stdscr, _(" ('?' for list): "));
   if (buf[0])
-    addstr (buf);
-  clrtoeol ();
+    waddstr (stdscr, buf);
+  wclrtoeol (stdscr);
   mutt_refresh ();
 
   ch = mutt_getch ();
@@ -454,8 +454,8 @@ int mutt_multi_choice (const char *prompt, const char *letters)
   int choice;
   char *p;
 
-  mvaddstr (LINES - 1, 0, prompt);
-  clrtoeol ();
+  mvwaddstr (stdscr, LINES - 1, 0, prompt);
+  wclrtoeol (stdscr);
   for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
@@ -497,7 +497,7 @@ int mutt_addwch (wchar_t wc)
       (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
     return -1;                  /* ERR */
   else
-    return addstr (buf);
+    return waddstr (stdscr, buf);
 }
 
 ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
@@ -625,7 +625,7 @@ void mutt_format_s_tree (char *dest, ssize_t destlen,
 
 /*
  * mutt_paddstr (n, s) is almost equivalent to
- * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), addstr (bigbuf)
+ * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), waddstr (stdscr, bigbuf)
  */
 
 void mutt_paddstr (int n, const char *s)
@@ -648,12 +648,12 @@ void mutt_paddstr (int n, const char *s)
     if (w >= 0) {
       if (w > n)
         break;
-      addnstr ((char *) s, k);
+      waddnstr (stdscr, (char *) s, k);
       n -= w;
     }
   }
   while (n-- > 0)
-    addch (' ');
+    waddch (stdscr, ' ');
 }
 
 /* this routine should be called after receiving SIGWINCH */