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

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 6ed90a1..257cd96 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"
@@ -87,7 +86,6 @@ static const char *No_visible = N_("No visible messages.");
 #define CURHDR Context->hdrs[Context->v2r[menu->current]]
 #define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
-#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
 extern size_t UngetCount;
 
@@ -499,14 +497,13 @@ int mutt_index_menu (void)
 
       if (menu->redraw & REDRAW_STATUS) {
         menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
-        CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
-        sidebar_draw_frames();
-        SETCOLOR (MT_COLOR_STATUS);
-        BKGDSET (MT_COLOR_STATUS);
-        move(option (OPTSTATUSONTOP) ? 0 : LINES - 2,SW);
-        mutt_paddstr (COLS-SW, buf);
-        SETCOLOR (MT_COLOR_NORMAL);
-        BKGDSET (MT_COLOR_NORMAL);
+        CLEARLINE(main_w, 0);
+        SETCOLOR(main_w, MT_COLOR_STATUS);
+        BKGDSET(main_w, MT_COLOR_STATUS);
+        wmove(main_w, 0, 0);
+        mutt_paddstr (main_w, getmaxx(main_w), buf);
+        SETCOLOR(main_w, MT_COLOR_NORMAL);
+        BKGDSET(main_w, MT_COLOR_NORMAL);
         sidebar_set_buffystats (Context);
         menu->redraw &= ~REDRAW_STATUS;
         if (option (OPTXTERMSETTITLES)) {
@@ -523,25 +520,14 @@ int mutt_index_menu (void)
         menu->oldcurrent = menu->current;
       else
         menu->oldcurrent = -1;
-
-      if (option (OPTBRAILLEFRIENDLY))
-         move (menu->current - menu->top + menu->offset, 0);
-      else
-        move (menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();
 
       if (SigWinch) {
         mutt_flushinp ();
-        mutt_resize_screen ();
+        ui_layout_resize();
         menu->redraw = REDRAW_FULL;
         menu->menu = MENU_MAIN;
-        SigWinch = 0;
         menu->top = 0;          /* so we scroll the right amount */
-        /*
-         * force a real complete redraw.  clrtobot() doesn't seem to be able
-         * to handle every case without this.
-         */
-        clearok (stdscr, TRUE);
         continue;
       }
 
@@ -567,13 +553,13 @@ 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 (main_w, LINES - 1, 0, "tag-");
+        wclrtoeol (main_w);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE (LINES - 1);
+          CLEARLINE(main_w, LINES - 1);
           continue;
         }
       }
@@ -602,13 +588,13 @@ 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 (main_w, LINES - 1, 0, "tag-");
+        wclrtoeol (main_w);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE (LINES - 1);
+          CLEARLINE(main_w, LINES - 1);
           continue;
         }
       }
@@ -948,8 +934,7 @@ int mutt_index_menu (void)
       break;
 
     case OP_REDRAW:
-
-      clearok (stdscr, TRUE);
+      clearok (main_w, TRUE);
       menu->redraw = REDRAW_FULL;
       break;
 
@@ -1097,7 +1082,7 @@ int mutt_index_menu (void)
     case OP_MAIN_CHANGE_GROUP:
     case OP_MAIN_CHANGE_GROUP_READONLY:
 #endif
-      if (attach_msg || option (OPTREADONLY) ||
+      if (attach_msg ||
 #ifdef USE_NNTP
           op == OP_MAIN_CHANGE_GROUP_READONLY ||
 #endif
@@ -1144,7 +1129,7 @@ int mutt_index_menu (void)
           break;
       }
       if (!buf[0]) {
-        CLEARLINE (LINES - 1);
+        CLEARLINE(main_w, LINES - 1);
         break;
       }