X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurses.h;h=9f7f272f34d94aedc1b6d0516e837984304cd954;hp=f438395000b5bbb1674445cad309ba7680654135;hb=5dcac54e5db074dc4572f843666c7f7acaf2d109;hpb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index f438395..9f7f272 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -10,19 +10,8 @@
 #ifndef _MUTT_CURSES_H
 #define _MUTT_CURSES_H
 
-#include <lib-lib/lib-lib.h>
 #include "mutt.h"
 
-#if defined(HAVE_NCURSESW_NCURSES_H)
-#include <ncursesw/ncurses.h>
-#elif defined(HAVE_NCURSES_NCURSES_H)
-#include <ncurses/ncurses.h>
-#elif defined(HAVE_NCURSES_H)
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif
-
 /* AIX defines ``lines'' in <term.h>, but it's used as a var name in
  * various places in Mutt
  */
@@ -50,12 +39,11 @@ void mutt_curs_set (int);
 
 event_t mutt_getch (void);
 
-void mutt_endwin (const char *);
+void curses_initialize(void);
+void curses_install(void);
+
 void mutt_flushinp (void);
-void mutt_refresh (void);
-void mutt_resize_screen (void);
 void mutt_ungetch (int, int);
-void mutt_need_hard_redraw (void);
 
 /* ----------------------------------------------------------------------------
  * Support for color
@@ -127,6 +115,7 @@ ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n);
 int mutt_addwch (wchar_t);
 int mutt_alloc_color (int fg, int bg);
 int mutt_any_key_to_continue (const char *);
+void mutt_what_key (void);
 int mutt_complete (char *, ssize_t);
 #define mutt_enter_fname(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL)
 int _mutt_enter_fname (const char *, char *, ssize_t, int *, int, int,
@@ -155,7 +144,6 @@ extern COLOR_LINE *ColorHdrList;
 extern COLOR_LINE *ColorBodyList;
 extern COLOR_LINE *ColorIndexList;
 
-void ci_init_color (void);
 void ci_start_color (void);
 
 #define mutt_make_string(A,B,C,D,E) _mutt_make_string(A,B,C,D,E,0)
@@ -163,6 +151,7 @@ void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
                         HEADER *, format_flag);
 
 
+#define WSETCOLOR(w, X) wattrset(w, ColorDefs[X])
 #define SETCOLOR(X) wattrset(stdscr, ColorDefs[X])
 #define ADDCOLOR(X) wattron(stdscr, ColorDefs[X])