X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=fa8327b641f45c0b29bd161f78748ad0e9de3d9b;hb=f435868132e200bfa71ac155f037cf64bf5414ba;hp=6ed90a101b6b8b21bc22d4113cb9b94e592523f2;hpb=8c9ac00dc8d607d5caaf1f27022d07c8152981f9;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 6ed90a1..fa8327b 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -10,13 +10,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 #include "pop.h"
 
-#include "curses.h"
 #include "menu.h"
 
 #include "mutt.h"
@@ -503,7 +502,7 @@ int mutt_index_menu (void)
         sidebar_draw_frames();
         SETCOLOR (MT_COLOR_STATUS);
         BKGDSET (MT_COLOR_STATUS);
-        move(option (OPTSTATUSONTOP) ? 0 : LINES - 2,SW);
+        wmove(stdscr, option (OPTSTATUSONTOP) ? 0 : LINES - 2,SW);
         mutt_paddstr (COLS-SW, buf);
         SETCOLOR (MT_COLOR_NORMAL);
         BKGDSET (MT_COLOR_NORMAL);
@@ -525,9 +524,9 @@ int mutt_index_menu (void)
         menu->oldcurrent = -1;
 
       if (option (OPTBRAILLEFRIENDLY))
-         move (menu->current - menu->top + menu->offset, 0);
+         wmove (stdscr, menu->current - menu->top + menu->offset, 0);
       else
-        move (menu->current - menu->top + menu->offset, COLS - 1);
+        wmove (stdscr, menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();
 
       if (SigWinch) {
@@ -538,7 +537,7 @@ int mutt_index_menu (void)
         SigWinch = 0;
         menu->top = 0;          /* so we scroll the right amount */
         /*
-         * force a real complete redraw.  clrtobot() doesn't seem to be able
+         * force a real complete redraw.  wclrtobot(stdscr) doesn't seem to be able
          * to handle every case without this.
          */
         clearok (stdscr, TRUE);
@@ -567,8 +566,8 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvaddstr (LINES - 1, 0, "tag-");
-        clrtoeol ();
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
@@ -602,8 +601,8 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvaddstr (LINES - 1, 0, "tag-");
-        clrtoeol ();
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {