X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=lib-ui%2Fcurses.h;h=f438395000b5bbb1674445cad309ba7680654135;hb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997;hp=39bfad09ba23a18e5fae4fbf4ab3e26602eb5ff6;hpb=84bc6d1930165b21919541b3b24294a9d99c3541;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 39bfad0..f438395 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -30,26 +30,14 @@
 #undef lines
 #endif /* lines */
 
-#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 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 BEEP() do { if (mod_core.beep) beep(); } while (0)
 
-#if !defined(HAVE_CURS_SET)
-#define curs_set(x)
-#endif
-
-#if defined(HAVE_BKGDSET)
-#define BKGDSET(x) bkgdset (ColorDefs[x] | ' ')
-#else
-#define BKGDSET(x)
-#endif
+#define BKGDSET(x)  wbkgdset(stdscr, ColorDefs[x] | ' ')
 
-#if defined(HAVE_CURS_SET)
 void mutt_curs_set (int);
-#else
-#define mutt_curs_set(x)
-#endif
 #define PAGELEN (LINES-3)
 
 #define ctrl(c) ((c)-'@')
@@ -175,8 +163,8 @@ void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
                         HEADER *, format_flag);
 
 
-#define SETCOLOR(X) attrset(ColorDefs[X])
-#define ADDCOLOR(X) attron(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; }