* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-ui/lib-ui.h>
-#include <wchar.h>
-#include <termios.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
-#ifdef HAVE_LANGINFO_YESEXPR
#include <langinfo.h>
-#endif
+#include <termios.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+#include <lib-lua/lib-lua.h>
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_signal.h>
-#include "curses.h"
#include "menu.h"
-#include "enter.h"
+#include "browser.h"
#include "mutt.h"
#include "pager.h"
-#include "mbyte.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
* 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)
-{
- /* don't refresh when we are waiting for a child. */
- if (option (OPTKEEPQUIET))
- return;
-
- /* don't refresh in the middle of macros unless necessary */
- if (UngetCount && !option (OPTFORCEREFRESH))
- return;
-
- /* else */
- refresh ();
-}
-
-/* Make sure that the next refresh does a full refresh. This could be
- optmized by not doing it at all if DISPLAY is set as this might
- indicate that a GUI based pinentry was used. Having an option to
- customize this is of course the Mutt way. */
-void mutt_need_hard_redraw (void)
-{
- if (!getenv ("DISPLAY")) {
- keypad (stdscr, TRUE);
- clearok (stdscr, TRUE);
- set_option (OPTNEEDREDRAW);
- }
-}
-
event_t mutt_getch (void)
{
int ch;
event_t err = { -1, OP_NULL }, ret;
if (!option (OPTUNBUFFEREDINPUT) && UngetCount)
- return (KeyEvent[--UngetCount]);
+ return KeyEvent[--UngetCount];
SigInt = 0;
mutt_allow_interrupt (1);
- ch = getch ();
+ ch = getch();
mutt_allow_interrupt (0);
if (SigInt)
if (ch == ERR)
return err;
- if ((ch & 0x80) && option (OPTMETAKEY)) {
- /* send ALT-x as ESC-x */
- ch &= ~0x80;
- mutt_ungetch (ch, 0);
- ret.ch = '\033';
- ret.op = 0;
- return ret;
- }
-
ret.ch = ch;
ret.op = 0;
- return (ch == ctrl ('G') ? err : ret);
+ return ch == ctrl ('G') ? err : ret;
}
-int _mutt_get_field ( const char *field, char *buf, size_t buflen,
- int complete, int multiple, char ***files, int *numfiles)
-{
- int ret;
- int x, y;
-
- ENTER_STATE *es = mutt_new_enter_state ();
-
- do {
- CLEARLINE (LINES - 1);
- addstr (field);
- mutt_refresh ();
- getyx (stdscr, y, x);
- ret =
- _mutt_enter_string (buf, buflen, y, x, complete, multiple, files,
- numfiles, es);
- }
- while (ret == 1);
- CLEARLINE (LINES - 1);
- mutt_free_enter_state (&es);
-
- 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;
rc = mutt_get_field (msg, buf, buflen, flags);
unset_option (OPTUNBUFFEREDINPUT);
- return (rc);
+ return rc;
}
void mutt_clear_error (void)
{
Errorbuf[0] = 0;
if (!option (OPTNOCURSES))
- CLEARLINE (LINES - 1);
+ 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;
}
-void mutt_edit_file (const char *editor, const char *data)
+static int is_expired(struct timeval now, struct timeval expiry)
{
- char cmd[LONG_STRING];
-
- mutt_endwin (NULL);
- mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
- if (mutt_system (cmd) == -1)
- mutt_error (_("Error running \"%s\"!"), cmd);
- keypad (stdscr, TRUE);
- clearok (stdscr, TRUE);
+ 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[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)
{
event_t ch;
- char *yes = _("yes");
- char *no = _("no");
+ const char *yes = _("yes");
+ const char *no = _("no");
char *answer_string;
- size_t answer_string_len;
-
-#ifdef HAVE_LANGINFO_YESEXPR
+ ssize_t answer_string_len;
char *expr;
regex_t reyes;
regex_t reno;
!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);
+ CLEARLINE(stdscr, LINES - 1);
/*
* In order to prevent the default answer to the question to wrapped
* ensure there is enough room for the answer and truncate the question
* to fit.
*/
- answer_string = p_new(char, COLS + 1);
- snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
+ answer_string = p_new(char, getmaxx(stdscr) + 1);
+ snprintf (answer_string, getmaxx(stdscr) + 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", getmaxx(stdscr) - answer_string_len, msg, answer_string);
p_delete(&answer_string);
for (;;) {
break;
}
-#ifdef HAVE_LANGINFO_YESEXPR
answer[0] = ch.ch;
- if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) :
-#else
- if (
-#endif
- (tolower (ch.ch) == *yes)) {
+ if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
+ {
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;
- }
- else {
+ } else {
BEEP ();
}
}
-#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));
+ waddstr (stdscr, (char *) (def == M_YES ? yes : no));
mutt_refresh ();
}
- return (def);
+ CLEARLINE(stdscr, LINES - 1);
+ return def;
}
/* this function is called when the user presses the abort key */
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);
+ mutt_exit(1);
}
mutt_clear_error ();
mutt_curs_set (-1);
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);
+ 0, getmaxy(stdscr) - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
snprintf (Errorbuf, sizeof (Errorbuf), "%s", TmpErrorbuf); /* overkill */
if (!option (OPTKEEPQUIET)) {
BEEP ();
- SETCOLOR (MT_COLOR_ERROR);
- mvaddstr (LINES - 1, 0, Errorbuf);
- clrtoeol ();
- SETCOLOR (MT_COLOR_NORMAL);
+ SETCOLOR(stdscr, MT_COLOR_ERROR);
+ mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+ wclrtoeol (stdscr);
+ SETCOLOR(stdscr, MT_COLOR_NORMAL);
mutt_refresh ();
}
}
void mutt_progress_bar (progress_t* progress, long pos) {
- char posstr[SHORT_STRING];
+ char posstr[STRING];
if (!pos) {
if (!NetInc)
va_end (ap);
mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf),
- 0, COLS - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
+ 0, getmaxx(stdscr) - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
snprintf (Errorbuf, sizeof (Errorbuf), "%s", TmpErrorbuf); /* overkill */
if (!option (OPTKEEPQUIET)) {
- SETCOLOR (MT_COLOR_MESSAGE);
- mvaddstr (LINES - 1, 0, Errorbuf);
- clrtoeol ();
- SETCOLOR (MT_COLOR_NORMAL);
+ SETCOLOR(stdscr, MT_COLOR_MESSAGE);
+ mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+ wclrtoeol (stdscr);
+ SETCOLOR(stdscr, MT_COLOR_NORMAL);
mutt_refresh ();
}
if (option (OPTKEEPQUIET))
return;
- SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
- CLEARLINE (LINES - 1);
- addstr (Errorbuf);
- SETCOLOR (MT_COLOR_NORMAL);
+ SETCOLOR(stdscr, option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
+ CLEARLINE(stdscr, LINES - 1);
+ waddstr (stdscr, Errorbuf);
+ SETCOLOR(stdscr, MT_COLOR_NORMAL);
}
-void mutt_endwin (const char *msg)
+void curses_initialize(void)
{
- if (!option (OPTNOCURSES)) {
- CLEARLINE (LINES - 1);
-
- attrset (A_NORMAL);
- mutt_refresh ();
- endwin ();
- }
-
- if (msg && *msg) {
- puts (msg);
- fflush (stdout);
- }
-}
-
-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);
+ initscr();
+ if (start_color() == ERR || !has_colors() || COLORS < 8)
+ mutt_exit(-1);
+ madtty_init_colors();
+ ci_start_color();
+ noecho();
+ raw();
+ keypad(stdscr, true);
+ typeahead(-1);
+ meta(stdscr, true);
+ curs_set(0);
+ ESCDELAY = 50;
}
int mutt_any_key_to_continue (const char *s)
close (f);
fputs ("\r\n", stdout);
mutt_clear_error ();
- 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);
- mutt_expand_file_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;
+ return ch;
}
-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)
{
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 ();
if (ch.ch == -1) {
- CLEARLINE (LINES - 1);
- return (-1);
+ CLEARLINE(stdscr, LINES - 1);
+ return -1;
}
else if (ch.ch == '?') {
mutt_refresh ();
buf[0] = 0;
- _mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0),
- files, numfiles);
+ mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0),
+ files, numfiles);
*redraw = REDRAW_FULL;
}
else {
char *pc = p_new(char, m_strlen(prompt) + 3);
- sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */
+ sprintf(pc, "%s: ", prompt);
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
if (_mutt_get_field
(pc, buf, blen, (buffy ? M_EFILE : M_FILE) | M_CLEAR, multiple, files,
flushinp ();
}
-#if (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
/* The argument can take 3 values:
* -1: restore the value of the last call
* 0: make the cursor invisible
curs_set (2); /* cvvis */
}
}
-#endif
-int mutt_multi_choice (char *prompt, char *letters)
+int mutt_multi_choice (const char *prompt, const char *letters)
{
event_t ch;
int choice;
char *p;
- mvaddstr (LINES - 1, 0, prompt);
- clrtoeol ();
+ mvwaddstr (stdscr, LINES - 1, 0, prompt);
+ wclrtoeol (stdscr);
for (;;) {
mutt_refresh ();
ch = mutt_getch ();
}
BEEP ();
}
- CLEARLINE (LINES - 1);
+ CLEARLINE(stdscr, LINES - 1);
mutt_refresh ();
return choice;
}
-/*
- * addwch would be provided by an up-to-date curses library
- */
-
-int mutt_addwch (wchar_t wc)
+ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
{
- char buf[MB_LEN_MAX * 2];
- mbstate_t mbstate;
- size_t n1, n2;
+ if (n == 0)
+ return m_strcpy(s, len, "0K");
- p_clear(&mbstate, 1);
- if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) ||
- (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1))
- return -1; /* ERR */
- else
- return addstr (buf);
-}
+ if (n < 10189) /* 0.1K - 9.9K */
+ return snprintf(s, len, "%3.1fK", (n < 103) ? 0.1 : n / 1024.0);
+
+ 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);
+ 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);
+}
/*
* This formats a string, a bit like
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 */
else {
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
}
break;
min_width -= w;
max_width -= w;
- strncpy (p, scratch, k2);
+ m_strncpy(p, destlen, scratch, k2);
p += k2;
destlen -= k2;
}
* 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;
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);
}
/*
* 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 (main_w, bigbuf)
*/
-void mutt_paddstr (int n, const char *s)
+void mutt_paddstr(WINDOW *win, 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))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
if (w > n)
break;
- addnstr ((char *) s, k);
+ waddnstr(win, (char *) s, k);
n -= w;
}
}
while (n-- > 0)
- 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;
- size_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 == (size_t) (-1) || k == (size_t) (-2)) {
- k = (k == (size_t) (-1)) ? 1 : n;
- wc = replacement_char ();
- }
- if (!IsWPrint (wc))
- wc = '?';
- w += wcwidth (wc);
- }
- return w;
+ waddch(win, ' ');
}