X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurses.h;fp=lib-ui%2Fcurses.h;h=50293164a7c533cd56ba8095fa1f4f6880867885;hp=9f7f272f34d94aedc1b6d0516e837984304cd954;hb=8ab1ab66eb1c4b95f9b2a5ed9c2b2cf1dfa74544;hpb=fbb57685ed2c5633f7c76acb7cf2c9bd9d4897b3

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 9f7f272..5029316 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -19,15 +19,14 @@
 #undef lines
 #endif /* lines */
 
-#define CLEARLINE_WIN(x) wmove(stdscr, x,(option(OPTMBOXPANE)?SidebarWidth:0)), wclrtoeol(stdscr)
-#define CLEARLINE(x) wmove(stdscr, x,0), wclrtoeol(stdscr)
-#define CENTERLINE(x,y) wmove(stdscr, y, (COLS-strlen(x))/2), waddstr(stdscr, x)
+#define CLEARLINE(W, x) wmove(W, x,0), wclrtoeol(W)
 #define BEEP() do { if (mod_core.beep) beep(); } while (0)
 
-#define BKGDSET(x)  wbkgdset(stdscr, ColorDefs[x] | ' ')
+#define BKGDSET(W, x)   wbkgdset(W, ColorDefs[x] | ' ')
+#define SETCOLOR(W, X)  wattrset(W, ColorDefs[X])
+#define ADDCOLOR(W, X)  wattron(W, ColorDefs[X])
 
 void mutt_curs_set (int);
-#define PAGELEN (LINES-3)
 
 #define ctrl(c) ((c)-'@')
 
@@ -38,6 +37,11 @@ void mutt_curs_set (int);
 #endif
 
 event_t mutt_getch (void);
+#ifndef waddnwstr
+int waddwch(WINDOW *win, wchar_t w);
+#else
+#define waddwch(win, w)  waddnwstr(win, &(w), 1)
+#endif
 
 void curses_initialize(void);
 void curses_install(void);
@@ -104,7 +108,7 @@ void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
 void mutt_format_s (char *, ssize_t, const char *, const char *);
 void mutt_format_s_tree (char *, ssize_t, const char *, const char *);
 void mutt_free_color (int fg, int bg);
-void mutt_paddstr (int, const char *);
+void mutt_paddstr(WINDOW *, int, const char *);
 #define mutt_perror(a) _mutt_perror (a, __FILE__, __LINE__)
 void _mutt_perror (const char*, const char*,int);
 void mutt_query_exit (void);
@@ -112,7 +116,6 @@ void mutt_query_menu (char *, ssize_t);
 void mutt_show_error (void);
 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);
@@ -150,13 +153,6 @@ void ci_start_color (void);
 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])
-
 #define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
 
-#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
-
 #endif /* !_MUTT_CURSES_H */