X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=7be391f2a8d61324c3651e5d5ffa9e414448fd88;hp=e0c00f2ce478141fad5f41b2c7f7bab8c81a5d56;hb=8ab1ab66eb1c4b95f9b2a5ed9c2b2cf1dfa74544;hpb=113624ce8c271834bb0921ebe9d9d0e22beeabd4

diff --git a/main.c b/main.c
index e0c00f2..7be391f 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@
 #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"
@@ -46,11 +46,7 @@ extern int optind;
 #endif
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
+#include "nntp.h"
 #endif
 
 #ifdef USE_HCACHE
@@ -130,9 +126,6 @@ options:\n\
 static void show_version (void)
 {
   struct utsname uts;
-#ifdef USE_LIBESMTP
-  char buf[STRING];
-#endif
 
   puts (mutt_make_version());
   puts (_(Notice));
@@ -151,8 +144,6 @@ static void show_version (void)
 
 #ifdef NCURSES_VERSION
   printf ("  ncurses %s\n", NCURSES_VERSION);
-#elif defined(USE_SLANG_CURSES)
-  printf ("  slang %d\n", SLANG_VERSION);
 #endif
 
 #ifdef _LIBICONV_VERSION
@@ -165,11 +156,6 @@ static void show_version (void)
           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);
@@ -210,11 +196,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_LIBESMTP
-         "+USE_LIBESMTP  "
-#else
-         "-USE_LIBESMTP  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
@@ -228,7 +209,6 @@ static void show_version (void)
   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"));
 
@@ -238,32 +218,14 @@ static void show_version (void)
 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 */
@@ -458,7 +420,7 @@ int main (int argc, char **argv)
   /* 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);
@@ -490,15 +452,12 @@ int main (int argc, char **argv)
   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];
@@ -589,7 +548,7 @@ int main (int argc, char **argv)
 
       /* is the following if still needed? */
 
-      fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL);
+      fout = m_tempfile(buf, sizeof(buf), NONULL(mod_core.tmpdir), NULL);
       tempfile = m_strdup(buf);
 
       if (tempfile) {
@@ -667,7 +626,8 @@ int main (int argc, char **argv)
         exit (1);
       }
       folder[0] = 0;
-      mutt_select_file (folder, sizeof (folder), M_SEL_FOLDER | M_SEL_BUFFY);
+      mutt_select_file(folder, sizeof(folder), M_SEL_FOLDER | M_SEL_BUFFY,
+                       NULL, NULL);
       if (!folder[0]) {
         mutt_endwin (NULL);
         exit (0);