X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=b283e42cb37b662d6777b5cb09c2e47bde432ea1;hp=dc42e300abd7b56910d0babfee68f88405cdee53;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=51f3b41879d6df19c4549803a11e9f0dd34c8ffb

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index dc42e30..b283e42 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -21,7 +21,7 @@
 #include <lib-sys/mutt_signal.h>
 
 #include "menu.h"
-#include "enter.h"
+#include "browser.h"
 
 #include "mutt.h"
 #include "pager.h"
@@ -42,7 +42,7 @@ event_t mutt_getch (void)
   event_t err = { -1, OP_NULL }, ret;
 
   if (!option (OPTUNBUFFEREDINPUT) && UngetCount)
-    return (KeyEvent[--UngetCount]);
+    return KeyEvent[--UngetCount];
 
   SigInt = 0;
 
@@ -58,45 +58,7 @@ event_t mutt_getch (void)
 
   ret.ch = ch;
   ret.op = 0;
-  return (ch == ctrl ('G') ? err : ret);
-}
-
-#ifndef waddnwstr
-int waddwch(WINDOW *win, wchar_t wc)
-{
-    char buf[MB_LEN_MAX * 2];
-    mbstate_t mbstate;
-    ssize_t n1, n2;
-
-    p_clear(&mbstate, 1);
-    if ((n1 = wcrtomb(buf, wc, &mbstate)) == -1
-    ||  (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
-        return -1;                  /* ERR */
-    return waddstr(win, buf);
-}
-#endif
-
-
-int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
-                     int complete, int multiple, char ***files, int *numfiles)
-{
-  int ret;
-  int x, y;
-
-  ENTER_STATE *es = mutt_new_enter_state ();
-
-  do {
-    CLEARLINE(stdscr, LINES - 1);
-    waddstr (stdscr, field);
-    mutt_refresh ();
-    getyx (stdscr, y, x);
-    ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
-                             numfiles, es);
-  } while (ret == 1);
-  CLEARLINE(stdscr, LINES - 1);
-  mutt_free_enter_state (&es);
-
-  return (ret);
+  return ch == ctrl ('G') ? err : ret;
 }
 
 int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags)
@@ -107,7 +69,7 @@ int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags)
   rc = mutt_get_field (msg, buf, buflen, flags);
   unset_option (OPTUNBUFFEREDINPUT);
 
-  return (rc);
+  return rc;
 }
 
 void mutt_clear_error (void)
@@ -148,7 +110,7 @@ void mutt_edit_file(const char *data)
     getmaxyx(main_w, mh, mw);
     SigChild = 0;
 
-    rt = madtty_create(mh - 1, mw);
+    rt = madtty_create(mh - 2, mw);
     pid = madtty_forkpty(rt, args[0], args, &pty);
     if (pid < 0) {
         madtty_destroy(rt);
@@ -156,6 +118,9 @@ void mutt_edit_file(const char *data)
         return;
     }
 
+    SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+    mvwhline(main_w, 0, 0, ACS_HLINE, mw);
+
     nodelay(stdscr, true);
     gettimeofday(&next, NULL);
     while (!SigChild) {
@@ -181,7 +146,7 @@ void mutt_edit_file(const char *data)
 
         gettimeofday(&tv, NULL);
         if (dirty && is_expired(tv, next)) {
-            madtty_draw(rt, main_w, 0, 0);
+            madtty_draw(rt, main_w, 1, 0);
             wrefresh(main_w);
             dirty = 0;
             next = timeval_add(tv, slice);
@@ -265,7 +230,7 @@ int mutt_yesorno (const char *msg, int def)
     mutt_refresh ();
   }
   CLEARLINE(stdscr, LINES - 1);
-  return (def);
+  return def;
 }
 
 /* this function is called when the user presses the abort key */
@@ -413,7 +378,7 @@ int mutt_any_key_to_continue (const char *s)
   close (f);
   fputs ("\r\n", stdout);
   mutt_clear_error ();
-  return (ch);
+  return ch;
 }
 
 int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
@@ -432,7 +397,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
   ch = mutt_getch ();
   if (ch.ch == -1) {
     CLEARLINE(stdscr, LINES - 1);
-    return (-1);
+    return -1;
   }
   else if (ch.ch == '?') {
     mutt_refresh ();
@@ -541,13 +506,13 @@ ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
 
     if (n < 1023949)         /* 10K - 999K */
         /* 51 is magic which causes 10189/10240 to be rounded up to 10 */
-        return snprintf(s, len, "%ldK", (n + 51) / 1024);
+        return snprintf(s, len, "%ldK", (n + 51) / 1024L);
 
     if (n < 10433332)        /* 1.0M - 9.9M */
         return snprintf(s, len, "%3.1fM", n / 1048576.0);
 
     /* (10433332 + 52428) / 1048576 = 10 */
-    return snprintf (s, len, "%ldM", (n + 52428) / 1048576);
+    return snprintf (s, len, "%ldM", (n + 52428) / 1048576L);
 }
 
 /*