many simplifications, copyright statements.

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

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 318ee85..125e5ca 100644 (file)
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <wchar.h>
+#include <wctype.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -33,7 +34,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_signal.h>
 
 #include "curses.h"
 #include "menu.h"
@@ -41,14 +44,14 @@
 
 #include "mutt.h"
 #include "pager.h"
-#include "mbyte.h"
+#include "charset.h"
 
 /* not possible to unget more than one char under some curses libs, and it
  * is impossible to unget function keys in SLang, so roll our own input
  * buffering routines.
  */
-size_t UngetCount = 0;
-static size_t UngetBufLen = 0;
+ssize_t UngetCount = 0;
+static ssize_t UngetBufLen = 0;
 static event_t *KeyEvent;
 
 void mutt_refresh (void)
@@ -112,7 +115,7 @@ event_t mutt_getch (void)
   return (ch == ctrl ('G') ? err : ret);
 }
 
-int _mutt_get_field ( const char *field, char *buf, size_t buflen,
+int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
                      int complete, int multiple, char ***files, int *numfiles)
 {
   int ret;
@@ -136,7 +139,7 @@ int _mutt_get_field ( const char *field, char *buf, size_t buflen,
   return (ret);
 }
 
-int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags)
+int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags)
 {
   int rc;
 
@@ -172,7 +175,7 @@ int mutt_yesorno (const char *msg, int def)
   char *yes = _("yes");
   char *no = _("no");
   char *answer_string;
-  size_t answer_string_len;
+  ssize_t answer_string_len;
 
 #ifdef HAVE_LANGINFO_YESEXPR
   char *expr;
@@ -217,11 +220,11 @@ int mutt_yesorno (const char *msg, int def)
 
 #ifdef HAVE_LANGINFO_YESEXPR
     answer[0] = ch.ch;
-    if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) :
+    if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
 #else
-    if (
+    if (tolower (ch.ch) == *yes)
 #endif
-         (tolower (ch.ch) == *yes)) {
+    {
       def = M_YES;
       break;
     }
@@ -232,8 +235,7 @@ int mutt_yesorno (const char *msg, int def)
               (tolower (ch.ch) == *no)) {
       def = M_NO;
       break;
-    }
-    else {
+    } else {
       BEEP ();
     }
   }
@@ -277,7 +279,6 @@ void mutt_curses_error (const char *fmt, ...)
   vsnprintf (Errorbuf, sizeof (Errorbuf), fmt, ap);
   va_end (ap);
 
-  debug_print (1, ("%s\n", Errorbuf));
   mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf),
                       0, COLS - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
   snprintf (Errorbuf, sizeof (Errorbuf), "%s", TmpErrorbuf);    /* overkill */
@@ -376,8 +377,6 @@ void mutt_endwin (const char *msg)
 void _mutt_perror (const char *s, const char* filename, int line)
 {
   char *p = strerror (errno);
-
-  debug_print (1, ("%s: %s (errno = %d)\n", s, p ? p : "unknown error", errno));
   mutt_error ("%s: %s (errno = %d) from %s:%i", s, p ? p : _("unknown error"), errno, filename, line);
 }
 
@@ -433,7 +432,7 @@ int mutt_do_pager (const char *banner,
   return rc;
 }
 
-int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
+int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
                        int *redraw, int buffy, int multiple, char ***files,
                        int *numfiles)
 {
@@ -558,11 +557,11 @@ int mutt_addwch (wchar_t wc)
 {
   char buf[MB_LEN_MAX * 2];
   mbstate_t mbstate;
-  size_t n1, n2;
+  ssize_t n1, n2;
 
   p_clear(&mbstate, 1);
-  if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) ||
-      (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1))
+  if ((n1 = wcrtomb(buf, wc, &mbstate)) == -1 ||
+      (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
     return -1;                  /* ERR */
   else
     return addstr (buf);
@@ -595,7 +594,7 @@ void mutt_format_string (char *dest, ssize_t destlen,
   for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
     if (k == -1 || k == -2) {
       k = (k == -1) ? 1 : n;
-      wc = replacement_char ();
+      wc = CharsetReplacement;
     }
     if (arboreal && wc < M_TREE_MAX)
       w = 1;                    /* hack */
@@ -639,8 +638,7 @@ void mutt_format_string (char *dest, ssize_t destlen,
  * the number of character cells when printed.
  */
 
-static void mutt_format_s_x (char *dest,
-                             size_t destlen,
+static void mutt_format_s_x (char *dest, ssize_t destlen,
                              const char *prefix, const char *s, int arboreal)
 {
   int right_justify = 1;
@@ -662,14 +660,14 @@ static void mutt_format_s_x (char *dest,
                       right_justify, ' ', s, m_strlen(s), arboreal);
 }
 
-void mutt_format_s (char *dest,
-                    size_t destlen, const char *prefix, const char *s)
+void mutt_format_s (char *dest, ssize_t destlen,
+                    const char *prefix, const char *s)
 {
   mutt_format_s_x (dest, destlen, prefix, s, 0);
 }
 
-void mutt_format_s_tree (char *dest,
-                         size_t destlen, const char *prefix, const char *s)
+void mutt_format_s_tree (char *dest, ssize_t destlen,
+                         const char *prefix, const char *s)
 {
   mutt_format_s_x (dest, destlen, prefix, s, 1);
 }
@@ -683,15 +681,15 @@ void mutt_paddstr (int n, const char *s)
 {
   wchar_t wc;
   int w;
-  size_t k;
-  size_t len = m_strlen(s);
+  ssize_t k;
+  ssize_t len = m_strlen(s);
   mbstate_t mbstate;
 
   p_clear(&mbstate, 1);
   for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
-    if (k == (size_t) (-1) || k == (size_t) (-2)) {
-      k = (k == (size_t) (-1)) ? 1 : len;
-      wc = replacement_char ();
+    if (k == -1 || k == -2) {
+      k = (k == -1) ? 1 : len;
+      wc = CharsetReplacement;
     }
     if (!IsWPrint (wc))
       wc = '?';
@@ -716,7 +714,7 @@ int mutt_strwidth (const char *s)
 {
   wchar_t wc;
   int w;
-  size_t k, n;
+  ssize_t k, n;
   mbstate_t mbstate;
 
   if (!s)
@@ -726,9 +724,9 @@ int mutt_strwidth (const char *s)
 
   p_clear(&mbstate, 1);
   for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
-    if (k == (size_t) (-1) || k == (size_t) (-2)) {
-      k = (k == (size_t) (-1)) ? 1 : n;
-      wc = replacement_char ();
+    if (k == -1 || k == -2) {
+      k = (k == -1) ? 1 : n;
+      wc = CharsetReplacement;
     }
     if (!IsWPrint (wc))
       wc = '?';