LINES - 1 is the status bar, living on stdscr.

[apps/madmutt.git] / lib-ui / menu.c

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 928834c..7015ca1 100644 (file)
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -116,9 +116,8 @@ void menu_redraw_full (MUTTMENU * menu)
   wmove (main_w, 0, 0);
   wclrtobot (main_w);
 
-  SETCOLOR(main_w, MT_COLOR_STATUS);
-  wmove (main_w, LINES - 2, 0);
-  mutt_paddstr (main_w, getmaxx(main_w), "");
+  SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+  mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w));
   SETCOLOR(main_w, MT_COLOR_NORMAL);
   menu->offset = 1;
   menu->pagelen = LINES - 3;
@@ -181,12 +180,12 @@ void menu_redraw_motion (MUTTMENU * menu)
     return;
   }
 
-  wmove (main_w, menu->oldcurrent + menu->offset - menu->top, 0);
   SETCOLOR(main_w, MT_COLOR_NORMAL);
   BKGDSET(main_w, MT_COLOR_NORMAL);
 
   /* erase the current indicator */
-  wattrset (main_w, menu->color (menu->oldcurrent));
+  wattrset(main_w, menu->color(menu->oldcurrent));
+  wmove (main_w, menu->oldcurrent + menu->offset - menu->top, 0);
   wclrtoeol (main_w);
   menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
   menu_pad_string (buf, sizeof (buf));
@@ -213,13 +212,13 @@ void menu_redraw_current (MUTTMENU * menu)
 {
   char buf[STRING];
 
-  wmove (main_w, menu->current + menu->offset - menu->top, 0);
   menu_make_entry (buf, sizeof (buf), menu, menu->current);
   menu_pad_string (buf, sizeof (buf));
 
   wattrset (main_w, menu->color (menu->current));
   ADDCOLOR(main_w, MT_COLOR_INDICATOR);
   BKGDSET(main_w, MT_COLOR_INDICATOR);
+  wmove (main_w, menu->current + menu->offset - menu->top, 0);
   wclrtoeol (main_w);
   print_enriched_string (menu->color (menu->current), (unsigned char *) buf,
                          0);
@@ -240,9 +239,9 @@ static void menu_redraw_prompt (MUTTMENU * menu)
     if (*Errorbuf)
       mutt_clear_error ();
 
-    SETCOLOR(main_w, MT_COLOR_NORMAL);
-    mvwaddstr (main_w, LINES - 1, 0, menu->prompt);
-    wclrtoeol (main_w);
+    SETCOLOR(stdscr, MT_COLOR_NORMAL);
+    mvwaddstr(stdscr, LINES - 1, 0, menu->prompt);
+    wclrtoeol(stdscr);
   }
 }
 
@@ -683,11 +682,11 @@ int mutt_menuLoop (MUTTMENU * menu)
     i = km_dokey (menu->menu);
     if (i == OP_TAG_PREFIX || i == OP_TAG_PREFIX_COND) {
       if (menu->tagged) {
-        mvwaddstr (main_w, LINES - 1, 0, "Tag-");
-        wclrtoeol (main_w);
+        mvwaddstr(stdscr, LINES - 1, 0, "Tag-");
+        wclrtoeol(stdscr);
         i = km_dokey (menu->menu);
         menu->tagprefix = 1;
-        CLEARLINE(main_w, LINES - 1);
+        CLEARLINE(stdscr, LINES - 1);
       }
       else if (i == OP_TAG_PREFIX) {
         mutt_error _("No tagged entries.");