Remove SidebarNeedsRedraw.

The menu stack can be used to flag a redraw of the sidebar window.

diff --git a/buffy.c b/buffy.c
index 1306297ff2d0598e3fca304e24998d86eadb7d3d..64dbddaaf0a933a0baf6ad6a94d5897fb8d8df4d 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -27,6 +27,7 @@
 #include "mx.h"
 
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
@@ -580,7 +581,7 @@ int mutt_buffy_check (int force)
         (orig_count != tmp->msg_count) ||
         (orig_unread != tmp->msg_unread) ||
         (orig_flagged != tmp->msg_flagged))
-      SidebarNeedsRedraw = 1;
+      mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 #endif
 
     if (!tmp->new)

diff --git a/curs_main.c b/curs_main.c
index 3ca1fbbb6f33cf121ac4603c86433c8f407c2538..39999dc90edf6fd8d17720b265d83bddcc930c12 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -622,7 +622,7 @@ int mutt_index_menu (void)
       }
 
 #ifdef USE_SIDEBAR
-      if (menu->redraw & REDRAW_SIDEBAR || SidebarNeedsRedraw)
+      if (menu->redraw & REDRAW_SIDEBAR)
       {
         mutt_sb_set_buffystats (Context);
         menu_redraw_sidebar (menu);

diff --git a/flags.c b/flags.c
index e47950dc171dd6c5c7e5fd592c9d3d95fea9a790..489694b0b95aff6d5de36029747f3b08a7d65125 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -22,6 +22,7 @@
 
 #include "mutt.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "sort.h"
 #include "mx.h"
 
@@ -273,7 +274,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
   {
     mutt_set_header_color(ctx, h);
 #ifdef USE_SIDEBAR
-    SidebarNeedsRedraw = 1;
+    mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 #endif
   }
 

diff --git a/globals.h b/globals.h
index a68338a85258a2a3d5802023a86842852bfd0b79..5cbed869db65868d875f860a0bea1f278228a143 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -226,7 +226,6 @@ WHERE short ScoreThresholdFlag;
 #ifdef USE_SIDEBAR
 WHERE short SidebarWidth;
 WHERE LIST *SidebarWhitelist INITVAL(0);
-WHERE int SidebarNeedsRedraw INITVAL (0);
 #endif
 
 #ifdef USE_IMAP

diff --git a/imap/command.c b/imap/command.c
index c0c370f6ef5c57e4761b8df6d406f8a439bb7721..6d267463c876f1905d49795c50e019c92f830069 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "mutt.h"
+#include "mutt_menu.h"
 #include "imap_private.h"
 #include "mx.h"
 #include "buffy.h"
@@ -1004,7 +1005,7 @@ static void cmd_parse_status (IMAP_DATA* idata, char* s)
         if ((inc->new != new) ||
             (inc->msg_count != status->messages) ||
             (inc->msg_unread != status->unseen))
-          SidebarNeedsRedraw = 1;
+          mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 #endif
         inc->new = new;
         if (new_msg_count)

diff --git a/init.c b/init.c
index b0a5572e33a757be8cfd9fdc872a86309165d6b0..c70ee44d83270b24711b205aecadc292468dc3c9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1804,7 +1804,7 @@ static void mutt_restore_default (struct option_t *p)
     mutt_reflow_windows ();
 #ifdef USE_SIDEBAR
   if (p->flags & R_SIDEBAR)
-    SidebarNeedsRedraw = 1;
+    mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 #endif
 }
 
@@ -2582,7 +2582,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
         mutt_reflow_windows ();
 #ifdef USE_SIDEBAR
       if (MuttVars[idx].flags & R_SIDEBAR)
-        SidebarNeedsRedraw = 1;
+        mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 #endif
     }
   }

diff --git a/menu.c b/menu.c
index 900ea4dda33ac1c8b255346dad27db44ec5bbf9c..5bbc4d7aa4f6b2cb9d094829ef9c77f474046f31 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -242,7 +242,7 @@ void menu_redraw_status (MUTTMENU *menu)
 #ifdef USE_SIDEBAR
 void menu_redraw_sidebar (MUTTMENU *menu)
 {
-  SidebarNeedsRedraw = 0;
+  menu->redraw &= ~REDRAW_SIDEBAR;
   mutt_sb_draw ();
 }
 #endif
@@ -924,7 +924,7 @@ int menu_redraw (MUTTMENU *menu)
   if (menu->redraw & REDRAW_STATUS)
     menu_redraw_status (menu);
 #ifdef USE_SIDEBAR
-  if (menu->redraw & REDRAW_SIDEBAR || SidebarNeedsRedraw)
+  if (menu->redraw & REDRAW_SIDEBAR)
     menu_redraw_sidebar (menu);
 #endif
   if (menu->redraw & REDRAW_INDEX)

diff --git a/pager.c b/pager.c
index 89c435def418b959b0fa25344d33b131f6acab7c..1e2d6d632882a9e54c9734ff7e6a9cf5ce30a476 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1801,10 +1801,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
     }
 
 #ifdef USE_SIDEBAR
-    if ((pager_menu->redraw & REDRAW_SIDEBAR) || SidebarNeedsRedraw)
+    if (pager_menu->redraw & REDRAW_SIDEBAR)
     {
-      SidebarNeedsRedraw = 0;
-      mutt_sb_draw ();
+      menu_redraw_sidebar (pager_menu);
     }
 #endif
 

diff --git a/sidebar.c b/sidebar.c
index a7abbe7181dcb0c541e419be4ea9073ebeaa1a49..d3f504de0526793dbcad8d9ac4c6bb2b641a505c 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -909,7 +909,7 @@ void mutt_sb_change_mailbox (int op)
     default:
       return;
   }
-  SidebarNeedsRedraw = 1;
+  mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 }
 
 /**
@@ -1048,5 +1048,5 @@ void mutt_sb_notify_mailbox (BUFFY *b, int created)
       Entries[del_index] = Entries[del_index + 1];
   }
 
-  SidebarNeedsRedraw = 1;
+  mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 }