X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=e8fb02e386ab728c5d357da55503a3d9fa471205;hp=c51f1a4dec99f207ac6fda487125f3fb781716a5;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=4c86444ebf9fc4a8231424c0cdd832eb10abdb35

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index c51f1a4..e8fb02e 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -26,6 +26,7 @@
 #include "mutt.h"
 #include "pager.h"
 #include "charset.h"
+#include "madtty.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
@@ -116,16 +117,83 @@ void mutt_clear_error (void)
     CLEARLINE(stdscr, LINES - 1);
 }
 
+static struct timeval const slice = { 0, 1000 * 1000 / 100 };
+static struct timeval timeval_add(struct timeval a, struct timeval b)
+{
+    int usec = a.tv_usec + b.tv_usec;
+    a.tv_sec += b.tv_sec;
+    while (usec > 1000 * 1000) {
+        a.tv_sec += 1;
+        usec -= 1000 * 1000;
+    }
+    a.tv_usec = usec;
+    return a;
+}
+
+static int is_expired(struct timeval now, struct timeval expiry)
+{
+    return now.tv_sec > expiry.tv_sec
+        || (now.tv_sec == expiry.tv_sec && now.tv_usec > expiry.tv_usec);
+}
+
 void mutt_edit_file(const char *data)
 {
-  char cmd[LONG_STRING];
-
-  mutt_endwin (NULL);
-  m_quotefile_fmt(cmd, sizeof (cmd), mod_core.editor, data);
-  if (mutt_system (cmd) == -1)
-    mutt_error (_("Error running \"%s\"!"), cmd);
-  keypad (stdscr, TRUE);
-  clearok (stdscr, TRUE);
+    char cmd[STRING];
+    const char *args[] = { "/bin/sh", "-c", cmd, NULL };
+    int dirty = 0, ch, res, mh, mw, pty, pid;
+    struct timeval next;
+    madtty_t *rt;
+
+    m_quotefile_fmt(cmd, sizeof(cmd), mod_core.editor, data);
+    getmaxyx(main_w, mh, mw);
+    SigChild = 0;
+
+    rt = madtty_create(mh - 2, mw);
+    pid = madtty_forkpty(rt, args[0], args, &pty);
+    if (pid < 0) {
+        madtty_destroy(rt);
+        mutt_error(_("unable to start editor"));
+        return;
+    }
+
+    SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+    mvwhline(main_w, 0, 0, ACS_HLINE, mw);
+
+    nodelay(stdscr, true);
+    gettimeofday(&next, NULL);
+    while (!SigChild) {
+        struct timeval tv = { 0, 1000 * 1000 / 100 };
+        fd_set rfds;
+
+        FD_ZERO(&rfds);
+        FD_SET(0, &rfds);
+        FD_SET(pty, &rfds);
+
+        if (select(pty + 1, &rfds, NULL, NULL, &tv) < 0)
+            break;
+
+        if (FD_ISSET(pty, &rfds)) {
+            madtty_process(rt);
+            dirty = 1;
+        }
+
+        while ((ch = getch()) != ERR) {
+            madtty_keypress(rt, ch); /* pass the keypress for handling */
+            dirty = 1;
+        }
+
+        gettimeofday(&tv, NULL);
+        if (dirty && is_expired(tv, next)) {
+            madtty_draw(rt, main_w, 1, 0);
+            wrefresh(main_w);
+            dirty = 0;
+            next = timeval_add(tv, slice);
+        }
+    }
+    while (waitpid(pid, &res, 0) < 0 && errno == EINTR);
+    nodelay(stdscr, false);
+    close(pty);
+    madtty_destroy(rt);
 }
 
 int mutt_yesorno (const char *msg, int def)
@@ -199,6 +267,7 @@ int mutt_yesorno (const char *msg, int def)
     waddstr (stdscr, (char *) (def == M_YES ? yes : no));
     mutt_refresh ();
   }
+  CLEARLINE(stdscr, LINES - 1);
   return (def);
 }
 
@@ -308,37 +377,18 @@ void mutt_show_error (void)
 
 void curses_initialize(void)
 {
-    if (initscr () == NULL) {
-        puts _("Error initializing terminal.");
-        exit (1);
-    }
+    initscr();
+    if (start_color() == ERR || !has_colors() || COLORS < 8)
+        mutt_exit(-1);
+    madtty_init_colors();
     ci_start_color();
-    keypad(stdscr, true);
-    cbreak();
     noecho();
-    typeahead (-1);               /* simulate smooth scrolling */
+    raw();
+    keypad(stdscr, true);
+    typeahead(-1);
     meta(stdscr, true);
-}
-
-/*
- * prompts the user to enter a keystroke, and displays the octal value back
- * to the user.
- */
-void mutt_what_key (void)
-{
-  int ch;
-
-  mvwprintw(stdscr, LINES - 1, 0, _("Enter keys (^G to abort): "));
-  do {
-    ch = getch();
-    if (ch != ERR && ch != ctrl ('G')) {
-      mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
-                    km_keyname (ch), ch, ch);
-    }
-  }
-  while (ch != ERR && ch != ctrl ('G'));
-
-  mutt_flushinp ();
+    curs_set(0);
+    ESCDELAY = 50;
 }
 
 int mutt_any_key_to_continue (const char *s)