redraw statusbar after terminal resize

previous changes broke this, so here is the fix.
master
Andrzej Rybczak 17 years ago
parent 7e479de3e0
commit ab7dbe9cbe
  1. 1
      src/global.h
  2. 7
      src/ncmpcpp.cpp
  3. 6
      src/status.cpp

@ -47,6 +47,7 @@ namespace Global
extern bool UpdateStatusImmediately;
extern bool MessagesAllowed;
extern bool RedrawHeader;
extern bool RedrawStatusbar;
extern std::string VolumeState;
}

@ -376,14 +376,9 @@ int main(int argc, char *argv[])
wFooter->Resize(COLS, wFooter->GetHeight());
myScreen->Refresh();
PlayerState mpd_state = Mpd->GetState();
RedrawStatusbar = 1;
StatusChanges changes;
changes.StatusFlags = 1; // force status update
if (mpd_state == psPlay || mpd_state == psPause)
changes.ElapsedTime = 1; // restore status
else
changes.PlayerState = 1;
NcmpcppStatusChanged(Mpd, changes, NULL);
}
else if (Keypressed(input, Key.GoToParentDir))

@ -41,6 +41,7 @@ using std::string;
string Global::VolumeState;
bool Global::UpdateStatusImmediately = 0;
bool Global::RedrawStatusbar = 0;
namespace
{
@ -360,7 +361,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
}
static time_t now, past = 0;
time(&now);
if ((now > past || changed.SongID) && Mpd->GetState() > psStop)
if (((now > past || changed.SongID) && Mpd->GetState() > psStop) || RedrawStatusbar)
{
time(&past);
if (np.Empty())
@ -373,7 +374,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
int mpd_elapsed = Mpd->GetElapsedTime();
if (elapsed < mpd_elapsed-2 || elapsed+1 > mpd_elapsed)
elapsed = mpd_elapsed;
else if (Mpd->GetState() == psPlay)
else if (Mpd->GetState() == psPlay && !RedrawStatusbar)
elapsed++;
if (!block_statusbar_update && Config.statusbar_visibility)
@ -412,6 +413,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
}
wFooter->SetColor(Config.statusbar_color);
}
RedrawStatusbar = 0;
}
else
{

Loading…
Cancel
Save