Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

render state line on stdscr instead of header window

Browse Source
This commit is contained in:
Andrzej Rybczak
2008-12-15 20:57:30 +01:00
parent 2cc5528014
commit 8c40f046b9
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ncmpcpp.cpp
View File

@@ -311,7 +311,7 @@ int main(int argc, char *argv[])
if (Config.header_visibility) if (Config.header_visibility)
{ {
wHeader = new Window(0, 0, COLS, 2, "", Config.header_color, brNone); wHeader = new Window(0, 0, COLS, 1, "", Config.header_color, brNone);
wHeader->Display(); wHeader->Display();
} }

25
src/status_checker.cpp
View File

@@ -432,26 +432,27 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
if (mpd_db_updating) if (mpd_db_updating)
switch_state += mpd_db_updating; switch_state += mpd_db_updating;
wHeader->Bold(1); // this is done by raw ncurses because creating another
wHeader->SetColor(Config.state_line_color); // window only for handling this is quite silly
mvwhline(wHeader->Raw(), 1, 0, 0, wHeader->GetWidth()); attrset(A_BOLD|COLOR_PAIR(Config.state_line_color));
mvhline(1, 0, 0, COLS);
if (!switch_state.empty()) if (!switch_state.empty())
{ {
wHeader->WriteXY(wHeader->GetWidth()-switch_state.length()-3, 1, 0, "[");
wHeader->SetColor(Config.state_flags_color); mvprintw(1, COLS-switch_state.length()-3, "[");
wHeader->WriteXY(wHeader->GetWidth()-switch_state.length()-2, 1, 0, "%s", switch_state.c_str()); attron(COLOR_PAIR(Config.state_flags_color));
wHeader->SetColor(Config.state_line_color); mvprintw(1, COLS-switch_state.length()-2, "%s", switch_state.c_str());
wHeader->WriteXY(wHeader->GetWidth()-2, 1, 0, "]"); attron(COLOR_PAIR(Config.state_line_color));
mvprintw(1, COLS-2, "]");
} }
wHeader->SetColor(Config.header_color); attroff(A_BOLD|COLOR_PAIR(Config.state_line_color));
wHeader->Bold(0); refresh();
header_update_status = 0; header_update_status = 0;
} }
if ((changed.Volume) && Config.header_visibility) if ((changed.Volume) && Config.header_visibility)
{ {
int vol = Mpd->GetVolume();
volume_state = " Volume: "; volume_state = " Volume: ";
volume_state += IntoStr(vol); volume_state += IntoStr(Mpd->GetVolume());
volume_state += "%"; volume_state += "%";
wHeader->SetColor(Config.volume_color); wHeader->SetColor(Config.volume_color);
wHeader->WriteXY(wHeader->GetWidth()-volume_state.length(), 0, 1, "%s", volume_state.c_str()); wHeader->WriteXY(wHeader->GetWidth()-volume_state.length(), 0, 1, "%s", volume_state.c_str());