X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=aa029ed082cf2b6125f8aa62980d401b53f1b68a;hp=510eccf24e605893ba127fb9afb74d54574a4755;hb=e7a772dca1b86e4036d25038ee67aa34dd217c07;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 510eccf..aa029ed 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -14,10 +14,9 @@
 #include <lib-lib/lib-lib.h>
 
 #include <termios.h>
-#ifdef HAVE_LANGINFO_YESEXPR
 #include <langinfo.h>
-#endif
 
+#include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
@@ -111,11 +110,9 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
     addstr (field);
     mutt_refresh ();
     getyx (stdscr, y, x);
-    ret =
-      _mutt_enter_string (buf, buflen, y, x, complete, multiple, files,
-                          numfiles, es);
-  }
-  while (ret == 1);
+    ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
+                             numfiles, es);
+  } while (ret == 1);
   CLEARLINE (LINES - 1);
   mutt_free_enter_state (&es);
 
@@ -140,12 +137,12 @@ void mutt_clear_error (void)
     CLEARLINE (LINES - 1);
 }
 
-void mutt_edit_file (const char *editor, const char *data)
+void mutt_edit_file(const char *data)
 {
   char cmd[LONG_STRING];
 
   mutt_endwin (NULL);
-  m_quotefile_fmt(cmd, sizeof (cmd), editor, data);
+  m_quotefile_fmt(cmd, sizeof (cmd), MCore.editor, data);
   if (mutt_system (cmd) == -1)
     mutt_error (_("Error running \"%s\"!"), cmd);
   keypad (stdscr, TRUE);
@@ -155,12 +152,10 @@ void mutt_edit_file (const char *editor, const char *data)
 int mutt_yesorno (const char *msg, int def)
 {
   event_t ch;
-  char *yes = _("yes");
-  char *no = _("no");
+  const char *yes = _("yes");
+  const char *no = _("no");
   char *answer_string;
   ssize_t answer_string_len;
-
-#ifdef HAVE_LANGINFO_YESEXPR
   char *expr;
   regex_t reyes;
   regex_t reno;
@@ -174,7 +169,6 @@ int mutt_yesorno (const char *msg, int def)
     !regcomp (&reyes, expr, REG_NOSUB | REG_EXTENDED);
   reno_ok = (expr = nl_langinfo (NOEXPR)) && expr[0] == '^' &&
     !regcomp (&reno, expr, REG_NOSUB | REG_EXTENDED);
-#endif
 
   CLEARLINE (LINES - 1);
 
@@ -201,20 +195,14 @@ int mutt_yesorno (const char *msg, int def)
       break;
     }
 
-#ifdef HAVE_LANGINFO_YESEXPR
     answer[0] = ch.ch;
     if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
-#else
-    if (tolower (ch.ch) == *yes)
-#endif
     {
       def = M_YES;
       break;
     }
     else if (
-#ifdef HAVE_LANGINFO_YESEXPR
               reno_ok ? (regexec (&reno, answer, 0, 0, 0) == 0) :
-#endif
               (tolower (ch.ch) == *no)) {
       def = M_NO;
       break;
@@ -223,12 +211,10 @@ int mutt_yesorno (const char *msg, int def)
     }
   }
 
-#ifdef HAVE_LANGINFO_YESEXPR
   if (reyes_ok)
     regfree (&reyes);
   if (reno_ok)
     regfree (&reno);
-#endif
 
   if (def != -1) {
     addstr ((char *) (def == M_YES ? yes : no));
@@ -391,30 +377,6 @@ int mutt_any_key_to_continue (const char *s)
   return (ch);
 }
 
-int mutt_do_pager (const char *banner,
-                   const char *tempfile, int do_color, pager_t * info)
-{
-  int rc;
-
-  if (!Pager || m_strcmp(Pager, "builtin") == 0)
-    rc = mutt_pager (banner, tempfile, do_color, info);
-  else {
-    char cmd[STRING];
-
-    mutt_endwin (NULL);
-    m_quotefile_fmt(cmd, sizeof (cmd), Pager, tempfile);
-    if (mutt_system (cmd) == -1) {
-      mutt_error (_("Error running \"%s\"!"), cmd);
-      rc = -1;
-    }
-    else
-      rc = 0;
-    mutt_unlink (tempfile);
-  }
-
-  return rc;
-}
-
 int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
                        int *redraw, int buffy, int multiple, char ***files,
                        int *numfiles)
@@ -498,7 +460,7 @@ void mutt_curs_set (int cursor)
 }
 #endif
 
-int mutt_multi_choice (char *prompt, char *letters)
+int mutt_multi_choice (const char *prompt, const char *letters)
 {
   event_t ch;
   int choice;
@@ -706,32 +668,3 @@ void mutt_paddstr (int n, const char *s)
     addch (' ');
 }
 
-/*
- * mutt_strwidth is like m_strlenexcept that it returns the width
- * refering to the number of characters cells.
- */
-
-int mutt_strwidth (const char *s)
-{
-  wchar_t wc;
-  int w;
-  ssize_t k, n;
-  mbstate_t mbstate;
-
-  if (!s)
-    return 0;
-
-  n = m_strlen(s);
-
-  p_clear(&mbstate, 1);
-  for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
-    if (k == -1 || k == -2) {
-      k = (k == -1) ? 1 : n;
-      wc = CharsetReplacement;
-    }
-    if (!iswprint(wc))
-      wc = '?';
-    w += wcwidth (wc);
-  }
-  return w;
-}