X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurses.h;h=39bfad09ba23a18e5fae4fbf4ab3e26602eb5ff6;hp=3537d715841477a0eb04873d8b60dcfb7c39a93b;hb=84bc6d1930165b21919541b3b24294a9d99c3541;hpb=785bb3cb4dd83ec1071998a64af74e333d076347

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 3537d71..39bfad0 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -13,44 +13,15 @@
 #include <lib-lib/lib-lib.h>
 #include "mutt.h"
 
-#ifdef USE_SLANG_CURSES
-
-#ifndef unix                    /* this symbol is not defined by the hp-ux compiler (sigh) */
-#define unix
-#endif /* unix */
-
-#include "slcurses.h"
-
-#define KEY_DC SL_KEY_DELETE
-#define KEY_IC SL_KEY_IC
-
-/*
- * ncurses and SLang seem to send different characters when the Enter key is
- * pressed, so define some macros to properly detect the Enter key.
- */
-#define M_ENTER_C '\r'
-#define M_ENTER_S "\r"
-
-#else
-
-#ifdef HAVE_NCURSESW_NCURSES_H
+#if defined(HAVE_NCURSESW_NCURSES_H)
 #include <ncursesw/ncurses.h>
-#else
-#ifdef HAVE_NCURSES_NCURSES_H
+#elif defined(HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
-#else
-#ifdef HAVE_NCURSES_H
+#elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
-#endif
-#endif
-
-#define M_ENTER_C '\n'
-#define M_ENTER_S "\n"
-
-#endif /* USE_SLANG_CURSES */
 
 /* AIX defines ``lines'' in <term.h>, but it's used as a var name in
  * various places in Mutt
@@ -62,19 +33,19 @@
 #define CLEARLINE_WIN(x) move(x,(option(OPTMBOXPANE)?SidebarWidth:0)), clrtoeol()
 #define CLEARLINE(x) move(x,0), clrtoeol()
 #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
-#define BEEP() do { if (MCore.beep) beep(); } while (0)
+#define BEEP() do { if (mod_core.beep) beep(); } while (0)
 
-#if ! (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
+#if !defined(HAVE_CURS_SET)
 #define curs_set(x)
 #endif
 
-#if !defined(USE_SLANG_CURSES) && defined(HAVE_BKGDSET)
+#if defined(HAVE_BKGDSET)
 #define BKGDSET(x) bkgdset (ColorDefs[x] | ' ')
 #else
 #define BKGDSET(x)
 #endif
 
-#if (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
+#if defined(HAVE_CURS_SET)
 void mutt_curs_set (int);
 #else
 #define mutt_curs_set(x)