p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Put connecting/disconnected messages in status bar 

Those are general status messages, and seem to belong to the bottom.
Partially motivated by the status bar being empty when disconnected.

And add a missing window invalidation.
This commit is contained in:
Přemysl Eric Janouch 2022-09-03 14:58:01 +02:00
parent eaa19be1c8
commit b5e48c29f9
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -12,6 +12,8 @@ Unreleased
* Made it possible to adjust the spectrum analyzer's FPS limit * Made it possible to adjust the spectrum analyzer's FPS limit
* Moved "Disconnected" and "Connecting..." messages to the status bar
* Fixed possibility of connection timeouts with PulseAudio integration * Fixed possibility of connection timeouts with PulseAudio integration

30
nncmpp.c
View File

@ -1982,28 +1982,17 @@ app_layout_tabs (void)
static void static void
app_layout_header (void) app_layout_header (void)
{ {
if (g.client.state == MPD_CONNECTED)
{ {
struct layout l = {}; struct layout lt = {};
app_push_fill (&l, g.ui->padding (APP_ATTR (NORMAL), 0, 0.125)); app_push_fill (&lt, g.ui->padding (APP_ATTR (NORMAL), 0, 0.125));
app_flush_layout (&l); app_flush_layout (&lt);
}
switch (g.client.state)
{
case MPD_CONNECTED:
app_layout_status (); app_layout_status ();
break;
case MPD_CONNECTING:
app_layout_text ("Connecting to MPD...", APP_ATTR (NORMAL));
break;
case MPD_DISCONNECTED:
app_layout_text ("Disconnected", APP_ATTR (NORMAL));
}
{ struct layout lb = {};
struct layout l = {}; app_push_fill (&lb, g.ui->padding (APP_ATTR (NORMAL), 0, 0.125));
app_push_fill (&l, g.ui->padding (APP_ATTR (NORMAL), 0, 0.125)); app_flush_layout (&lb);
app_flush_layout (&l);
} }
app_layout_tabs (); app_layout_tabs ();
@ -2273,6 +2262,10 @@ app_layout_statusbar (void)
} }
else if (g.client.state == MPD_CONNECTED) else if (g.client.state == MPD_CONNECTED)
app_layout_mpd_status (); app_layout_mpd_status ();
else if (g.client.state == MPD_CONNECTING)
app_layout_text ("Connecting to MPD...", attrs[0]);
else if (g.client.state == MPD_DISCONNECTED)
app_layout_text ("Disconnected", attrs[0]);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -5010,6 +5003,7 @@ app_on_reconnect (void *user_data)
mpd_queue_reconnect (); mpd_queue_reconnect ();
} }
free (address); free (address);
app_invalidate ();
} }
// --- TUI --------------------------------------------------------------------- // --- TUI ---------------------------------------------------------------------