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

diff --git a/main.c b/main.c
index f7e3193..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"
@@ -209,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"));
 
@@ -226,12 +225,7 @@ static void start_curses (void)
     exit (1);
   }
   mutt_signal_initialize ();
-  ci_start_color ();
-  keypad (stdscr, TRUE);
-  cbreak ();
-  noecho ();
-  typeahead (-1);               /* simulate smooth scrolling */
-  meta (stdscr, TRUE);
+  curses_initialize();
 }
 
 #define M_IGNORE  (1<<0)        /* -z */
@@ -426,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);
@@ -458,15 +452,12 @@ int main (int argc, char **argv)
   if (newMagic)
     mx_set_magic (newMagic);
 
-  if (!option (OPTNOCURSES)) {
-    SETCOLOR (MT_COLOR_NORMAL);
-    wclear (stdscr);
-    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];