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 4da236330bde642f3787cfd9cd7e4b43bf6a7a53..74dddde4ed89efbab09a3c8f9d18481b615befcd 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -24,6 +24,7 @@
 #include "mx.h"
 
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
@@ -420,7 +421,7 @@ static void buffy_check (BUFFY *tmp, struct stat *contex_sb, int check_stats)
         (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 afe072c8c2bcb03fbcc3cad4c3f2447a33cab394..f3167cf0190706e484f9cd28d283c2269766d55b 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -978,7 +978,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 709f7589d34b6f3b840c6f4731385fd706fd0844..0f6398fd442fc932f8fb5bd8e87183303d2638c1 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -19,6 +19,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 96467138c75b10e81c1acc118401b671c58591db..2d3594642e75157797d37aa642dda1cc02a62265 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -257,7 +257,6 @@ WHERE short ScoreThresholdFlag;
 #ifdef USE_SIDEBAR
 WHERE short SidebarWidth INITVAL(0);
 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 cd6a8ceb2200a6d95e5fe7f6a26e27d8cbb5592c..cd103aa0d9e10c2a4617841d83f067ee87ce1040 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "mutt.h"
+#include "mutt_menu.h"
 #include "imap_private.h"
 #include "mx.h"
 #include "buffy.h"
@@ -622,7 +623,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 c550695f8bbd7b61cd7348fd7a79169077d5dfb6..0ec887f5edd27d226568feb3e4b86bb1883df9cf 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2013,7 +2013,7 @@ static void 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
 }
 
@@ -2792,7 +2792,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 829d42ff08f0faaa94158965fd847b328e46880f..82682859bef0c07d64f90c323ffed38a0a22ba43 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -307,7 +307,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
@@ -989,7 +989,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 7edd4099d30eaad910f53388ef80c40d68a22b40..658b67d884064f31479616eab5f2a564f87257cf 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1878,10 +1878,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 62d0e4868d785bb1c8407c34ad062c261adef741..c4c88b60196b7c025ecad2e81bbe32680e3e3abf 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -1056,7 +1056,7 @@ void mutt_sb_change_mailbox (int op)
     default:
       return;
   }
-  SidebarNeedsRedraw = 1;
+  mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 }
 
 /**
@@ -1198,7 +1198,7 @@ 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);
 }
 
 /**
@@ -1230,6 +1230,6 @@ mutt_sb_toggle_virtual (void)
   for (b = get_incoming(); b; b = b->next)
     mutt_sb_notify_mailbox (b, 1);
 
-  SidebarNeedsRedraw = 1;
+  mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
 }