#include <lib-lua/lib-lua.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#endif
#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
+#include "nntp.h"
#endif
#ifdef USE_HCACHE
static void show_version (void)
{
struct utsname uts;
-#ifdef USE_LIBESMTP
- char buf[STRING];
-#endif
puts (mutt_make_version());
puts (_(Notice));
#ifdef NCURSES_VERSION
printf (" ncurses %s\n", NCURSES_VERSION);
-#elif defined(USE_SLANG_CURSES)
- printf (" slang %d\n", SLANG_VERSION);
#endif
#ifdef _LIBICONV_VERSION
stringprep_check_version (NULL), STRINGPREP_VERSION);
#endif
-#ifdef USE_LIBESMTP
- smtp_version (buf, sizeof (buf), 0);
- printf (" libESMTP %s\n", buf);
-#endif
-
#ifdef USE_HCACHE
#if defined(HAVE_QDBM)
printf (" qdbm %s\n", dpversion);
#else
"-USE_NNTP "
#endif
-#ifdef USE_LIBESMTP
- "+USE_LIBESMTP "
-#else
- "-USE_LIBESMTP "
-#endif
#ifdef HAVE_LIBIDN
"+HAVE_LIBIDN "
#else
printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
- printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER);
puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
static void start_curses (void)
{
km_init (); /* must come before mutt_init */
-
-#ifdef USE_SLANG_CURSES
- SLtt_Ignore_Beep = 1; /* don't do that #*$@^! annoying visual beep! */
- SLsmg_Display_Eight_Bit = 128; /* characters above this are printable */
- SLtt_set_color (0, NULL, "default", "default");
-#else
- /* should come before initscr() so that ncurses 4.2 doesn't try to install
- its own SIGWINCH handler */
mutt_signal_initialize ();
-#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
mutt_signal_initialize ();
- ci_start_color ();
- keypad (stdscr, TRUE);
- cbreak ();
- noecho ();
-#ifdef HAVE_TYPEAHEAD
- typeahead (-1); /* simulate smooth scrolling */
-#endif
-#ifdef HAVE_META
- meta (stdscr, TRUE);
-#endif
+ curses_initialize();
}
#define M_IGNORE (1<<0) /* -z */
/* This must come before mutt_init() because curses needs to be started
before calling the init_pair() function to set the color scheme. */
if (!option (OPTNOCURSES))
- start_curses ();
+ start_curses();
/* set defaults and read init files */
mutt_init (flags & M_NOSYSRC, commands);
if (newMagic)
mx_set_magic (newMagic);
- if (!option (OPTNOCURSES)) {
- SETCOLOR (MT_COLOR_NORMAL);
- clear ();
- mutt_error = mutt_curses_error;
- mutt_message = mutt_curses_message;
+ if (!option(OPTNOCURSES)) {
+ ui_layout_init();
}
/* Create the Maildir directory if it doesn't exist. */
- if (!option (OPTNOCURSES) && Maildir) {
+ if (!option(OPTNOCURSES) && Maildir) {
struct stat sb;
char fpath[_POSIX_PATH_MAX];
char mesg[STRING];